[Isis-fish-commits] r3148 - in isis-fish/branches/3.3.1: . src src/main/assembly src/main/java/fr/ifremer/isisfish src/main/java/fr/ifremer/isisfish/actions src/main/java/fr/ifremer/isisfish/aspect src/main/java/fr/ifremer/isisfish/cron src/main/java/fr/ifremer/isisfish/datastore src/main/java/fr/ifremer/isisfish/datastore/migration src/main/java/fr/ifremer/isisfish/datastore/update src/main/java/fr/ifremer/isisfish/entities src/main/java/fr/ifremer/isisfish/equation src/main/java/fr/ifremer/isisfish/export

Author: chatellier Date: 2011-03-02 16:57:16 +0000 (Wed, 02 Mar 2011) New Revision: 3148 Log: Merge /trunk into /branches/3.3.1 Added: isis-fish/branches/3.3.1/src/license/ isis-fish/branches/3.3.1/src/main/assembly/isisfish.bat isis-fish/branches/3.3.1/src/main/assembly/isisfish.sh isis-fish/branches/3.3.1/src/main/assembly/isisfish64.bat isis-fish/branches/3.3.1/src/main/assembly/isisfish64.sh isis-fish/branches/3.3.1/src/main/assembly/x64/ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterCache.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java isis-fish/branches/3.3.1/src/site/resources/documentation/ isis-fish/branches/3.3.1/src/site/resources/downloads/ isis-fish/branches/3.3.1/src/site/resources/images/IsisFishModel.png isis-fish/branches/3.3.1/src/site/resources/images/devel/ isis-fish/branches/3.3.1/src/site/rst/contact.rst isis-fish/branches/3.3.1/src/site/rst/documentation.rst isis-fish/branches/3.3.1/src/site/rst/documentation/ isis-fish/branches/3.3.1/src/site/rst/download.rst isis-fish/branches/3.3.1/src/site/rst/history.rst isis-fish/branches/3.3.1/src/site/rst/license.rst isis-fish/branches/3.3.1/src/site/rst/listStats.rst isis-fish/branches/3.3.1/src/site/rst/news.rst isis-fish/branches/3.3.1/src/site/rst/othertools.rst isis-fish/branches/3.3.1/src/site/rst/presentation.rst isis-fish/branches/3.3.1/src/site/rst/publication.rst isis-fish/branches/3.3.1/src/site/rst/research.rst isis-fish/branches/3.3.1/src/site/rst/tools/ isis-fish/branches/3.3.1/src/site/rst/v2/index.rst isis-fish/branches/3.3.1/src/site/rst/v3/devel/usbkey.rst isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/IsisConfigTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java Removed: isis-fish/branches/3.3.1/src/main/assembly/go.bat isis-fish/branches/3.3.1/src/main/assembly/go.sh isis-fish/branches/3.3.1/src/site/fr/ Modified: isis-fish/branches/3.3.1/LICENSE.txt isis-fish/branches/3.3.1/changelog.txt isis-fish/branches/3.3.1/pom.xml isis-fish/branches/3.3.1/src/main/assembly/bin.xml isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFishException.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFishRuntimeException.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisTray.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/package-info.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/aspect/AspectClassLoader.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/aspect/Cache.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/aspect/Trace.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/aspect/package-info.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/cron/CronService.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/cron/RemoveOldFileTask.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/cron/package-info.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/AnalysePlanStorage.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityStorage.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/StorageChangeEvent.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/StorageChangeListener.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/StorageException.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/SwingMigrationCallbackHandler.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/package-info.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/package-info.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/update/package-info.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/CellImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/EffortDescriptionImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/Formule.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/GearImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/MetierImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PortImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SelectivityImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SpeciesImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/TargetSpeciesImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/ZoneImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/package-info.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/EmigrationEquation.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/ImmigrationEquation.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/Language.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/MigrationEquation.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowth.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowthReverse.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/PopulationMeanWeight.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/PopulationNaturalDeathRate.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/PopulationPrice.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionEquation.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/SelectivityEquation.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/SoVTechnicalEfficiencyEquation.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/StrategyInactivityEquation.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/TargetSpeciesTargetFactorEquation.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/export/Export.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/export/SensitivityExport.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/LogLevel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/LogLevelUtil.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/ThreadFilter.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/io/FileOffsetReader.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/io/LineReader.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/io/LineReaderUtil.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/io/MemoryOffsetReader.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/io/OffsetReader.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/Coordinate.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/CopyMapToClipboardListener.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/DataMap.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/DataMapInfo.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/DataMapList.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/DefaultDataMap.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/DefaultScale.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/Motif.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/Scale.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/export/HorizontalEntityVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExplorer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExport.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DesignPlanXMLVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomainXMLVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/MatrixContinuousDomainXMLVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ScenarioXMLVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/SensitivityScenariosXMLVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/rule/AbstractRule.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/rule/Rule.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/rule/RuleHelper.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/rule/package-info.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlan.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlanContext.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlanIndependent.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/RuleMonitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationException.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationListener.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationMeta.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScript.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultGetter.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultListener.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultXML.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/Simulator.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServerBadIdException.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/JDKPriorityBlockingQueue.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationItem.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationQueue.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceListener.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/package-info.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculator.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityException.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityScenarios.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/package-info.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/package-info.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DesignPlanVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DomainVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/FactorVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/ScenarioVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/SensitivityScenariosVisitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/package-info.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/Date.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/Month.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/RangeOfValues.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/TimeUnit.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate/DateType.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MonthType.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate/RangeOfValuesType.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeUnitType.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/ApplicationMonitorUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/Help.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/SaveVerifier.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeCellRenderer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/NoneUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/OpenMapEvents.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesStructuredUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableRenderer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/formule/FormuleComboModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/formule/FormuleComboRenderer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearPopulationSelectivityModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/gear/PopulationComboModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoComboModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoComboRenderer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoTargetSpeciesTableModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/metier/SpeciesComboModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonInfoComboModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonInfoComboRenderer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/population/ZoneListModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionListModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionListRenderer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/MetierListModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/MetierListRenderer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeListModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeListRenderer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/logging/console/LogConsoleUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/logging/console/LogMailUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanComboModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanComboRenderer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanListModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanListRenderer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanParametersTableCellEditor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanParametersTableCellRenderer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanParametersTableModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListRenderer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListRenderer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportParametersTableCellEditor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportParametersTableCellRenderer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportParametersTableModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultListModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultListRenderer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleComboModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleListCellRenderer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleListModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersTableCellEditor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersTableCellRenderer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersTableModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorComboModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorComboRenderer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorListModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorListRenderer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorParametersTableCellEditor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorParametersTableCellRenderer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorParametersTableModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListRenderer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportParametersTableCellEditor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportParametersTableCellRenderer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportParametersTableModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/simulation/SimulationNamesComboModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/queue/ComponentTableCellRenderer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueAction.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/DataResult.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/DataResultUI.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/DataResultUICallback.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/GraphBean.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUI.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUICallback.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/GraphComboRenderer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/GraphEvent.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/GraphListener.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/GraphMatrixNDDataset.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoItem.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDate.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDateListRenderer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDateUI.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDateUICallback.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemUI.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemUICallback.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoPanelable.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/LegendModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/LegendPanel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/MatrixInfoTableModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultAction.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultEdit.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultEditUI.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultEditUICallback.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUICallback.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanelUI.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanelUICallback.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBean.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUI.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUICallback.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/FileSelectionTableModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.css isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptTypesComboModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/BackupAction.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/CancelAction.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ChooseFileAction.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ExportAction.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ImportAction.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeCellRenderer.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/model/package-info.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/package-info.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/ContinuousPanelContainerUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityAction.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTableModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUtils.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterUtil.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/util/IDialog.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/util/IsisAction.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/util/IsisActionWithBackup.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/util/JaxxUtil.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/util/TooltipHelper.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/CommitDialogUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateConfirmDialogUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSPassPhraseUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/Interval.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalGraphic.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalLabel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalPanel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/Acceptor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/AcceptorFactory.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/CompositeFilterAcceptor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/DateInterval.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterAcceptor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialog.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterParamModel.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/ValueGetter.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ArgTypes.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/Args.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CellPointcomparator.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ClasspathTemplateLoader.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/DateConverter.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/Doc.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/DocHelper.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/Docable.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/MatrixConverter.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/MonthConverter.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/RangeOfValuesConverter.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/StringConverter.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/TimeUnitConverter.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/Trace.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/InvalidPassphraseException.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/ProgressMonitor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHException.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUserInfo.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUtils.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/package-info.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/AbstractVCS.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCS.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSActionEvent.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSException.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSFactory.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSNone.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VetoableActionListener.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/package.html isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties isis-fish/branches/3.3.1/src/main/resources/interpreter.properties isis-fish/branches/3.3.1/src/main/resources/jnlp/index.html isis-fish/branches/3.3.1/src/main/resources/log4j.properties isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/ActiveRuleImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/CellImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/EffortDescriptionImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/EquationImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/FisheryRegionImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/GearImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/PopulationGroupImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/PortImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/ResultImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/SeasonImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/SelectivityImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/SetOfVesselsImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/SpeciesImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/TargetSpeciesImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/TripTypeImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/VesselTypeImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/ZoneImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ActiveRuleImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/CellImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/EffortDescriptionImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/EquationImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/FisheryRegionImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/GearImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationGroupImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PortImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ResultImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SeasonImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SelectivityImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SetOfVesselsImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SpeciesImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/TargetSpeciesImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/TripTypeImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/VesselTypeImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ZoneImpl.hbm.xml isis-fish/branches/3.3.1/src/main/resources/sensitivity.properties isis-fish/branches/3.3.1/src/main/resources/templates/ssh/qsub-script.ftl isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-0_1.3.1.xsl isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-1.3.1_1.5.xsl isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-1.5_1.9.xsl isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-1.9.1_2.0.xsl isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-1.9_1.9.1.xsl isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-2.0_2.1.xsl isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-2.1_2.2.xsl isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-2.2_2.3.xsl isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-cleaner.xsl isis-fish/branches/3.3.1/src/main/xmi/isis-fish.properties isis-fish/branches/3.3.1/src/main/xmi/isis-fish.zargo isis-fish/branches/3.3.1/src/site/en/rst/index.rst isis-fish/branches/3.3.1/src/site/resources/css/site.css isis-fish/branches/3.3.1/src/site/rst/index.rst isis-fish/branches/3.3.1/src/site/rst/v1/changelog.rst isis-fish/branches/3.3.1/src/site/rst/v2/changelog.rst isis-fish/branches/3.3.1/src/site/rst/v2/devel/index.rst isis-fish/branches/3.3.1/src/site/rst/v2/user/ECMAScript.rst isis-fish/branches/3.3.1/src/site/rst/v2/user/ECMAScriptEdit.rst isis-fish/branches/3.3.1/src/site/rst/v2/user/FAQ.rst isis-fish/branches/3.3.1/src/site/rst/v2/user/Rules.rst isis-fish/branches/3.3.1/src/site/rst/v2/user/ScriptHilaire.rst isis-fish/branches/3.3.1/src/site/rst/v2/user/SimulationLauncher.rst isis-fish/branches/3.3.1/src/site/rst/v2/user/index.rst isis-fish/branches/3.3.1/src/site/rst/v3/changelog.rst isis-fish/branches/3.3.1/src/site/rst/v3/devel/SyntaxeOption.rst isis-fish/branches/3.3.1/src/site/rst/v3/devel/index.rst isis-fish/branches/3.3.1/src/site/rst/v3/devel/isis-architecture.rst isis-fish/branches/3.3.1/src/site/rst/v3/user/AnalysePlan.rst isis-fish/branches/3.3.1/src/site/rst/v3/user/ExternalScriptEditor.rst isis-fish/branches/3.3.1/src/site/rst/v3/user/FAQ.rst isis-fish/branches/3.3.1/src/site/rst/v3/user/Historique.rst isis-fish/branches/3.3.1/src/site/rst/v3/user/Installation.rst isis-fish/branches/3.3.1/src/site/rst/v3/user/Introduction.rst isis-fish/branches/3.3.1/src/site/rst/v3/user/LaunchOption.rst isis-fish/branches/3.3.1/src/site/rst/v3/user/UserInterface.rst isis-fish/branches/3.3.1/src/site/rst/v3/user/addSshKey.rst isis-fish/branches/3.3.1/src/site/rst/v3/user/index.rst isis-fish/branches/3.3.1/src/site/rst/v3/user/inputs.rst isis-fish/branches/3.3.1/src/site/rst/v3/user/isisFishData.rst isis-fish/branches/3.3.1/src/site/rst/v3/user/result.rst isis-fish/branches/3.3.1/src/site/rst/v3/user/scripts.rst isis-fish/branches/3.3.1/src/site/rst/v3/user/simulations.rst isis-fish/branches/3.3.1/src/site/site_en.xml isis-fish/branches/3.3.1/src/site/site_fr.xml isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/actions/VCSActionTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/AnalysePlanStorageTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/DataStorageTestHelper.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/ExportStorageTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/FormuleStorageTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/RuleStorageTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/ScriptStorageTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/SensitivityExportStorageTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/SensitivityStorageTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/SimulationInformationTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/SimulatorStorageTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/TestIsisH2Config.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/migration/TestMigrationCallbackHandler.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/PersistenceConventionTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/PersistenceTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/logging/LoggerHelper.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/logging/io/LineReaderTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/logging/io/LineReaderUtilTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/export/RegionExplorerTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitorTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceIT.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/types/MonthTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelperTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUtilsTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/util/ErrorHelperTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogModelMock.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/util/JavadocHelperTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/util/ssh/SSHAgentTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java isis-fish/branches/3.3.1/src/test/resources/VCSConfig-junit_CVS.properties isis-fish/branches/3.3.1/src/test/resources/VCSConfig-junit_SVN.properties isis-fish/branches/3.3.1/src/test/resources/fr/ifremer/isisfish/simulator/parameters_basic.properties isis-fish/branches/3.3.1/src/test/resources/fr/ifremer/isisfish/simulator/parameters_plan.properties isis-fish/branches/3.3.1/src/test/resources/mexico/mexicohelper_designplan.xml isis-fish/branches/3.3.1/src/test/resources/test-database/analyseplans/CalibrationSimplexePasVariable2Capturabilite.java isis-fish/branches/3.3.1/src/test/resources/test-database/analyseplans/SimulationNumberRestriction.java isis-fish/branches/3.3.1/src/test/resources/test-database/exports/Abundances.java isis-fish/branches/3.3.1/src/test/resources/test-database/exports/Biomasses.java isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CapturesNombre.java isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CapturesPoids.java isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CellsDefinition.java isis-fish/branches/3.3.1/src/test/resources/test-database/exports/EffortsMetier.java isis-fish/branches/3.3.1/src/test/resources/test-database/exports/MetierZone.java isis-fish/branches/3.3.1/src/test/resources/test-database/exports/NonActivite.java isis-fish/branches/3.3.1/src/test/resources/test-database/exports/OwnerMargin.java isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RegionDefinition.java isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RejetsNombre.java isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RejetsPoids.java isis-fish/branches/3.3.1/src/test/resources/test-database/exports/VesselMargin.java isis-fish/branches/3.3.1/src/test/resources/test-database/exports/ZonesDefinition.java isis-fish/branches/3.3.1/src/test/resources/test-database/rules/Cantonnement.java isis-fish/branches/3.3.1/src/test/resources/test-database/rules/CantonnementPreSimu.java isis-fish/branches/3.3.1/src/test/resources/test-database/rules/ChangementParamControlablePresimu.java isis-fish/branches/3.3.1/src/test/resources/test-database/rules/EffortReduction.java isis-fish/branches/3.3.1/src/test/resources/test-database/rules/GraviteVPUE1.java isis-fish/branches/3.3.1/src/test/resources/test-database/rules/InterdictionEngin.java isis-fish/branches/3.3.1/src/test/resources/test-database/rules/InterdictionEnginPreSimu.java isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TACpoids.java isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TailleMin.java isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TotalClosure.java isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/GravityModel.java isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/ResultName.java isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/RuleUtil.java isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/SiMatrix.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorJavaExpandGrid.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRFast.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRFrF2.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRMorris.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorROptimumLHS.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRRandomLHS.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRSobol.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRegularFractions.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassReferenceY9.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassRelativeReferenceY12.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassRelativeY6.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassY3.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightReferenceY7.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightRelativeReferenceY10.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightRelativeY4.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightY1.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassReferenceY8.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassRelativeReferenceY11.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassRelativeY5.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassY2.java isis-fish/branches/3.3.1/src/test/resources/test-database/simulators/DefaultSimulator.java Modified: isis-fish/branches/3.3.1/LICENSE.txt =================================================================== --- isis-fish/branches/3.3.1/LICENSE.txt 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/LICENSE.txt 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,8 +1,8 @@ GNU GENERAL PUBLIC LICENSE Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -15,7 +15,7 @@ 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 Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -278,3 +278,62 @@ POSSIBILITY OF SUCH DAMAGES. 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 +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 + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +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: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision 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. + +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: + + 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. Modified: isis-fish/branches/3.3.1/changelog.txt =================================================================== --- isis-fish/branches/3.3.1/changelog.txt 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/changelog.txt 2011-03-02 16:57:16 UTC (rev 3148) @@ -10,10 +10,66 @@ -- jeu. févr. 4 11:48:12 CET 2010 -isis-fish (3.3.0.0-rc2) stable; urgency=low +isis-fish (3.3.0.7) stable; urgency=low + * Add 64bits launch scripts + + -- jeu. janv. 20 18:10:02 CET 2011 + +isis-fish (3.3.0.6) stable; urgency=low + + * Update to topia 2.3.4 (fix created entities transaction isolation) + * Rename emigration tab to "Emmigration" for french locale + * Add characters escaping in qsub script regex + * Clean debug file at each isis lauching + + -- lun. déc. 6 16:52:34 CET 2010 + +isis-fish (3.3.0.5) stable; urgency=low + + * Fix wrong openmap version used + + -- ven. juil. 23 14:24:24 CEST 2010 + +isis-fish (3.3.0.4) stable; urgency=low + + * Add more startup information in debug.txt file (arch, R_HOME, PATH) + * Add 64bits jri native libraries + * Fix dependant simulation plans execution (beforeSimulation/afterSimulation) + * Reduce spaces in strategies edition + * Fix parameter edition for non primitive types in user script (Double...) + * Add simulation parameter cache to not keep simulation prescript on memory + + -- jeu. juil. 21 19:32:36 CEST 2010 + +isis-fish (3.3.0.3) stable; urgency=low + + * Add new option to customize qsub options + * Update libs (log4j, junit) + * Fix first age use in group creation wizard + + -- mer. avril 21 18:28:46 CEST 2010 + +isis-fish (3.3.0.2) stable; urgency=low + + * Fix a NPE when reloading in process simulation + * Fix a migration problem on region with non null empty map list + * Fix a problem with failing region saves (was blocking all saving actions) + + -- mer. avril 7 10:59:46 CEST 2010 + +isis-fish (3.3.0.1) stable; urgency=low + + * Make java path configurable on cluster server (caparmor & noumea) + + -- mar. mars 30 10:37:48 CEST 2010 + +isis-fish (3.3.0.0) stable; urgency=low + + * Replace zone selection event from mouse click to correct valueChanged + * Fix a NullPointerException during region check * Disable all list filtering functionalities (don't work anymore with a lot of simulations) - + -- jeu. janv. 28 18:51:17 CET 2010 isis-fish (3.3.0.0-rc1) stable; urgency=low Modified: isis-fish/branches/3.3.1/pom.xml =================================================================== --- isis-fish/branches/3.3.1/pom.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/pom.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,15 +1,15 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.0.3</version> + <version>2.5.1</version> </parent> - <groupId>ifremer</groupId> + <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> <version>3.3.1.0-SNAPSHOT</version> @@ -20,134 +20,153 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>${nuiton-utils.version}</version> + <version>${nuitonUtilsVersion}</version> <scope>compile</scope> </dependency> + + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n-api</artifactId> + <version>1.0.1</version> + <scope>compile</scope> + </dependency> <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> - <version>${topia.version}</version> + <version>${topiaVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-service-migration</artifactId> - <version>${topia.version}</version> + <version>${topiaVersion}</version> <scope>compile</scope> </dependency> <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>3.3.2.GA</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-matrix</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.0.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-widgets</artifactId> - <version>${nuiton-widgets.version}</version> + <version>${nuitonWidgetsVersion}</version> <scope>compile</scope> </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>1.4.1</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>1.1.1</version> + <scope>compile</scope> + </dependency> + <!-- Jaxx --> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime-swing</artifactId> - <version>${jaxx.version}</version> + <version>${jaxxVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime-api</artifactId> - <version>${jaxx.version}</version> + <version>${jaxxVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime-swing-widget</artifactId> - <version>${jaxx.version}</version> + <version>${jaxxVersion}</version> <scope>compile</scope> </dependency> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-j2r</artifactId> - <version>1.0.1-SNAPSHOT</version> + <groupId>org.swinglabs</groupId> + <artifactId>jxlayer</artifactId> + <version>3.0.3</version> <scope>compile</scope> </dependency> - <!--Commons--> <dependency> - <groupId>commons-jxpath</groupId> - <artifactId>commons-jxpath</artifactId> - <version>1.3</version> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-j2r</artifactId> + <version>1.0.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.4</version> - <scope>compile</scope> </dependency> <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - <scope>compile</scope> </dependency> <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>1.8.2</version> - <scope>compile</scope> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>1.4</version> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-math</artifactId> - <version>2.0</version> - <scope>compile</scope> + <version>2.1</version> + <scope>runtime</scope> <!--script --> </dependency> - + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - <scope>compile</scope> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.14</version> + <version>1.2.16</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.5.10</version> + <version>1.6.1</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.5.10</version> + <version>1.6.1</version> + <scope>runtime</scope> </dependency> <dependency> @@ -161,6 +180,7 @@ <groupId>jfree</groupId> <artifactId>jfreechart</artifactId> <version>1.0.12</version> + <scope>compile</scope> </dependency> <!-- encore utilise pour les pre-scripts --> @@ -172,7 +192,7 @@ </dependency> <dependency> - <groupId>openmap</groupId> + <groupId>com.bbn</groupId> <artifactId>openmap</artifactId> <version>4.6.5</version> <scope>compile</scope> @@ -181,7 +201,7 @@ <dependency> <groupId>org.nuiton.thirdparty</groupId> <artifactId>rsyntaxtextarea</artifactId> - <version>1.4.0</version> + <version>1.4.1</version> <scope>runtime</scope> </dependency> @@ -195,7 +215,7 @@ <dependency> <groupId>org.swinglabs</groupId> <artifactId>swingx</artifactId> - <version>1.6</version> + <version>1.6.1</version> <scope>compile</scope> </dependency> @@ -206,6 +226,13 @@ <scope>compile</scope> </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>1.0.b2</version> + <scope>compile</scope> + </dependency> + <!-- Utilisé lors de l'import xml v2 (entre autre) --> <dependency> <groupId>jaxen</groupId> @@ -226,19 +253,19 @@ <dependency> <groupId>aspectwerkz</groupId> <artifactId>aspectwerkz</artifactId> - <version>${aspectwerkz.version}</version> + <version>${aspectwerkzVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>aspectwerkz</groupId> <artifactId>aspectwerkz-jdk5</artifactId> - <version>${aspectwerkz.version}</version> + <version>${aspectwerkzVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>aspectwerkz</groupId> <artifactId>aspectwerkz-core</artifactId> - <version>${aspectwerkz.version}</version> + <version>${aspectwerkzVersion}</version> <scope>compile</scope> </dependency> @@ -297,7 +324,7 @@ <dependency> <groupId>org.tmatesoft.svnkit</groupId> <artifactId>svnkit</artifactId> - <version>1.3.2-1</version> + <version>1.3.4</version> <scope>compile</scope> </dependency> <!-- fin svnkit pour communication subversion --> @@ -306,6 +333,7 @@ <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> <version>2.3.16</version> + <scope>compile</scope> </dependency> <dependency> @@ -319,14 +347,13 @@ <groupId>com.sun</groupId> <artifactId>tools</artifactId> <version>1.6.0.16</version> + <scope>compile</scope> </dependency> <!-- Tests --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.7</version> - <scope>test</scope> </dependency> </dependencies> @@ -449,20 +476,21 @@ <!-- Super pom properties --> <projectId>isis-fish</projectId> <labs.id>8</labs.id> - <javadoc.version>2.6.1</javadoc.version> + <javadocPluginVersion>2.7</javadocPluginVersion> <siteLocales>fr,en</siteLocales> <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class> + <license.licenseName>gpl_v2</license.licenseName> <!-- Dependencies version --> - <jaxx.version>1.7.1</jaxx.version> - <eugene.version>2.0.0-beta-3</eugene.version> - <topia.version>2.3.0-beta-5</topia.version> - <nuiton-utils.version>1.1.4-SNAPSHOT</nuiton-utils.version> - <nuiton-i18n.version>1.0.1</nuiton-i18n.version> - <nuiton-widgets.version>1.0.1-SNAPSHOT</nuiton-widgets.version> - <jrst.version>1.1.0</jrst.version> - <aspectwerkz.version>2.0</aspectwerkz.version> - <xmlrpc.version>3.1.2</xmlrpc.version> + <jaxxVersion>1.7.1</jaxxVersion> + <eugeneVersion>2.0.2</eugeneVersion> + <topiaVersion>2.3.4</topiaVersion> + <nuitonUtilsVersion>1.1.4</nuitonUtilsVersion> + <nuitonI18nVersion>1.2.2</nuitonI18nVersion> + <nuitonWidgetsVersion>1.0.1</nuitonWidgetsVersion> + <jrstPluginVersion>1.1.1</jrstPluginVersion> + <aspectwerkzVersion>2.0</aspectwerkzVersion> + <xmlrpcVersion>3.1.2</xmlrpcVersion> <!-- jnlp (disabled until retested) <keystorepath>${codelutin.keystorepath}</keystorepath> @@ -477,6 +505,23 @@ <build> <pluginManagement> <plugins> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <version>${eugeneVersion}</version> + </plugin> + + <plugin> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <version>${jaxxVersion}</version> + </plugin> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${nuitonI18nVersion}</version> + </plugin> <!-- <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> @@ -484,6 +529,7 @@ <showWarnings>true</showWarnings> </configuration> </plugin> --> + <plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> @@ -497,17 +543,15 @@ </archive> </configuration> </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <systemProperties> - <property> - <name>java.io.tmpdir</name> - <value>${project.build.directory}/surefire-workdir</value> - </property> - </systemProperties> + <systemPropertyVariables> + <java.io.tmpdir>${project.build.directory}/surefire-workdir</java.io.tmpdir> + </systemPropertyVariables> </configuration> - <executions> + <!-- <executions> <execution> <id>surefire-it</id> <phase>integration-test</phase> @@ -520,15 +564,16 @@ </includes> </configuration> </execution> - </executions> + </executions> --> </plugin> + <plugin> <artifactId>maven-site-plugin</artifactId> <dependencies> <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> + <version>${jrstPluginVersion}</version> </dependency> </dependencies> </plugin> @@ -539,7 +584,6 @@ <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>maven-eugene-plugin</artifactId> - <version>${eugene.version}</version> <executions> <execution> <id>eugene-generation</id> @@ -548,7 +592,7 @@ <inputs>zargo</inputs> <fullPackagePath>fr.ifremer.isisfish</fullPackagePath> <defaultPackage>fr.ifremer.isisfish</defaultPackage> - <extractedPackages>fr.ifremer.isisfish</extractedPackages> + <!--<extractedPackages>fr.ifremer.isisfish</extractedPackages>--> <templates> org.nuiton.topia.generator.TopiaMetaTransformer </templates> @@ -557,42 +601,33 @@ <goal>smart-generate</goal> </goals> </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topia.version}</version> - <scope>runtime</scope> - </dependency> - </dependencies> + <execution> + <id>copyVersionFiles</id> + <phase>generate-sources</phase> + <configuration> + <includes>**/*.objectmodel</includes> + <copyVersionDir>${basedir}/src/main/resources/oldmappings/%MODELNAME%</copyVersionDir> + <copyVersionFiles>**/*.hbm.xml</copyVersionFiles> + <overwrite>true</overwrite> + </configuration> + <goals> + <goal>copyVersionFiles</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topiaVersion}</version> + <scope>runtime</scope> + </dependency> + </dependencies> </plugin> - - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <version>${eugene.version}</version> - <executions> - <execution> - <id>copyVersionFiles</id> - <phase>generate-sources</phase> - <configuration> - <includes>**/*.objectmodel</includes> - <copyVersionDir>${basedir}/src/main/resources/oldmappings/%MODELNAME%</copyVersionDir> - <copyVersionFiles>**/*.hbm.xml</copyVersionFiles> - <overwrite>true</overwrite> - </configuration> - <goals> - <goal>copyVersionFiles</goal> - </goals> - </execution> - </executions> - </plugin> <plugin> <groupId>org.nuiton.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> - <version>${jaxx.version}</version> <executions> <execution> <goals> @@ -611,7 +646,6 @@ <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> - <version>${nuiton-i18n.version}</version> <configuration> <entries> <entry> @@ -634,8 +668,8 @@ <executions> <execution> <id>copy-dependencies</id> - <phase>package</phase> <configuration> + <silent>true</silent> <outputDirectory>${project.build.directory}/lib</outputDirectory> </configuration> <goals> @@ -644,44 +678,9 @@ </execution> </executions> </plugin> - - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - </descriptors> - <attach>false</attach> - </configuration> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> - <reporting> - <plugins> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <links> - <link>http://java.sun.com/javase/6/docs/api/</link> - <link>http://maven-site.nuiton.org/nuiton-utils/apidocs/</link> - <link>http://maven-site.nuiton.org/nuiton-matrix/apidocs/</link> - <link>http://maven-site.nuiton.org/nuiton-j2r/apidocs/</link> - <link>http://maven-site.nuiton.org/topia/topia-persistence/apidocs/</link> - </links> - </configuration> - </plugin> - </plugins> - </reporting> - <!-- ************************************************************* --> <!-- *** Build Environment ************************************** --> <!-- ************************************************************* --> @@ -693,10 +692,6 @@ <repositories> <repository> - <id>labs.repository</id> - <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> - </repository> - <repository> <id>javanet.repository</id> <url>http://download.java.net/maven/2/</url> </repository> @@ -712,10 +707,6 @@ <pluginRepositories> <pluginRepository> - <id>labs.plugin.repository</id> - <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> - </pluginRepository> - <pluginRepository> <id>nuiton.plugin.release</id> <url>http://maven.nuiton.org/release</url> </pluginRepository> @@ -725,171 +716,89 @@ </pluginRepository> </pluginRepositories> - <distributionManagement> - <repository> - <id>labs</id> - <url>scpexe://labs.libre-entreprise.org/home/groups/lutinbuilder/htdocs/maven2</url> - </repository> - <site> - <id>labs</id> - <url>scpexe://labs.libre-entreprise.org/home/groups/isis-fish/htdocs/isis-fish</url> - </site> - </distributionManagement> + <profiles> - <!--<profiles> - <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-license-plugin</artifactId> - <version>2.0.0</version> - <executions> - <execution> - <id>attach-licenses</id> - <goals> - <goal>add-license</goal> - <goal>add-third-party</goal> - </goals> - </execution> - </executions> - </plugin> + <!-- profile to make assembly (included in release process) --> + <profile> + <id>assembly</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> - < - - (disabled until retested) - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <!- - Ajout des libs signe par Sun dans un fichier jnlp separe - -> - <execution> - <id>JnlpSun</id> - <phase>verify</phase> - <configuration> - <tasks> - <mkdir dir="${jnlp.build.directory}" /> - <copy file="${project.basedir}/src/main/jnlp/sun.jnlp" verbose="${maven.verbose}" todir="${jnlp.build.directory}" failonerror="false"> - <filterset> - <filter token="lib-javahelp" value="javahelp-2.0.02.jar" /> - <filter token="lib-activation" value="activation-1.1.jar" /> - <filter token="lib-mail" value="mail-1.4.jar" /> - <filter token="url" value="${jnlpCodebase}" /> - </filterset> - </copy> - <copy file="${project.basedir}/src/main/jnlp/jxlayer.jnlp" verbose="${maven.verbose}" todir="${jnlp.build.directory}" failonerror="false"> - <filterset> - <filter token="lib" value="jxlayer-3.0.1.jar" /> - <filter token="url" value="${jnlpCodebase}" /> - </filterset> - </copy> + <build> - <copy verbose="${maven.verbose}" todir="${jnlp.build.directory}/lib" failonerror="false"> - <fileset dir="${project.build.directory}/lib"> - <include name="javahelp-2.0.02.jar" /> - <include name="activation-1.1.jar" /> - <include name="mail-1.4.jar" /> - <include name="jxlayer-3.0.1.jar" /> - </fileset> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> + <defaultGoal>package</defaultGoal> + <plugins> - <execution> - <id>JnlpToSite</id> - <phase>pre-site</phase> - <configuration> - <tasks> - <mkdir dir="${maven.site.gen.dir}/resources" /> - <copy todir="${maven.site.gen.dir}/resources" verbose="true" failonerror="false" overwrite="false"> - <fileset dir="${jnlp.build.directory}"> - <include name="**" /> - </fileset> - <!- - should be better to use the deployed assembly in lutinbuilder ? - -> - <fileset dir="target"> - <include name="${project.build.finalName}-bin.zip" /> - </fileset> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-5</version> + <configuration> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + <attach>false</attach> + </configuration> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo.webstart</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <version>1.0-alpha-2-cl_20090204</version> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>jnlp-inline</goal> - </goals> - </execution> - </executions> - <configuration> - <force>false</force> - <dependencies> - <excludes> - <exclude>javax.help:javahelp</exclude> - <exclude>javax.mail:mail</exclude> - <exclude>javax.activation:activation</exclude> - <exclude>org.swinglabs:jxlayer</exclude> - </excludes> - </dependencies> - <libPath>lib</libPath> - <extensions> - <sun>sun.jnlp</sun> - <jxlayer>jxlayer.jnlp</jxlayer> - </extensions> - <jnlp> - <outputFile>isis-fish-v3.jnlp</outputFile> - <mainClass>${maven.jar.main.class}</mainClass> - <allPermissions>true</allPermissions> - <offlineAllowed>true</offlineAllowed> - </jnlp> + </profile> - <sign> - <keystore>${keystorepath}</keystore> - <keypass /> - <storepass>${keystorepass}</storepass> - <storetype /> - <alias>${keystorealias}</alias> - <validity /> - <dnameCn /> - <dnameOu /> - <dnameO /> - <dnameL /> - <dnameSt /> - <dnameC /> - <verify>true</verify> - <keystoreConfig> - <delete>false</delete> - <gen>false</gen> - </keystoreConfig> - </sign> - <pack200>false</pack200> - <gzip>true</gzip> - <verbose>false</verbose> - </configuration> - </plugin> - - > + <!-- profile with all reports (included in release process) --> + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> - </plugins> - </build> - </profile> + <properties> - </profiles> --> + <!-- pmd config --> + <minimumTokens>100</minimumTokens> + <targetJdk>1.6</targetJdk> + </properties> + <build> + <defaultGoal>site</defaultGoal> + </build> + + <reporting> + <plugins> + + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <links> + <link>http://java.sun.com/javase/6/docs/api/</link> + <link>http://maven-site.nuiton.org/nuiton-utils/apidocs/</link> + <link>http://maven-site.nuiton.org/nuiton-matrix/apidocs/</link> + <link>http://maven-site.nuiton.org/nuiton-j2r/apidocs/</link> + <link> + http://maven-site.nuiton.org/topia/topia-persistence/apidocs/ + </link> + </links> + </configuration> + </plugin> + + </plugins> + </reporting> + + </profile> + </profiles> + </project> Modified: isis-fish/branches/3.3.1/src/main/assembly/bin.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/assembly/bin.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/assembly/bin.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.1.xsd"> <id>bin</id> @@ -38,8 +63,10 @@ <filtered>true</filtered> <fileMode>0755</fileMode> <includes> - <include>go.sh</include> - <include>go.bat</include> + <include>isisfish.sh</include> + <include>isisfish.bat</include> + <include>isisfish64.sh</include> + <include>isisfish64.bat</include> </includes> </fileSet> </fileSets> @@ -56,5 +83,13 @@ <source>src/main/assembly/x86/libjri.so</source> <outputDirectory>jri</outputDirectory> </file> + <file> + <source>src/main/assembly/x64/jri.dll</source> + <outputDirectory>jri64</outputDirectory> + </file> + <file> + <source>src/main/assembly/x64/libjri.so</source> + <outputDirectory>jri64</outputDirectory> + </file> </files> </assembly> \ No newline at end of file Deleted: isis-fish/branches/3.3.1/src/main/assembly/go.bat =================================================================== --- isis-fish/branches/3.3.1/src/main/assembly/go.bat 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/assembly/go.bat 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,19 +0,0 @@ - at echo off - -if NOT "%R_HOME%"=="" GOTO rfound - -:norfound -echo [Script] R_HOME not found > debug.txt 2>&1 -goto startisis - -:rfound -echo [Script] R_HOME found with value %R_HOME% > debug.txt 2>&1 -goto startisis - -:startisis -echo [Script] Isis starting... -echo [Script] Path = %Path% >> debug.txt 2>&1 -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 -goto end - -:end Deleted: isis-fish/branches/3.3.1/src/main/assembly/go.sh =================================================================== --- isis-fish/branches/3.3.1/src/main/assembly/go.sh 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/assembly/go.sh 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,6 +0,0 @@ -#!/bin/sh - -MEMORY="-Xmx1024M" -JRIARGS="-Djava.library.path=jri -DR.type=jni" - -java $MEMORY $JRIARGS -jar ${project.build.finalName}.${project.packaging} "$@" &> debug.txt \ No newline at end of file Copied: isis-fish/branches/3.3.1/src/main/assembly/isisfish.bat (from rev 3147, isis-fish/trunk/src/main/assembly/isisfish.bat) =================================================================== --- isis-fish/branches/3.3.1/src/main/assembly/isisfish.bat (rev 0) +++ isis-fish/branches/3.3.1/src/main/assembly/isisfish.bat 2011-03-02 16:57:16 UTC (rev 3148) @@ -0,0 +1,5 @@ + at echo off + +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 + Copied: isis-fish/branches/3.3.1/src/main/assembly/isisfish.sh (from rev 3147, isis-fish/trunk/src/main/assembly/isisfish.sh) =================================================================== --- isis-fish/branches/3.3.1/src/main/assembly/isisfish.sh (rev 0) +++ isis-fish/branches/3.3.1/src/main/assembly/isisfish.sh 2011-03-02 16:57:16 UTC (rev 3148) @@ -0,0 +1,6 @@ +#!/bin/bash + +MEMORY="-Xmx1024M" +JRIARGS="-Djava.library.path=jri -DR.type=jni" + +java $MEMORY $JRIARGS -jar ${project.build.finalName}.${project.packaging} $* &> debug.txt Copied: isis-fish/branches/3.3.1/src/main/assembly/isisfish64.bat (from rev 3147, isis-fish/trunk/src/main/assembly/isisfish64.bat) =================================================================== --- isis-fish/branches/3.3.1/src/main/assembly/isisfish64.bat (rev 0) +++ isis-fish/branches/3.3.1/src/main/assembly/isisfish64.bat 2011-03-02 16:57:16 UTC (rev 3148) @@ -0,0 +1,5 @@ + at echo off + +echo [Script] Isis starting... +java -Xmx1024M -Djava.library.path=jri64 -DR.type=jni -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 > debug.txt 2>&1 + Copied: isis-fish/branches/3.3.1/src/main/assembly/isisfish64.sh (from rev 3147, isis-fish/trunk/src/main/assembly/isisfish64.sh) =================================================================== --- isis-fish/branches/3.3.1/src/main/assembly/isisfish64.sh (rev 0) +++ isis-fish/branches/3.3.1/src/main/assembly/isisfish64.sh 2011-03-02 16:57:16 UTC (rev 3148) @@ -0,0 +1,6 @@ +#!/bin/bash + +MEMORY="-Xmx1024M" +JRIARGS="-Djava.library.path=jri64 -DR.type=jni" + +java $MEMORY $JRIARGS -jar ${project.build.finalName}.${project.packaging} $* &> debug.txt Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2002-2010 Ifremer, Code Lutin, Benjamin Poussin +/* + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, 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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - * ##%*/ + * You should have received 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; @@ -151,7 +157,7 @@ return apiVersion; } - static final public String COPYRIGHT_TEXT = "Version " + getVersion() + " IFREMER-MAERHA © 2000-2010"; + static final public String COPYRIGHT_TEXT = "Version " + getVersion() + " IFREMER-MAERHA © 2000-2011"; static final public String CONFIG_FILENAME = "isis-config-" + version.getNumber(0); /** separateur de liste */ @@ -297,7 +303,7 @@ } return result; } - + /** * Retourne l'objet {@link Locale} a utilise pour la langue. * @@ -308,8 +314,18 @@ Locale result = (Locale)ConvertUtils.convert(value, Locale.class); return result; } - + /** + * Change application locale. + * (used during application config command line parse) + * + * @param locale new locale + */ + public void setLocale(String locale) { + setOption(Option.LOCALE.key, locale); + } + + /** * Retourne l'encoding a utiliser pour les fichiers textes. * * @return encoding to use @@ -318,7 +334,7 @@ String result = getOption(Option.ENCODING.key); return result; } - + /** * Retourne le serveur SMTP a utiliser pour l'envoie de mail. * @@ -328,7 +344,7 @@ String result = getOption(Option.SMTP_SERVER.key); return result; } - + /** * Retourne le nom usuel de l'utilisateur. * @@ -376,27 +392,8 @@ public void setSimulatorSshServer(String sshServer) { setOption(Option.SIMULATOR_SSH_SERVER.key, sshServer); } - - /** - * Retourne l'url du service de tranfert de fichier. - * - * @return sftp server - */ - public String getSimulatorSshSftpServer() { - String result = getOption(Option.SIMULATOR_SSH_SFTP_SERVER.key); - return result; - } /** - * Change sftp server url value. - * - * @param sshSftpServer sftp server - */ - public void setSimulatorSshSftpServer(String sshSftpServer) { - setOption(Option.SIMULATOR_SSH_SFTP_SERVER.key, sshSftpServer); - } - - /** * Retourne le login pour acceder au serveur de simulation accessible via SSH. * * @return simulator username @@ -511,8 +508,48 @@ public void setSimulatorSshPbsBinPath(String path) { setOption(Option.SIMULATOR_SSH_PBSBINPATH.key, path); } + + /** + * PBS qsub options (command line). + * + * See man qsub for available options. + * + * @return options + */ + public String getSimulatorSshPbsQsubOptions() { + String result = getOption(Option.SIMULATOR_SSH_PBSQSUBOPTIONS.key); + return result; + } /** + * Change PBS qsub options (command line). + * + * @param options new options + */ + public void setSimulatorSshPbsQsubOptions(String options) { + setOption(Option.SIMULATOR_SSH_PBSQSUBOPTIONS.key, options); + } + + /** + * Java path directory. + * + * @return path + */ + public String getSimulatorSshJavaPath() { + String result = getOption(Option.SIMULATOR_SSH_JAVAPATH.key); + return result; + } + + /** + * Change Java bin path. + * + * @param path new path + */ + public void setSimulatorSshJavaPath(String path) { + setOption(Option.SIMULATOR_SSH_JAVAPATH.key, path); + } + + /** * Retourne l'interval de temps a utiliser * pour recuperer le fichier de control. * @@ -892,7 +929,11 @@ } } if (mustSave) { + + // FIXME EC-20100602 this save for user and configuration can be + // lost when multiple instance are launched at same time !!! saveForUser(); + if (log.isInfoEnabled()) { log.info("Config file migration done"); } @@ -934,8 +975,6 @@ /** Serveur accessible par ssh : address */ SIMULATOR_SSH_SERVER("simulation.ssh.server", _("isisfish.config.main.simulation.ssh.server.description"), "caparmor"), - /** Serveur accessible par ssh : nom du service de transfert de fichier */ - SIMULATOR_SSH_SFTP_SERVER("simulation.ssh.sftpserver", _("isisfish.config.main.simulation.ssh.sftpserver.description"), "caparmor-sftp"), /** Serveur accessible par ssh : login */ SIMULATOR_SSH_USER_NAME("simulation.ssh.username", _("isisfish.config.main.simulation.ssh.username.description"), ""), /** Serveur accessible par ssh : user home directory */ @@ -943,11 +982,15 @@ /** Serveur accessible par ssh : remote data path */ SIMULATOR_SSH_DATAPATH("simulation.ssh.datapath", _("isisfish.config.main.simulation.ssh.datapath.description"), "isis-database-3"), /** Serveur accessible par ssh : remote isis home install */ - SIMULATOR_SSH_ISIS_HOME("simulation.ssh.isis.home", _("isisfish.config.main.simulation.ssh.isis.home.description"), "/home3/caparmor/poussin/isis-fish"), + SIMULATOR_SSH_ISIS_HOME("simulation.ssh.isis.home", _("isisfish.config.main.simulation.ssh.isis.home.description"), "/home3/caparmor/poussin/isis-fish-" + IsisConfig.getApiVersion()), /** Serveur accessible par ssh : remote tmp path */ SIMULATOR_SSH_TMPPATH("simulation.ssh.tmppath", _("isisfish.config.main.simulation.ssh.tmppath.description"), "isis-tmp"), + /** Serveur accessible par SSH : emplacement de Java (full path) */ + SIMULATOR_SSH_JAVAPATH("simulation.ssh.javapath", _("isisfish.config.main.simulation.ssh.javapath.description"), "/home3/caparmor/poussin/jdk/bin/java"), /** Serveur accessible par SSH : emplacement des executables pbs */ SIMULATOR_SSH_PBSBINPATH("simulation.ssh.pbsbinpath", _("isisfish.config.main.simulation.ssh.pbsbinpath.description"), "/usr/pbs/bin"), + /** Serveur accessible par SSH : option de l'executable qsub (defaut to -m n = no mail) */ + SIMULATOR_SSH_PBSQSUBOPTIONS("simulation.ssh.pbsqsuboptions", _("isisfish.config.main.simulation.ssh.pbsqsuboptions.description"), "-m n"), /** Serveur accessible par SSH : interval de check du fichier de control */ SIMULATOR_SSH_CONTROLCHECKINTERVAL("simulation.ssh.control.check.interval", _("isisfish.config.main.simulation.ssh.control.check.interval.description"), "120"), /** Serveur accessible par SSH : nombre de thread au maximum a utilise simultanement */ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2005 - 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2005 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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; @@ -312,13 +319,15 @@ // i18n is not inited here if (log.isInfoEnabled()) { log.info("Starting Isis-Fish with args : " + java.util.Arrays.toString(args)); - StringBuilder builder = new StringBuilder(); - builder.append(SimpleDateFormat.getInstance().format(new java.util.Date())); - builder.append(" Java version: ").append(System.getProperty("java.runtime.version")); - builder.append(" Isis-fish version: ").append(IsisConfig.getVersion()); - log.info(builder.toString()); + log.info("Date: " + SimpleDateFormat.getInstance().format(new java.util.Date())); + log.info("Java version: " + System.getProperty("java.runtime.version")); + log.info("Java VM: " + System.getProperty("java.vm.name")); + log.info("System arch: " + System.getProperty("os.arch")); + log.info("R_HOME: " + System.getenv("R_HOME")); + log.info("R.type: " + System.getProperty("R.type")); + log.info("PATH: " + System.getenv("PATH")); } - + // first load converter and matrixFactory initConvertersAndMatrixFactory(); @@ -593,6 +602,12 @@ */ public static void launchUI() { if (config.isLaunchUI()) { + + // migration must be done in UI envirronement and + // must nerver be done in caparmor + // TODO set it here for now, ui is not displayed on caparmor + //doNuitonMigration(); + // init simulater manager SimulationService.getService(); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFishException.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFishException.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFishException.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,26 +1,33 @@ -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2005 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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; public class IsisFishException extends Exception { - /** */ + /** serialVersionUID. */ private static final long serialVersionUID = -9012018415761616627L; public IsisFishException() { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFishRuntimeException.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFishRuntimeException.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFishRuntimeException.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,45 +1,37 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * IsisFishRuntimeException.java - * - * Created: 21 janv. 2006 03:04:29 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * + * You should have received 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; - /** * @author poussin * */ - public class IsisFishRuntimeException extends RuntimeException { - /** */ + /** serialVersionUID. */ private static final long serialVersionUID = 3388901195563202616L; /** @@ -72,5 +64,3 @@ } } - - Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisTray.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisTray.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisTray.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2007 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2002-2009 Ifremer, Code Lutin, Benjamin Poussin +/* + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, 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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - *##%*/ + * You should have received 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.actions; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2002-2009 Ifremer, Code Lutin, Benjamin Poussin +/* + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, 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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - *##%*/ + * You should have received 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.actions; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2002-2009 Ifremer, Code Lutin, Benjamin Poussin +/* + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, 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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - *##%*/ + * You should have received 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.actions; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2002-2010 Ifremer, Code Lutin, Benjamin Poussin +/* + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, 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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - *##%*/ + * You should have received 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.actions; @@ -27,9 +33,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.ApplicationConfig.Action.Step; import org.nuiton.util.FileUtil; import org.nuiton.util.ZipUtil; -import org.nuiton.util.ApplicationConfig.Action.Step; import fr.ifremer.isisfish.IsisConfig; import fr.ifremer.isisfish.IsisFish; @@ -37,6 +43,7 @@ import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.SimulationControl; import fr.ifremer.isisfish.simulator.SimulationParameter; +import fr.ifremer.isisfish.simulator.SimulationParameterImpl; import fr.ifremer.isisfish.simulator.launcher.InProcessSimulatorLauncher; import fr.ifremer.isisfish.simulator.launcher.SimulationItem; import fr.ifremer.isisfish.simulator.launcher.SimulationService; @@ -80,7 +87,7 @@ inStream.close(); } - SimulationParameter params = new SimulationParameter(); + SimulationParameter params = new SimulationParameterImpl(); params.fromProperties(props); // try to import region if needed Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2002-2009 Ifremer, Code Lutin, Benjamin Poussin +/* + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2009 Ifremer, Code Lutin, 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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - *##%*/ + * You should have received 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.actions; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/package-info.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/package-info.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/package-info.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 1999 - 2010 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 + * 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% + */ /** * Command line actions classes implementation. */ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/aspect/AspectClassLoader.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/aspect/AspectClassLoader.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/aspect/AspectClassLoader.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2007 - 2009 - * 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 1999 - 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.aspect; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/aspect/Cache.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/aspect/Cache.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/aspect/Cache.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.aspect; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 1999 - 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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/aspect/Trace.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/aspect/Trace.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/aspect/Trace.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.aspect; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/aspect/package-info.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/aspect/package-info.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/aspect/package-info.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 1999 - 2010 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 + * 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% + */ /** * Aspect definition classes. * Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/cron/CronService.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/cron/CronService.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/cron/CronService.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2010 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 License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.cron; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/cron/RemoveOldFileTask.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/cron/RemoveOldFileTask.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/cron/RemoveOldFileTask.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2010 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 License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.cron; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/cron/package-info.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/cron/package-info.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/cron/package-info.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 1999 - 2010 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 + * 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% + */ /** * Cron service and scripts. */ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/AnalysePlanStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/AnalysePlanStorage.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/AnalysePlanStorage.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,19 +1,26 @@ -/* *##% +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2005 - 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 free software; you can redistribute it and/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. * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more - * details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place - Suite 330, Boston, MA 02111-1307, USA. ##% + * You should have received 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.datastore; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,26 @@ /* - * *##% Copyright (C) 2006 - 2009 - * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place - Suite 330, Boston, MA 02111-1307, USA. ##% + * You should have received 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.datastore; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,26 @@ /* - * *##% Copyright (C) 2006 - 2009 - * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place - Suite 330, Boston, MA 02111-1307, USA. ##% + * You should have received 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.datastore; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2005 - 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2005 - 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.datastore; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.datastore; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,24 +1,35 @@ -/* ##% Copyright (C) 2002 - 2009 Ifremer, Code Lutin, Tony Chemit - * - * This program is free software; you can redistribute it and/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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * ##% */ + * + * You should have received 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.datastore; import java.io.File; import java.util.Properties; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.hibernate.cfg.Environment; import org.hibernate.dialect.H2Dialect; import org.nuiton.topia.migration.TopiaMigrationServiceImpl; @@ -41,6 +52,9 @@ */ public class IsisH2Config { + /** Class logger. */ + private static Log log = LogFactory.getLog(IsisH2Config.class); + /** Set in static field to be overridden by tests. Default to swing callback. */ protected static Class<?> databaseMigrationClass = SwingMigrationCallbackHandler.class; @@ -139,6 +153,9 @@ // pour h2 on remet STORAGE_DATA car il ne cree pas de repertoire String url = String.format(H2_URL, getStorageDataDirectory(databasePath).getPath(), IsisFish.config.getDatabaseLockMode()); config.setProperty(Environment.URL, url); + if (log.isDebugEnabled()) { + log.debug(Environment.URL + " = " + url); + } // migration configuration, seulement pour les fichiers, pas pour les bases memoires config.put(TopiaMigrationServiceImpl.MIGRATION_APPLICATION_VERSION, IsisConfig.getDatabaseVersion().toString()); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,26 @@ /* - * *##% Copyright (C) 2006 - 2009 - * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place - Suite 330, Boston, MA 02111-1307, USA. ##% + * You should have received 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.datastore; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,26 @@ /* - * *##% Copyright (C) 2005 - 2010 - * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2005 - 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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place - Suite 330, Boston, MA 02111-1307, USA. ##% + * You should have received 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.datastore; @@ -212,8 +218,6 @@ * Recupere le TopiaContext d'une region. * * @param name le nom de la region a recuperer - * @param inSimulation this is a hack to known if simulation is requested - * from a simulation or not * @return Le TopiaContext contenant la region, si la region n'existait null * est retourné */ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2002-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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.datastore; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,26 @@ -/* *##% - * Copyright (C) 2005 - 2010 - * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin +/* + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2005 - 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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place - Suite 330, Boston, MA 02111-1307, USA. ##% + * You should have received 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.datastore; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2005 - 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2005 - 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.datastore; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.datastore; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityStorage.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityStorage.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,18 +1,26 @@ -/* *##% Copyright (C) 2009-2010 Ifremer, Code Lutin +/* + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * 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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place - Suite 330, Boston, MA 02111-1307, USA. ##% + * You should have received 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.datastore; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2007 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.datastore; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2005 - 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2005 - 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.datastore; @@ -46,6 +52,7 @@ import fr.ifremer.isisfish.logging.SimulationLoggerUtil; import fr.ifremer.isisfish.simulator.SimulationControl; import fr.ifremer.isisfish.simulator.SimulationParameter; +import fr.ifremer.isisfish.simulator.SimulationParameterImpl; import fr.ifremer.isisfish.vcs.VCSException; /** @@ -352,7 +359,7 @@ FileInputStream in = new FileInputStream(file); prop.load(in); in.close(); - parameter = new SimulationParameter(); + parameter = new SimulationParameterImpl(); parameter.fromProperties(prop); } catch (IOException eee) { throw new IsisFishRuntimeException(_( @@ -382,7 +389,7 @@ FileInputStream in = new FileInputStream(file); prop.load(in); in.close(); - parameter = new SimulationParameter(); + parameter = new SimulationParameterImpl(); parameter.fromProperties(prop); } catch (IOException eee) { throw new IsisFishRuntimeException(_( Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2005 - 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2005 - 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.datastore; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/StorageChangeEvent.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/StorageChangeEvent.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/StorageChangeEvent.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.datastore; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/StorageChangeListener.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/StorageChangeListener.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/StorageChangeListener.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.datastore; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/StorageException.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/StorageException.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/StorageException.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.datastore; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.datastore; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/SwingMigrationCallbackHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/SwingMigrationCallbackHandler.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/SwingMigrationCallbackHandler.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2007 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.datastore.migration; @@ -159,7 +166,7 @@ "update RESULT set matrix_semantics = replace(matrix_semantics, 'org.codelutin.', 'org.nuiton.') where matrix_semantics IS NOT null;", "update STRATEGYMONTHINFO set proportionMetier_semantics = replace(proportionMetier_semantics, 'org.codelutin.', 'org.nuiton.') where proportionMetier_semantics IS NOT null;", // add .shp default extension - "update FISHERYREGION set MAPFILES = regexp_replace(MAPFILES, '(,|$)', '.shp$1') where MAPFILES IS NOT null;" + "update FISHERYREGION set MAPFILES = regexp_replace(MAPFILES, '(,|$)', '.shp$1') where MAPFILES IS NOT null AND LENGTH(TRIM(MAPFILES)) > 0;" }; for (String sql : sqls) { log.info("try " + sql); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/package-info.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/package-info.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/migration/package-info.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 1999 - 2010 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 + * 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% + */ /** * IsisFish V2 import. */ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/package-info.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/package-info.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/package-info.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 1999 - 2010 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 + * 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% + */ /** * Data storage. * Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,32 +1,26 @@ -/* *##% - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * ImportFromV2.java - * - * Created: 9 oct. 06 18:13:40 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * + * You should have received 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.datastore.update; @@ -126,10 +120,10 @@ /** + * ImportFromV2. + * * @author poussin - * */ - public class ImportFromV2 { /** to use log facility, just put in your code: log.info(\"...\"); */ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/update/package-info.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/update/package-info.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/update/package-info.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 1999 - 2010 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 + * 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% + */ /** * Database storage migration. */ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/CellImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/CellImpl.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/CellImpl.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.entities; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/EffortDescriptionImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/EffortDescriptionImpl.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/EffortDescriptionImpl.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.entities; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.entities; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.entities; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/Formule.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/Formule.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/Formule.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.entities; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/GearImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/GearImpl.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/GearImpl.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * Ifremer, Code Lutin, 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.entities; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/MetierImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/MetierImpl.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/MetierImpl.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * Ifremer, Code Lutin, 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.entities; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.entities; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.entities; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.entities; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.entities; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PortImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PortImpl.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PortImpl.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.entities; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.entities; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SelectivityImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SelectivityImpl.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SelectivityImpl.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.entities; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.entities; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SpeciesImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SpeciesImpl.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SpeciesImpl.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.entities; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.entities; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.entities; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/TargetSpeciesImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/TargetSpeciesImpl.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/TargetSpeciesImpl.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.entities; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.entities; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.entities; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/ZoneImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/ZoneImpl.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/ZoneImpl.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.entities; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/package-info.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/package-info.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/package-info.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 1999 - 2010 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 + * 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% + */ /** * Entité metier d'IsisFish. */ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/EmigrationEquation.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/EmigrationEquation.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/EmigrationEquation.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,32 +1,26 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * EmigrationEquation.java - * - * Created: 23 août 2006 12:06:02 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * + * You should have received 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.equation; @@ -39,12 +33,17 @@ import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.util.Args; - /** + * EmigrationEquation.java + * + * Created: 23 août 2006 12:06:02 + * * @author poussin + * @version $Revision$ * + * Last update: $Date$ + * by : $Author$ */ - public interface EmigrationEquation { /** @@ -63,5 +62,3 @@ Zone departureZone) throws Exception; } - - Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/ImmigrationEquation.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/ImmigrationEquation.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/ImmigrationEquation.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,32 +1,26 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * ImmigrationEquation.java - * - * Created: 23 août 2006 12:06:32 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * + * You should have received 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.equation; @@ -39,12 +33,17 @@ import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.util.Args; - /** + * ImmigrationEquation.java + * + * Created: 23 août 2006 12:06:32 + * * @author poussin + * @version $Revision$ * + * Last update: $Date$ + * by : $Author$ */ - public interface ImmigrationEquation { /** Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/Language.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/Language.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/Language.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,23 +1,31 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ -/* * +package fr.ifremer.isisfish.equation; + +/** * Language.java * * Created: 23 août 2006 01:18:19 @@ -28,20 +36,9 @@ * Last update: $Date$ * by : $Author$ */ - -package fr.ifremer.isisfish.equation; - - -/** - * @author poussin - * - */ - public class Language { final static public String JAVA = "java"; final static public String BSH = "BSH"; final static public String ECMASCRIPT = "ECMAScript"; final static public String GROOVY = "Groovy"; } - - Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/MigrationEquation.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/MigrationEquation.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/MigrationEquation.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,32 +1,26 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * MigrationEquation.java - * - * Created: 23 août 2006 12:05:14 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * + * You should have received 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.equation; @@ -39,12 +33,17 @@ import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.util.Args; - /** + * MigrationEquation.java + * + * Created: 23 août 2006 12:05:14 + * * @author poussin + * @version $Revision$ * + * Last update: $Date$ + * by : $Author$ */ - public interface MigrationEquation { /** Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowth.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowth.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowth.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,32 +1,26 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * PopulationGrowth.java - * - * Created: 4 juil. 2006 13:03:25 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * + * You should have received 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.equation; @@ -35,12 +29,17 @@ import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.util.Args; - /** + * PopulationGrowth.java + * + * Created: 4 juil. 2006 13:03:25 + * * @author poussin + * @version $Revision$ * + * Last update: $Date$ + * by : $Author$ */ - public interface PopulationGrowth { /** Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowthReverse.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowthReverse.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowthReverse.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,32 +1,26 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * PopulationGrowthReverse.java - * - * Created: 23 août 2006 01:26:37 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * + * You should have received 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.equation; @@ -35,12 +29,17 @@ import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.util.Args; - /** + * PopulationGrowthReverse.java + * + * Created: 23 août 2006 01:26:37 + * * @author poussin + * @version $Revision$ * + * Last update: $Date$ + * by : $Author$ */ - public interface PopulationGrowthReverse { /** Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/PopulationMeanWeight.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/PopulationMeanWeight.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/PopulationMeanWeight.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.equation; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/PopulationNaturalDeathRate.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/PopulationNaturalDeathRate.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/PopulationNaturalDeathRate.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,32 +1,26 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * PopulationNaturalDeathRate.java - * - * Created: 23 août 2006 11:13:57 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * + * You should have received 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.equation; @@ -37,12 +31,17 @@ import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.util.Args; - /** + * PopulationNaturalDeathRate.java + * + * Created: 23 août 2006 11:13:57 + * * @author poussin + * @version $Revision$ * + * Last update: $Date$ + * by : $Author$ */ - public interface PopulationNaturalDeathRate { /** Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/PopulationPrice.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/PopulationPrice.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/PopulationPrice.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,32 +1,26 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * PopulationPrice.java - * - * Created: 23 août 2006 11:15:17 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * + * You should have received 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.equation; @@ -35,12 +29,17 @@ import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.util.Args; - /** + * PopulationPrice.java + * + * Created: 23 août 2006 11:15:17 + * * @author poussin + * @version $Revision$ * + * Last update: $Date$ + * by : $Author$ */ - public interface PopulationPrice { /** Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionEquation.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionEquation.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionEquation.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,32 +1,26 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * PopulationReproductionEquation.java - * - * Created: 23 août 2006 11:11:40 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * + * You should have received 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.equation; @@ -43,12 +37,17 @@ import fr.ifremer.isisfish.util.ArgTypes; import fr.ifremer.isisfish.util.Args; - /** + * PopulationReproductionEquation.java + * + * Created: 23 août 2006 11:11:40 + * * @author poussin + * @version $Revision$ * + * Last update: $Date$ + * by : $Author$ */ - public interface PopulationReproductionEquation { /** Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/SelectivityEquation.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/SelectivityEquation.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/SelectivityEquation.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,32 +1,26 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * SelectivityEquation.java - * - * Created: 23 août 2006 11:39:38 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * + * You should have received 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.equation; @@ -37,12 +31,17 @@ import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.util.Args; - /** + * SelectivityEquation.java + * + * Created: 23 août 2006 11:39:38 + * * @author poussin + * @version $Revision$ * + * Last update: $Date$ + * by : $Author$ */ - public interface SelectivityEquation { /** Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/SoVTechnicalEfficiencyEquation.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/SoVTechnicalEfficiencyEquation.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/SoVTechnicalEfficiencyEquation.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,26 @@ /* - * Copyright (C) 2002-2009 Ifremer, Code Lutin, Benjamin Poussin + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, 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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. + * You should have received 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.equation; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/StrategyInactivityEquation.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/StrategyInactivityEquation.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/StrategyInactivityEquation.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,26 @@ /* - * Copyright (C) 2002-2009 Ifremer, Code Lutin, Benjamin Poussin + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, 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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. + * You should have received 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.equation; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/TargetSpeciesTargetFactorEquation.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/TargetSpeciesTargetFactorEquation.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/equation/TargetSpeciesTargetFactorEquation.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,32 +1,26 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * TargetSpeciesTargetFactorEquation.java - * - * Created: 23 août 2006 16:44:40 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * + * You should have received 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.equation; @@ -37,12 +31,17 @@ import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.util.Args; - /** + * TargetSpeciesTargetFactorEquation.java + * + * Created: 23 août 2006 16:44:40 + * * @author poussin + * @version $Revision$ * + * Last update: $Date$ + * by : $Author$ */ - public interface TargetSpeciesTargetFactorEquation { /** Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/export/Export.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/export/Export.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/export/Export.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.export; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.export; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/export/SensitivityExport.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/export/SensitivityExport.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/export/SensitivityExport.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.export; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/LogLevel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/LogLevel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/LogLevel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,25 +1,32 @@ /* - * ##% Copyright (C) 2002 2009 - * Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit - * - * This program is free software; you can redistribute it and/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. - * + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * ##% */ + * + * You should have received 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.logging; /** - * abstraction of a log level TODO put it in LutinLog + * abstraction of a log level * <p/> * a LogLevel is defined by 3 properties : * <ul> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/LogLevelUtil.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/LogLevelUtil.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/LogLevelUtil.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,28 @@ /* - * ##% Copyright (C) 2002 - 2009 - * Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit - * - * This program is free software; you can redistribute it and/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. - * + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * ##% */ + * + * You should have received 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.logging; import java.util.ArrayList; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,28 @@ /* - * ##% Copyright (C) 2002 - 2009 - * Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit - * - * This program is free software; you can redistribute it and/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. - * + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * ##% */ + * + * You should have received 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.logging; import fr.ifremer.isisfish.IsisConfig; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/ThreadFilter.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/ThreadFilter.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/ThreadFilter.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,28 @@ /* - * ##% Copyright (C) 2002 - 2009 - * Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit - * - * This program is free software; you can redistribute it and/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. - * + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * ##% */ + * + * You should have received 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.logging; /** Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,34 +1,33 @@ /* - * ##% Copyright (C) 2002 - 2009 - * Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit - * - * This program is free software; you can redistribute it and/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. - * + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * ##% */ + * + * You should have received 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.logging.console; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import static org.nuiton.i18n.I18n._; -import org.nuiton.widget.IconFactory; -import org.nuiton.log.LutinLogFactory; -import javax.swing.*; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; -import java.awt.*; +import java.awt.EventQueue; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ComponentEvent; @@ -36,6 +35,16 @@ import java.io.File; import java.io.IOException; +import javax.swing.JCheckBox; +import javax.swing.JScrollBar; +import javax.swing.JScrollPane; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.widget.IconFactory; + import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.ui.logging.console.LogConsoleUI; @@ -330,9 +339,7 @@ } public static void IsisStart() { - // LutinLogFactory make memory leak !!! - //System.setProperty("org.apache.commons.logging.LogFactory", - // LutinLogFactory.class.getName()); + try { IsisFish.init(); } catch (Exception e) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,38 +1,36 @@ /* - * ##% Copyright (C) 2002 - 2009 - * Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit - * - * This program is free software; you can redistribute it and/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. - * + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * ##% */ + * + * You should have received 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.logging.console; -import fr.ifremer.isisfish.logging.LogLevel; -import fr.ifremer.isisfish.logging.LogLevelUtil; -import static fr.ifremer.isisfish.logging.console.LogConsole.*; -import fr.ifremer.isisfish.logging.io.FileOffsetReader; -import fr.ifremer.isisfish.logging.io.LineReader; -import fr.ifremer.isisfish.logging.io.LineReaderUtil; -import fr.ifremer.isisfish.logging.io.LineReaderUtil.LevelsLineReader; -import fr.ifremer.isisfish.logging.io.LineReaderUtil.PatternLineReader; -import fr.ifremer.isisfish.logging.io.MemoryOffsetReader; -import org.apache.commons.logging.Log; +import static fr.ifremer.isisfish.logging.console.LogConsole.EDITOR_SIZE_CHANGED_PROPERTY; +import static fr.ifremer.isisfish.logging.console.LogConsole.RESET_CHANGED_PROPERTY; +import static fr.ifremer.isisfish.logging.console.LogConsole.TEXT_CHANGED_PROPERTY; import static org.apache.commons.logging.LogFactory.getLog; import static org.nuiton.i18n.I18n._; -import org.nuiton.widget.StatusBar; -import javax.swing.*; import java.awt.event.AdjustmentEvent; import java.awt.event.AdjustmentListener; import java.awt.event.MouseWheelEvent; @@ -46,6 +44,20 @@ import java.util.Arrays; import java.util.List; +import javax.swing.JEditorPane; + +import org.apache.commons.logging.Log; +import org.nuiton.widget.StatusBar; + +import fr.ifremer.isisfish.logging.LogLevel; +import fr.ifremer.isisfish.logging.LogLevelUtil; +import fr.ifremer.isisfish.logging.io.FileOffsetReader; +import fr.ifremer.isisfish.logging.io.LineReader; +import fr.ifremer.isisfish.logging.io.LineReaderUtil; +import fr.ifremer.isisfish.logging.io.LineReaderUtil.LevelsLineReader; +import fr.ifremer.isisfish.logging.io.LineReaderUtil.PatternLineReader; +import fr.ifremer.isisfish.logging.io.MemoryOffsetReader; + /** * This class is responsible of provinding LogRecord, it deals with LogReecord * stored in a file with a serializedForm for performance issue. Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,28 @@ /* - * ##% Copyright (C) 2002 - 2009 - * Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit - * - * This program is free software; you can redistribute it and/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. - * + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * ##% */ + * + * You should have received 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.logging.console; import javax.swing.event.ChangeEvent; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,28 @@ /* - * ##% Copyright (C) 2002 - 2009 - * Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit - * - * This program is free software; you can redistribute it and/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. - * + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * ##% */ + * + * You should have received 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.logging.console; import static org.nuiton.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/io/FileOffsetReader.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/io/FileOffsetReader.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/io/FileOffsetReader.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,28 @@ /* -* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Code Lutin, -* Benjamin Poussin, Tony Chemit -* -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* ##% */ + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, CodeLutin, Benjamin Poussin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/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.logging.io; import org.apache.commons.logging.Log; @@ -38,7 +44,6 @@ * * @author chemit */ - public class FileOffsetReader extends OffsetReader { protected static final Log log = LogFactory.getLog(FileOffsetReader.class); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/io/LineReader.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/io/LineReader.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/io/LineReader.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,28 @@ /* -* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Code Lutin, -* Benjamin Poussin, Tony Chemit -* -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* ##% */ + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, CodeLutin, Benjamin Poussin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/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.logging.io; import org.apache.commons.logging.Log; @@ -38,7 +44,6 @@ * * @author chemit */ - public class LineReader { protected static final Log log = LogFactory.getLog(LineReader.class); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/io/LineReaderUtil.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/io/LineReaderUtil.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/io/LineReaderUtil.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,28 @@ /* -* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Code Lutin, -* Benjamin Poussin, Tony Chemit -* -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* ##% */ + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, CodeLutin, Benjamin Poussin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/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.logging.io; import fr.ifremer.isisfish.logging.LogLevel; @@ -31,7 +37,6 @@ * * @author chemit */ - public class LineReaderUtil { /** Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/io/MemoryOffsetReader.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/io/MemoryOffsetReader.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/io/MemoryOffsetReader.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,28 @@ /* -* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Code Lutin, -* Benjamin Poussin, Tony Chemit -* -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* ##% */ + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, CodeLutin, Benjamin Poussin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/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.logging.io; import org.apache.commons.logging.Log; @@ -34,7 +40,6 @@ * * @author chemit */ - public class MemoryOffsetReader extends OffsetReader { protected static final Log log = LogFactory.getLog(MemoryOffsetReader.class); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/io/OffsetReader.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/io/OffsetReader.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/io/OffsetReader.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,28 @@ /* -* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Code Lutin, -* Benjamin Poussin, Tony Chemit -* -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* ##% */ + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, CodeLutin, Benjamin Poussin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/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.logging.io; import java.io.BufferedReader; @@ -31,7 +37,6 @@ * * @author chemit */ - public abstract class OffsetReader { /** number of lines managed by the reader */ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2002, 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.map; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/Coordinate.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/Coordinate.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/Coordinate.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2002, 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.map; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/CopyMapToClipboardListener.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/CopyMapToClipboardListener.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/CopyMapToClipboardListener.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.map; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/DataMap.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/DataMap.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/DataMap.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2002, 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.map; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/DataMapInfo.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/DataMapInfo.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/DataMapInfo.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2002, 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.map; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/DataMapList.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/DataMapList.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/DataMapList.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2002, 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.map; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/DefaultDataMap.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/DefaultDataMap.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/DefaultDataMap.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2002, 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.map; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/DefaultScale.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/DefaultScale.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/DefaultScale.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2002, 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.map; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2002 - 2009 - * 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.map; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/Motif.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/Motif.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/Motif.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2002, 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.map; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2002, 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.map; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/Scale.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/Scale.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/Scale.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2002 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.map; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2002 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.map; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 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 License, or (at your option) any later version. - * + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.mexico; @@ -344,7 +351,7 @@ if (content != null) { content = content.trim(); - Pattern matrixPattern = Pattern.compile("^(.*)\\((.*\\))$"); + Pattern matrixPattern = Pattern.compile("^(.*)\\((.*)\\)$"); Matcher matcher = matrixPattern.matcher(content); if (matcher.find()) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/export/HorizontalEntityVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/export/HorizontalEntityVisitor.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/export/HorizontalEntityVisitor.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009-2010 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 License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.mexico.export; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExplorer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExplorer.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExplorer.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 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 License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.mexico.export; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExport.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExport.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExport.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 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 License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.mexico.export; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009-2010 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 License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.mexico.export; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.mexico.xml; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DesignPlanXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DesignPlanXMLVisitor.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DesignPlanXMLVisitor.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.mexico.xml; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.mexico.xml; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.mexico.xml; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomainXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomainXMLVisitor.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomainXMLVisitor.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.mexico.xml; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationContinuousDomainXMLVisitor.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 1999 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.mexico.xml; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.mexico.xml; @@ -84,7 +91,8 @@ } else if (factor.getDomain() instanceof DiscreteDomain) { xmlBuffer.append(" property=\"discrete\""); - referenceValueForType = (Serializable)((DiscreteDomain)factor.getDomain()).getValues().get(((DiscreteDomain)factor.getDomain()).getValues().firstKey()); + Object firstKey = ((DiscreteDomain)factor.getDomain()).getValues().firstKey(); + referenceValueForType = (Serializable)((DiscreteDomain)factor.getDomain()).getValues().get(firstKey); } // type attribute if (referenceValueForType instanceof Double || referenceValueForType instanceof Float) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/MatrixContinuousDomainXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/MatrixContinuousDomainXMLVisitor.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/MatrixContinuousDomainXMLVisitor.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.mexico.xml; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ScenarioXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ScenarioXMLVisitor.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ScenarioXMLVisitor.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.mexico.xml; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/SensitivityScenariosXMLVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/SensitivityScenariosXMLVisitor.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/SensitivityScenariosXMLVisitor.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.mexico.xml; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/rule/AbstractRule.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/rule/AbstractRule.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/rule/AbstractRule.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.rule; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/rule/Rule.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/rule/Rule.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/rule/Rule.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.rule; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/rule/RuleHelper.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/rule/RuleHelper.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/rule/RuleHelper.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2007 - 2009 - * 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.rule; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/rule/package-info.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/rule/package-info.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/rule/package-info.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 1999 - 2010 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 + * 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% + */ /** * Rule. */ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlan.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlan.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlan.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2007 - 2009 - * 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.simulator; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlanContext.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlanContext.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlanContext.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2007 - 2009 - * 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.simulator; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlanIndependent.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlanIndependent.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlanIndependent.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2007 - 2009 - * 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.simulator; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.simulator; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.simulator; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,32 +1,26 @@ -/* *##% - * Copyright (C) 2007 - * 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * ResultManager.java - * - * Created: 13 nov. 07 11:54:47 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * + * You should have received 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.simulator; @@ -50,12 +44,17 @@ import fr.ifremer.isisfish.rule.Rule; import fr.ifremer.isisfish.types.Date; - /** * Used to store and retrieve result during simulation. This class manage * result listener * + * Created: 13 nov. 07 11:54:47 + * * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ */ public class ResultManager { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/RuleMonitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/RuleMonitor.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/RuleMonitor.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.simulator; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.simulator; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2002 - 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 free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.simulator; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationException.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationException.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationException.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,23 +1,31 @@ -/* *##% - * Copyright (C) 2002-2005 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ -/* * +package fr.ifremer.isisfish.simulator; + +/** * SimulationException.java * * Created: Wed Aug 14 2002 @@ -28,20 +36,17 @@ * Mise a jour: $Date$ * par : $Author$ */ - -package fr.ifremer.isisfish.simulator; - public class SimulationException extends RuntimeException { // SimulationException - /** */ + /** serialVersionUID. */ private static final long serialVersionUID = -5643196187139951889L; public SimulationException(String msg) { super(msg); } - public SimulationException(String msg, Throwable e) { - super(msg, e); + public SimulationException(String msg, Throwable cause) { + super(msg, cause); } } // SimulationException Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2007 - 2009 - * 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.simulator; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationListener.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationListener.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationListener.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,38 +1,30 @@ -/* *##% - * Copyright (C) 2007 - * 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * SimulationListener.java - * - * Created: 13 nov. 07 12:37:55 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * + * You should have received 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.simulator; - - /** * You can create new SimulationListener and add it for simulation. To do that * add tag/value in advanced parameter simulation launcher like Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationMeta.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationMeta.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationMeta.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 1999 - 2010 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 + * 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.simulator; import fr.ifremer.isisfish.ui.widget.filter.DateInterval; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,69 +1,45 @@ -/* *##% - * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin +/* + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 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 + * 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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place - Suite 330, Boston, MA 02111-1307, USA. ##% + * You should have received 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.simulator; -import static org.nuiton.i18n.I18n._; - -import java.io.File; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Properties; -import org.apache.commons.beanutils.ConvertUtilsBean; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.math.matrix.MatrixFactory; -import org.nuiton.math.matrix.MatrixHelper; import org.nuiton.math.matrix.MatrixND; -import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.util.SortedProperties; -import org.nuiton.util.StringUtil; import fr.ifremer.isisfish.IsisConfig; -import fr.ifremer.isisfish.IsisFishDAOHelper; -import fr.ifremer.isisfish.IsisFishException; -import fr.ifremer.isisfish.datastore.AnalysePlanStorage; import fr.ifremer.isisfish.datastore.RegionStorage; -import fr.ifremer.isisfish.datastore.RuleStorage; -import fr.ifremer.isisfish.datastore.SensitivityExportStorage; -import fr.ifremer.isisfish.datastore.SensitivityStorage; import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.PopulationDAO; import fr.ifremer.isisfish.entities.Strategy; -import fr.ifremer.isisfish.entities.StrategyDAO; -import fr.ifremer.isisfish.export.ExportHelper; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.rule.Rule; -import fr.ifremer.isisfish.rule.RuleHelper; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator; -import fr.ifremer.isisfish.util.ConverterUtil; /** * Contains all parameters for one simulation. @@ -87,154 +63,31 @@ * Last update: $Date$ * By : $Author$ */ -public class SimulationParameter { +public interface SimulationParameter { - /** Logger for this class. */ - private static Log log = LogFactory.getLog(SimulationParameter.class); - - /** Remember last read properties. */ - protected Properties propertiesParameters; - /** - * Isis-fish version that permit to do the simulation. - * Must be set just before simulation by simulator. - */ - protected String isisFishVersion; - - /** Description de la simulation. */ - protected String description; - - /** Nom de la region sur lequel on simule. */ - protected String regionName; - - /** Nombre d'année sur lequel on souhaite simuler. */ - protected Integer numberOfYear; - - /** Le nom de l'objet script a utiliser pour faire la simulation. */ - protected String simulatorName; - - /** Utilisation ou non des optimisations. */ - protected Boolean useOptimization; - - /** Utilisation ou non des statistiques. */ - protected Boolean useStatistic; - - /** La liste des strategies a utiliser pour la simulation. */ - protected List<Strategy> strategies; - - /** La liste des populations a utiliser pour la simulation. */ - protected List<Population> populations; - - /** Les effectifs initiaux des différentes population. */ - protected Map<Population, MatrixND> numbers; - - /** La liste des regles de gestions a utiliser pour la simulation. */ - protected List<Rule> rules; - - /** La liste des regles potentiellement ajoutée par les plans d'analyse. */ - protected List<String> extraRules; - - /** La liste des plans a utiliser pour la simulation. */ - protected List<AnalysePlan> analysePlans; - - /** Ma liste des exports automatique a faire en fin de simulation. */ - protected List<String> exportNames; - - /** Utilisation du script de pre simulation. */ - protected Boolean usePreScript; - - /** Le script de pre simulation a utiliser. */ - protected String preScript; - - /** Utilisation du plan d'analyse. */ - protected Boolean useAnalysePlan; - - /** - * Le numero de sequence de la liste des plans d'analyse. Le premier - * élement du plan doit etre 0. Si la simulation ne fait pas partie d'un - * plan la valeur est -1. */ - protected Integer analysePlanNumber; - - /** Export utilisés pour les analyses de sensibilités. */ - protected List<SensitivityExport> sensitivityExports; - - /** - * Nombre de simulation constituant l'analyse de sensibilité. - * - * FIXME ce parametre ne devrait pas ce trouver à cet endroit. - * Ce n'est pas un parametres, mais une infos de simulation. - * Cela permet de savoir combien de simulation il y a au total - * pour savoir quand elle sont terminées. - */ - protected Integer numberOfSensitivitySimulation; - - /** Export utilisés pour les analyses de sensibilités. */ - protected SensitivityCalculator sensitivityCalculator; - - /** La liste des resultats qui nous interesse. */ - protected Collection<String> resultEnabled; - - /** Autre parametre defini par l'utilisateur. */ - protected Map<String, String> tagValue; - - /** - * Si vrai seul les exports automatiques ne sont souhaiter, la simulation - * pourrait etre supprimée a la fin. - */ - protected Boolean onlyExport; - - /** Le niveau de log du simulateur à utiliser pendant la simulation. Par defaut info. */ - protected String simulLogLevel = "info"; - /** Le niveau de log des scripts à utiliser pendant la simulation. Par defaut info. */ - protected String scriptLogLevel = "info"; - /** Le niveau de log des librairies à utiliser pendant la simulation. Par defaut error. */ - protected String libLogLevel = "error"; - - /** La region corespondant au parametre {@link #regionName}. */ - protected transient RegionStorage region; - - /** * Permet de verifier que tous les parametres sont bon. Si ce n'est pas le * cas la liste retournée contient la liste des messages d'erreur. * * @return la liste d'erreur */ - public List<String> check() { - List<String> result = new ArrayList<String>(); - // TODO faire la verif et pour chaque erreur mettre un message - // dans la liste result (par exemple si pas d'effectif - // pour une pop - return result; - } + public List<String> check(); /** * Get isis fish version for the simulation. * - * Defaut value to : {@link IsisConfig#getVersion()}. + * Default value to : {@link IsisConfig#getVersion()}. * * @return the isisFishVersion. */ - public String getIsisFishVersion() { - // if not already set - if (isisFishVersion == null) { - if (propertiesParameters != null) { - isisFishVersion = propertiesParameters.getProperty("isisFishVersion", ""); - } else { - // default value - isisFishVersion = IsisConfig.getVersion(); - } - } - return isisFishVersion; - } + public String getIsisFishVersion(); /** * Set isis fish Version. * * @param isisFishVersion The isisFishVersion to set. */ - public void setIsisFishVersion(String isisFishVersion) { - this.isisFishVersion = isisFishVersion; - } + public void setIsisFishVersion(String isisFishVersion); /** * Get description property. @@ -243,285 +96,31 @@ * * @return Description property. */ - public String getDescription() { + public abstract String getDescription(); - if (description == null) { - if (propertiesParameters != null) { - description = propertiesParameters.getProperty("description", ""); - } else { - // default value - description = ""; - } - } - return this.description; - } - /** * Set simulation description. * * @param description the description to set. */ - public void setDescription(String description) { - this.description = description; - } + public abstract void setDescription(String description); /** - * Load region conresponding to {@link #regionName}. + * Load region corresponding to {@link #getRegionName()}. * * @return the region */ - public RegionStorage getRegion() { + public abstract RegionStorage getRegion(); - if (region == null || !region.getName().equals(getRegionName())) { - // bien faire attention ici que la bonne region est ouverte - // - isis-database-3 dans le cas d'une region normale - // - simulation dans le cas d'une simulation - region = RegionStorage.getRegion(getRegionName()); - } else { - if (log.isDebugEnabled()) { - log.debug(_("Region %s already inited", getRegionName())); - } - } - return this.region; - } + public abstract MatrixND getNumberOf(Population pop); - public MatrixND getNumberOf(Population pop) { - if (numbers == null) { - numbers = new LinkedHashMap<Population, MatrixND>(); - } - MatrixND result = numbers.get(pop); - if (result == null) { - List groups = pop.getPopulationGroup(); - List zones = pop.getPopulationZone(); - - if (groups.size() == 0) { - groups.add("No group"); - } - if (zones.size() == 0) { - zones.add("No zone"); - } - List[] semantics = new List[] { groups, zones }; - result = MatrixFactory.getInstance().create(semantics); - - numbers.put(pop, result); - } - return result; - } - /** - * Permet de mettre les parametres de la regle sous une forme String pour - * pouvoir les relire ensuite. - * - * @param ruleIndex l'index de la rule - * @param rule La regle dont on souhaite mettre les parametres dans l'objet - * Properties retourne - * @return L'objet Properties contenant les valeurs des parametres de la - * regle - */ - protected Properties ruleParametertoProperties(int ruleIndex, Rule rule) { - Properties result = new Properties(); - ConvertUtilsBean beanUtils = ConverterUtil.getConverter(getRegion() - .getStorage()); - for (String paramName : RuleStorage.getParameterNames(rule).keySet()) { - String paramValueString; - try { - Object value = RuleStorage.getParameterValue(rule, paramName); - paramValueString = beanUtils.convert(value); - if (paramValueString != null) { - result.setProperty("rule." + ruleIndex + ".parameter." + paramName, paramValueString); - } - } catch (IsisFishException eee) { - if (log.isWarnEnabled()) { - log.warn("Can't convert parameter value to String: " + paramName, eee); - } - } - } - - return result; - } - - /** - * Permet de mettre les parametres de l'export sous une forme String pour - * pouvoir les relire ensuite. - * - * @param sensitivityExportIndex l'index de l'export - * @param sensitivityExport l'export dont on souhaite mettre les parametres dans l'objet - * Properties retourné - * @return L'objet Properties contenant les valeurs des parametres de l'export - */ - protected Properties sensitivityExportParametertoProperties( - int sensitivityExportIndex, SensitivityExport sensitivityExport) { - Properties result = new Properties(); - ConvertUtilsBean beanUtils = ConverterUtil.getConverter(getRegion().getStorage()); - for (String paramName : SensitivityExportStorage.getParameterNames(sensitivityExport).keySet()) { - try { - Object value = SensitivityExportStorage.getParameterValue( - sensitivityExport, paramName); - String paramValueString = beanUtils.convert(value); - if (paramValueString != null) { - result.setProperty("sensitivityexport." - + sensitivityExportIndex + ".parameter." - + paramName, paramValueString); - } - } catch (IsisFishException eee) { - if (log.isWarnEnabled()) { - log.warn("Can't convert parameter value to String: " - + paramName, eee); - } - } - } - - return result; - } - - /** - * Permet de mettre les parametres du calculateur sous une forme String pour - * pouvoir les relire ensuite. - * - * @param sensitivityIndex l'index du calculateur de sensitivity - * @param calculator Le calculateurdont on souhaite mettre les parametres dans l'objet - * Properties retourne - * @return L'objet Properties contenant les valeurs des parametres du calculateur de sensibilité - */ - protected Properties sensitivityCalculatorParametertoProperties( - int sensitivityIndex, SensitivityCalculator calculator) { - Properties result = new Properties(); - ConvertUtilsBean beanUtils = ConverterUtil.getConverter(getRegion().getStorage()); - for (String paramName : SensitivityStorage.getParameterNames(calculator).keySet()) { - try { - Object value = SensitivityStorage.getParameterValue(calculator, - paramName); - String paramValueString = beanUtils.convert(value); - if (paramValueString != null) { - result.setProperty("sensitivity." + sensitivityIndex + ".parameter." + paramName, paramValueString); - } - } catch (IsisFishException eee) { - if (log.isWarnEnabled()) { - log.warn("Can't convert parameter value to String: " - + paramName, eee); - } - } - } - - return result; - } - - /** - * Permet de mettre les parametres du plan sous une forme String pour - * pouvoir les relire ensuite. - * - * @param planIndex l'index du plan - * @param plan Le plan dont on souhaite mettre les parametres dans l'objet - * Properties retourne - * @return L'objet Properties contenant les valeurs des parametres du plan - */ - protected Properties planParametertoProperties(int planIndex, - AnalysePlan plan) { - Properties result = new Properties(); - ConvertUtilsBean beanUtils = ConverterUtil.getConverter(getRegion().getStorage()); - for (String paramName : AnalysePlanStorage.getParameterNames(plan).keySet()) { - try { - Object value = AnalysePlanStorage.getParameterValue(plan,paramName); - String paramValueString = beanUtils.convert(value); - if (paramValueString != null) { - result.setProperty("plan." + planIndex + ".parameter." - + paramName, paramValueString); - } - } catch (IsisFishException eee) { - if (log.isWarnEnabled()) { - log.warn("Can't convert parametre value to String: " - + paramName, eee); - } - } - } - - return result; - } - - /** - * Recupere dans prop les valeurs des champs specifique au plan et met a - * jour les champs du plan. - * - * @param planIndex l'index du plan - * @param plan le plan dont les parametres doivent etre lu depuis les - * proprietes - * @param props les proprietes contenant les parametre du plan - */ - protected void populateAnalysePlan(int planIndex, AnalysePlan plan, - Properties props) { - ConvertUtilsBean beanUtils = ConverterUtil.getConverter(getRegion() - .getStorage()); - String planName = AnalysePlanStorage.getName(plan); - String paramTag = "plan." + planIndex + ".parameter."; - - for (Map.Entry<String, Class<?>> entry : AnalysePlanStorage.getParameterNames(plan).entrySet()) { - String propName = entry.getKey(); - Class<?> type = entry.getValue(); - if (TopiaEntity.class.isAssignableFrom(type)) { - type = TopiaEntity.class; - } - String valueString = props.getProperty(paramTag + propName); - Object value = beanUtils.convert(valueString, type); - try { - AnalysePlanStorage.setParameterValue(plan, propName, value); - } catch (IsisFishException eee) { - if (log.isWarnEnabled()) { - log.warn("Can't reload field " + propName + " for plan " - + planName, eee); - } - } - } - } - - /** - * Recupere dans prop les valeurs des champs specifique au calculateur de - * sensibilité et met a jour les champs du calculateur. - * - * @param calculatorIndex l'index du calculateur - * @param calculator le calculateur dont les parametres doivent etre lu depuis lesproprietes - * @param props les proprietes contenant les parametre du calculateur - */ - protected void populateSensitivityCalculator(int calculatorIndex, - SensitivityCalculator calculator, Properties props) { - ConvertUtilsBean beanUtils = ConverterUtil.getConverter(getRegion() - .getStorage()); - String calculatorName = SensitivityStorage.getName(calculator); - String paramTag = "sensitivity." + calculatorIndex + ".parameter."; - - for (Map.Entry<String, Class<?>> entry : SensitivityStorage.getParameterNames(calculator).entrySet()) { - String propName = entry.getKey(); - Class<?> type = entry.getValue(); - if (TopiaEntity.class.isAssignableFrom(type)) { - type = TopiaEntity.class; - } - String valueString = props.getProperty(paramTag + propName); - Object value = beanUtils.convert(valueString, type); - try { - SensitivityStorage.setParameterValue(calculator, propName, value); - } catch (IsisFishException eee) { - if (log.isWarnEnabled()) { - log.warn("Can't reload field " + propName - + " for sensitivity calculator " + calculatorName, - eee); - } - } - } - } - - /** * Get extra rules list. * * @return Returns the extraRules. */ - public List<String> getExtraRules() { + public abstract List<String> getExtraRules(); - if (extraRules == null) { - // no properties in config ? - extraRules = new ArrayList<String>(); - } - return extraRules; - } - /** * Add extra rules. * @@ -530,81 +129,19 @@ * * @param extraRules extra rules to add */ - public void addExtraRules(String... extraRules) { - getExtraRules().addAll(Arrays.asList(extraRules)); - } + public abstract void addExtraRules(String... extraRules); /** * Get instantiated population list. * * @return Returns the populations. */ - public List<Population> getPopulations() { - if (populations == null) { - populations = new ArrayList<Population>(); + public abstract List<Population> getPopulations(); - if (propertiesParameters != null) { - - try { - // On verifie tout d'abord que l'on ai pas dans une simulation - // si on y es, on utilise le context static non null du thread local - // Resoud les lazy exceptions des parametres des regles - boolean mustClose = false; - TopiaContext tx = SimulationContext.get().getDB(); - - if (tx == null) { - // not in simulation, create transaction - tx = getRegion().getStorage().beginTransaction(); - mustClose = true; - } - - PopulationDAO populationDAO = IsisFishDAOHelper - .getPopulationDAO(tx); - String[] populationList = propertiesParameters.getProperty( - "populations", "").split(","); - for (String name : populationList) { - if (name != null && !"".equals(name)) { - try { - Population population = populationDAO.findByName(name); - populations.add(population); - - String numberAsString = propertiesParameters.getProperty("population." + name + ".number"); - List number = MatrixHelper.convertStringToList(numberAsString); - MatrixND mat = getNumberOf(population); - mat.fromList(number); - } catch (TopiaException eee) { - if (log.isWarnEnabled()) { - log.warn("Can't find population: " + name, eee); - } - } - } - } - - // si la transaction a été ouverte (pas dans une simulation) - // on la referme - if (mustClose) { - tx.closeContext(); - } - } catch (TopiaException eee1) { - if (log.isWarnEnabled()) { - log.warn("Can't get PopulationDAO", eee1); - } - } - } else { - if (log.isDebugEnabled()) { - log.debug("No last read properties, skip population reloading"); - } - } - } - return populations; - } - /** * @param populations The populations to set. */ - public void setPopulations(List<Population> populations) { - this.populations = populations; - } + public abstract void setPopulations(List<Population> populations); /** * Get instantiated strategies list. @@ -613,80 +150,21 @@ * * @return Returns the strategies. */ - public List<Strategy> getStrategies() { + public abstract List<Strategy> getStrategies(); - if (strategies == null) { - - strategies = new ArrayList<Strategy>(); - - if (propertiesParameters != null) { - strategies = new ArrayList<Strategy>(); - - try { - - // On verifie tout d'abord que l'on ai pas dans une simulation - // si on y es, on utilise le context static non null du thread local - // Resoud les lazy exceptions des parametres des regles - boolean mustClose = false; - TopiaContext tx = SimulationContext.get().getDB(); - - if (tx == null) { - // not in simulation, create transaction - tx = getRegion().getStorage().beginTransaction(); - mustClose = true; - } - - StrategyDAO strategyDAO = IsisFishDAOHelper.getStrategyDAO(tx); - String[] strategyList = propertiesParameters.getProperty("strategies", "").split(","); - for (String name : strategyList) { - if (name != null && !"".equals(name)) { - try { - Strategy str = strategyDAO.findByName(name); - strategies.add(str); - } catch (TopiaException eee) { - if (log.isWarnEnabled()) { - log.warn("Can't find strategy: " + name, eee); - } - } - } - } - - // si la transaction a été ouverte (pas dans une simulation) - // on la referme - if (mustClose) { - tx.closeContext(); - } - } catch (TopiaException eee1) { - if (log.isWarnEnabled()) { - log.warn("Can't get StrategyDAO", eee1); - } - } - } else { - if (log.isDebugEnabled()) { - log.debug("No last read properties, skip strategies reloading"); - } - } - } - return strategies; - } - /** * Set strategies list. * * @param strategies strategies list to set */ - public void setStrategies(List<Strategy> strategies) { - this.strategies = strategies; - } + public abstract void setStrategies(List<Strategy> strategies); /** * Add new analyse plan. * * @param plan analyse plan to add */ - public void addAnalysePlan(AnalysePlan plan) { - getAnalysePlans().add(plan); - } + public abstract void addAnalysePlan(AnalysePlan plan); /** * Remove a plan. @@ -694,9 +172,7 @@ * @param plan * @return {@code true} if this list contained the specified element */ - public boolean removeAnalysePlan(AnalysePlan plan) { - return getAnalysePlans().remove(plan); - } + public abstract boolean removeAnalysePlan(AnalysePlan plan); /** * Get instantiated analyse plan list. @@ -705,81 +181,32 @@ * * @return Returns the plans. */ - public List<AnalysePlan> getAnalysePlans() { - if (analysePlans == null) { + public abstract List<AnalysePlan> getAnalysePlans(); - analysePlans = new ArrayList<AnalysePlan>(); - - if (propertiesParameters != null) { - // analyse plan - String[] planList = propertiesParameters.getProperty("plans", - "").split(","); - int planIndex = 0; - for (String name : planList) { - if (name != null && !"".equals(name)) { - try { - AnalysePlan plan = AnalysePlanStorage - .getAnalysePlan(name) - .getNewAnalysePlanInstance(); - populateAnalysePlan(planIndex++, plan, propertiesParameters); - analysePlans.add(plan); - } catch (IsisFishException eee) { - if (log.isWarnEnabled()) { - log.warn("Can't find plan: " + name, eee); - } - } - } - } - } else { - if (log.isDebugEnabled()) { - log.debug("No last read properties, skip plans reloading"); - } - } - } - return this.analysePlans; - } - /** * Set plans list. * * @param plans plans to set */ - public void setAnalysePlans(List<AnalysePlan> plans) { - this.analysePlans = plans; - } + public abstract void setAnalysePlans(List<AnalysePlan> plans); /** * Retrun {@code true} if simulation is composed of independant plan only. * * @return {@code true} if all {@link AnalysePlan} are {@link AnalysePlanIndependent} */ - public boolean isIndependentPlan() { - boolean result = true; - for (AnalysePlan plan : getAnalysePlans()) { - if (!(plan instanceof AnalysePlanIndependent)) { - result = false; - break; - } - } - return result; - } + public abstract boolean isIndependentPlan(); /** * Clear plan list. */ - public void clearPlans() { - if (analysePlans != null) { - analysePlans.clear(); - } - } + public abstract void clearPlans(); /** * Add new rule to rules list. * @param rule rule to add */ - public void addRule(Rule rule) { - getRules().add(rule); - } + public abstract void addRule(Rule rule); /** * Remove a rule. @@ -787,86 +214,26 @@ * @param rule rule to remove * @return {@code true} if this list contained the specified element */ - public boolean removeRule(Rule rule) { - return getRules().remove(rule); - } + public abstract boolean removeRule(Rule rule); /** * Get parameters rules list. * * @return the rules */ - public List<Rule> getRules() { - if (rules == null) { - rules = new ArrayList<Rule>(); + public abstract List<Rule> getRules(); - if (propertiesParameters != null) { - try { - // On verifie tout d'abord que l'on ai pas dans une simulation - // si on y es, on utilise le context static non null du thread local - // Resoud les lazy exceptions des parametres des regles - boolean mustClose = false; - TopiaContext tx = SimulationContext.get().getDB(); - - if (tx == null) { - // not in simulation, create transaction - tx = getRegion().getStorage().beginTransaction(); - mustClose = true; - } - - // rules - String[] ruleList = propertiesParameters.getProperty("rules", "").split(","); - int ruleIndex = 0; - for (String name : ruleList) { - if (name != null && !"".equals(name)) { - try { - Rule rule = RuleStorage.getRule(name).getNewRuleInstance(); - RuleHelper.populateRule(ruleIndex++, tx, rule, propertiesParameters); - rules.add(rule); - } catch (IsisFishException eee) { - if (log.isWarnEnabled()) { - log.warn("Can't find rule: " + name, eee); - } - } - } - } - - // si la transaction a été ouverte (pas dans une simulation) - // on la referme - if (mustClose) { - tx.closeContext(); - } - } catch (TopiaException eee1) { - if (log.isWarnEnabled()) { - log.warn("Can't get TopiaContext", eee1); - } - } - } else { - if (log.isDebugEnabled()) { - log.debug("No last read properties, skip rule reloading"); - } - } - } - return rules; - } - /** * Set simulation rules. * * @param rules rules to set */ - public void setRules(List<Rule> rules) { - this.rules = rules; - } + public abstract void setRules(List<Rule> rules); /** * Clear rule list. */ - public void clearRules() { - if (rules != null) { - rules.clear(); - } - } + public abstract void clearRules(); /** * Return if optimization sould be used. @@ -875,26 +242,14 @@ * * @return use optimization */ - public boolean getUseOptimization() { + public abstract boolean getUseOptimization(); - if (useOptimization == null) { - if (propertiesParameters != null) { - useOptimization = Boolean.valueOf(propertiesParameters.getProperty("useOptimization", "true")); - } else { - useOptimization = Boolean.TRUE; - } - } - return useOptimization.booleanValue(); - } - /** * Change use optimization parameter. * * @param useOptimization use optimization to set */ - public void setUseOptimization(boolean useOptimization) { - this.useOptimization = useOptimization; - } + public abstract void setUseOptimization(boolean useOptimization); /** * Return if statistic sould be used. @@ -903,57 +258,28 @@ * * @return use statistic */ - public boolean getUseStatistic() { + public abstract boolean getUseStatistic(); - if (useStatistic == null) { - if (propertiesParameters != null) { - useStatistic = Boolean.valueOf(propertiesParameters.getProperty("useStatistic", "false")); - } else { - useStatistic = Boolean.FALSE; - } - } - return this.useStatistic; - } - /** * Change use statistic property. * * @param useStatistic use statistic to set */ - public void setUseStatistic(boolean useStatistic) { - this.useStatistic = useStatistic; - } + public abstract void setUseStatistic(boolean useStatistic); /** * Get export names list. * * @return export names list */ - public List<String> getExportNames() { - if (exportNames == null) { - exportNames = new ArrayList<String>(); + public abstract List<String> getExportNames(); - if (propertiesParameters != null) { - // exports - String[] exportList = propertiesParameters.getProperty("exports", "").split(","); - for (String name : exportList) { - if (name != null && !"".equals(name)) { - exportNames.add(name); - } - } - } - } - return this.exportNames; - } - /** * Set export names list. * * @param exportNames export names list to set */ - public void setExportNames(List<String> exportNames) { - this.exportNames = exportNames; - } + public abstract void setExportNames(List<String> exportNames); /** * Get number of sensitivity simulation. @@ -962,30 +288,15 @@ * * @return the numberOfSensitivitySimulation */ - public int getNumberOfSensitivitySimulation() { + public abstract int getNumberOfSensitivitySimulation(); - if (numberOfSensitivitySimulation == null) { - - if (propertiesParameters != null) { - numberOfSensitivitySimulation = Integer.valueOf(propertiesParameters.getProperty( - "numberOfSensitivitySimulation", "-1")); - } else { - numberOfSensitivitySimulation = Integer.valueOf(-1); - } - } - - return numberOfSensitivitySimulation.intValue(); - } - /** * Set number of sensitivity simulation. * * @param numberOfSensitivitySimulation number of sensitivity simulation to set */ - public void setNumberOfSensitivitySimulation( - int numberOfSensitivitySimulation) { - this.numberOfSensitivitySimulation = numberOfSensitivitySimulation; - } + public abstract void setNumberOfSensitivitySimulation( + int numberOfSensitivitySimulation); /** * Get instanciated sensitivity calculator. @@ -994,38 +305,13 @@ * * @return the sensitivityCalculator */ - public SensitivityCalculator getSensitivityCalculator() { + public abstract SensitivityCalculator getSensitivityCalculator(); - if (sensitivityCalculator == null) { - if (propertiesParameters != null) { - String calculatorName = propertiesParameters - .getProperty("sensitivitycalculator"); - if (!StringUtils.isEmpty(calculatorName)) { - try { - SensitivityStorage sensitivityStorage = SensitivityStorage.getSensitivity(calculatorName); - sensitivityCalculator = sensitivityStorage.getNewSensitivityInstance(); - // 0 = only single sensitivity - populateSensitivityCalculator(0, sensitivityCalculator, propertiesParameters); - } catch (IsisFishException eee) { - sensitivityCalculator = null; - if (log.isWarnEnabled()) { - log.warn("Can't find sensitivity: " + sensitivityCalculator, eee); - } - } - } - } - } - - return sensitivityCalculator; - } - /** * @param sensitivityCalculator the sensitivityCalculator to set */ - public void setSensitivityCalculator( - SensitivityCalculator sensitivityCalculator) { - this.sensitivityCalculator = sensitivityCalculator; - } + public abstract void setSensitivityCalculator( + SensitivityCalculator sensitivityCalculator); /** * Return loaded sensitivity export. @@ -1034,154 +320,55 @@ * * @return the sensitivityExportNames */ - public List<SensitivityExport> getSensitivityExport() { - if (sensitivityExports == null) { - sensitivityExports = new ArrayList<SensitivityExport>(); + public abstract List<SensitivityExport> getSensitivityExport(); - if (propertiesParameters != null) { - try { - // On verifie tout d'abord que l'on ai pas dans une simulation - // si on y es, on utilise le context static non null du thread local - // Resoud les lazy exceptions des parametres des regles - boolean mustClose = false; - TopiaContext tx = SimulationContext.get().getDB(); - - if (tx == null) { - // not in simulation, create transaction - tx = getRegion().getStorage().beginTransaction(); - mustClose = true; - } - - // sensitivity export - String[] sensitivityExportList = propertiesParameters - .getProperty("sensitivityexports", "").split(","); - int sensitivityExportIndex = 0; - for (String name : sensitivityExportList) { - try { - if (!StringUtils.isEmpty(name)) { - SensitivityExport sensitivityExport = SensitivityExportStorage - .getSensitivityExport(name) - .getNewSensitivityExportInstance(); - ExportHelper.populateSensitivityExport( - sensitivityExportIndex++, tx, - sensitivityExport, - propertiesParameters); - sensitivityExports.add(sensitivityExport); - } - } catch (IsisFishException eee) { - if (log.isWarnEnabled()) { - log.warn("Can't find SensitivityExport: " + name, eee); - } - } - } - - // si la transaction a été ouverte (pas dans une simulation) - // on la referme - if (mustClose) { - tx.closeContext(); - } - } catch (TopiaException eee1) { - if (log.isWarnEnabled()) { - log.warn("Can't get TopiaContext", eee1); - } - } - } else { - if (log.isDebugEnabled()) { - log.debug("No last read properties, skip sensitivity exports reloading"); - } - } - } - return sensitivityExports; - } - /** * @param sensitivityExport the sensitivityExportNames to set */ - public void setSensitivityExport(List<SensitivityExport> sensitivityExport) { - this.sensitivityExports = sensitivityExport; - } + public abstract void setSensitivityExport( + List<SensitivityExport> sensitivityExport); /** * Get use analyse plans property. * * @return use analyse plan. */ - public boolean getUseAnalysePlan() { + public abstract boolean getUseAnalysePlan(); - if (useAnalysePlan == null) { - - if (propertiesParameters != null) { - useAnalysePlan = Boolean.valueOf(propertiesParameters.getProperty("useAnalysePlan", "false")); - } else { - useAnalysePlan = Boolean.FALSE; - } - } - return this.useAnalysePlan; - } - /** * Set use analyse plans property. * * @param useAnalysePlan use analyse plan to set */ - public void setUseAnalysePlan(boolean useAnalysePlan) { - this.useAnalysePlan = useAnalysePlan; - } + public abstract void setUseAnalysePlan(boolean useAnalysePlan); /** * Get simulation number in analyse plan. * * @return simulation number in analyse plan */ - public int getAnalysePlanNumber() { + public abstract int getAnalysePlanNumber(); - if (analysePlanNumber == null) { - - if (propertiesParameters != null) { - analysePlanNumber = Integer.valueOf(propertiesParameters.getProperty("analysePlanNumber", "-1")); - } else { - analysePlanNumber = Integer.valueOf(-1); - } - } - - return this.analysePlanNumber.intValue(); - } - /** * Set simulation number in analyse plan. * * @param analysePlanNumber analyse plan number to set */ - public void setAnalysePlanNumber(int analysePlanNumber) { - this.analysePlanNumber = analysePlanNumber; - } + public abstract void setAnalysePlanNumber(int analysePlanNumber); /** * Get number of year to run to simulate. * * @return number of year */ - public int getNumberOfYear() { + public abstract int getNumberOfYear(); - if (numberOfYear == null) { - - if (propertiesParameters != null) { - numberOfYear = Integer.valueOf(propertiesParameters.getProperty("numberOfYear", "1")); - } else { - numberOfYear = Integer.valueOf(1); - } - } - return numberOfYear.intValue(); - } - /** * Set number of year to run to simulate. * * @param numberOfYear number of year to set */ - public void setNumberOfYear(int numberOfYear) { - this.numberOfYear = numberOfYear; - } + public abstract void setNumberOfYear(int numberOfYear); /** * Get use prescript. @@ -1190,143 +377,70 @@ * * @return Returns the usePreScript. */ - public boolean getUsePreScript() { + public abstract boolean getUsePreScript(); - if (usePreScript == null) { - - if (propertiesParameters != null) { - usePreScript = Boolean.valueOf(propertiesParameters.getProperty("usePreScript", "false")); - } else { - usePreScript = Boolean.FALSE; - } - } - - return usePreScript.booleanValue(); - } - /** * Set use prescript property * * @param usePreScript use preScript to set */ - public void setUsePreScript(boolean usePreScript) { - this.usePreScript = usePreScript; - } + public abstract void setUsePreScript(boolean usePreScript); /** * Get prescript content. * * @return preScript content */ - public String getPreScript() { + public abstract String getPreScript(); - if (preScript == null) { - - if (propertiesParameters != null) { - preScript = propertiesParameters.getProperty("preScript", ""); - } else { - preScript = ""; - } - } - - return preScript; - } - /** * Set pre script content. * * @param preScript prescript content */ - public void setPreScript(String preScript) { - this.preScript = preScript; - } + public abstract void setPreScript(String preScript); /** * Get region name. * * @return region name */ - public String getRegionName() { + public abstract String getRegionName(); - if (regionName == null) { - if (propertiesParameters != null) { - regionName = propertiesParameters.getProperty("regionName", ""); - } else { - // defaut value - regionName = ""; - } - } - - return regionName; - } - /** * Set region name. * * @param regionName region name to set */ - public void setRegionName(String regionName) { - this.regionName = regionName; - } + public abstract void setRegionName(String regionName); /** * Set simulator name. * * @return simulator name. */ - public String getSimulatorName() { + public abstract String getSimulatorName(); - if (simulatorName == null) { - if (propertiesParameters != null) { - simulatorName = propertiesParameters.getProperty( - "simulatorName", "DefaultSimulator.java"); - } else { - simulatorName = "DefaultSimulator.java"; - } - } - return simulatorName; - } - /** * Set simulator name. * * @param simulatorName simulator name to set */ - public void setSimulatorName(String simulatorName) { - this.simulatorName = simulatorName; - } + public abstract void setSimulatorName(String simulatorName); /** * Get enabled result names list. * * @return enabled result names list */ - public Collection<String> getResultEnabled() { + public abstract Collection<String> getResultEnabled(); - if (resultEnabled == null) { - - resultEnabled = new LinkedList<String>(); - - if (propertiesParameters != null) { - String[] resultList = propertiesParameters.getProperty("resultNames", "").split(","); - for (String name : resultList) { - if (name != null && !"".equals(name)) { - resultEnabled.add(name); - } - } - } - } - return resultEnabled; - } - /** * Set enabled result names list. * * @param resultEnabled enabled result names list */ - public void setResultEnabled(Collection<String> resultEnabled) { - this.resultEnabled = resultEnabled; - } + public abstract void setResultEnabled(Collection<String> resultEnabled); /** * Get tag values. @@ -1335,33 +449,14 @@ * * @return Returns the tagValue. */ - public Map<String, String> getTagValue() { + public abstract Map<String, String> getTagValue(); - if (tagValue == null) { - tagValue = new LinkedHashMap<String, String>(); - - if (propertiesParameters != null) { - for (Object k : propertiesParameters.keySet()) { - if (k.toString().startsWith("tagValue.")) { - String key = k.toString().substring("tagValue.".length()); - String value = propertiesParameters.getProperty(k.toString()); - getTagValue().put(key, value); - } - } - } - } - - return tagValue; - } - /** * Set tag values. * * @param tagValue tagValues to set. */ - public void setTagValue(Map<String, String> tagValue) { - this.tagValue = tagValue; - } + public abstract void setTagValue(Map<String, String> tagValue); /** * Get simulator log level. @@ -1370,32 +465,14 @@ * * @return simualtor log level */ - public String getSimulLogLevel() { + public abstract String getSimulLogLevel(); - if (simulLogLevel == null) { - - if (propertiesParameters != null) { - simulLogLevel = propertiesParameters.getProperty("simulLogLevel", "info"); - } else { - simulLogLevel = "info"; - } - } - - return simulLogLevel; - } - /** * Set simulator log level. * * @param logLevel simulator log level */ - public void setSimulLogLevel(String logLevel) { - if (log.isDebugEnabled()) { - log.debug(_("isisfish.params.changeLogLev", simulLogLevel, - logLevel)); - } - this.simulLogLevel = logLevel; - } + public abstract void setSimulLogLevel(String logLevel); /** * Get script log level. @@ -1404,32 +481,14 @@ * * @return script log level */ - public String getScriptLogLevel() { + public abstract String getScriptLogLevel(); - if (scriptLogLevel == null) { - if (propertiesParameters != null) { - scriptLogLevel = propertiesParameters.getProperty( - "scriptLogLevel", "info"); - } else { - scriptLogLevel = "info"; - } - } - - return scriptLogLevel; - } - /** * Set script log level. * * @param logLevel script log level */ - public void setScriptLogLevel(String logLevel) { - if (log.isDebugEnabled()) { - log.debug(_("isisfish.params.changeLogLev", scriptLogLevel, - logLevel)); - } - this.scriptLogLevel = logLevel; - } + public abstract void setScriptLogLevel(String logLevel); /** * Get librairies log level. @@ -1438,78 +497,38 @@ * * @return librairies log level */ - public String getLibLogLevel() { - if (libLogLevel == null) { - if (propertiesParameters != null) { - libLogLevel = propertiesParameters.getProperty("libLogLevel", - "error"); - } else { - libLogLevel = "info"; - } - } + public abstract String getLibLogLevel(); - return libLogLevel; - } - /** * Set lib log level. * * @param logLevel */ - public void setLibLogLevel(String logLevel) { - if (log.isDebugEnabled()) { - log.debug(_("isisfish.params.changeLogLev", libLogLevel, logLevel)); - } - this.libLogLevel = logLevel; - } + public abstract void setLibLogLevel(String logLevel); - public boolean isSimulErrorLevel() { - return "error".equals(simulLogLevel); - } + public abstract boolean isSimulErrorLevel(); - public boolean isSimulWarnLevel() { - return "warn".equals(simulLogLevel); - } + public abstract boolean isSimulWarnLevel(); - public boolean isSimulInfoLevel() { - return "info".equals(simulLogLevel); - } + public abstract boolean isSimulInfoLevel(); - public boolean isSimulDebugLevel() { - return "debug".equals(simulLogLevel); - } + public abstract boolean isSimulDebugLevel(); - public boolean isScriptErrorLevel() { - return "error".equals(scriptLogLevel); - } + public abstract boolean isScriptErrorLevel(); - public boolean isScriptWarnLevel() { - return "warn".equals(scriptLogLevel); - } + public abstract boolean isScriptWarnLevel(); - public boolean isScriptInfoLevel() { - return "info".equals(scriptLogLevel); - } + public abstract boolean isScriptInfoLevel(); - public boolean isScriptDebugLevel() { - return "debug".equals(scriptLogLevel); - } + public abstract boolean isScriptDebugLevel(); - public boolean isLibErrorLevel() { - return "error".equals(libLogLevel); - } + public abstract boolean isLibErrorLevel(); - public boolean isLibWarnLevel() { - return "warn".equals(libLogLevel); - } + public abstract boolean isLibWarnLevel(); - public boolean isLibInfoLevel() { - return "info".equals(libLogLevel); - } + public abstract boolean isLibInfoLevel(); - public boolean isLibDebugLevel() { - return "debug".equals(libLogLevel); - } + public abstract boolean isLibDebugLevel(); /** * A copy instance of SimulationParameter. @@ -1519,63 +538,8 @@ * * @return a copy of this instance */ - public SimulationParameter copy() { - SimulationParameter result = new SimulationParameter(); + public abstract SimulationParameter copy(); - if (propertiesParameters != null) { - result.propertiesParameters = new SortedProperties(); - // I think that iteration work better than parameters in contructor - result.propertiesParameters.putAll(propertiesParameters); - } - - // still needed to be copied, if there is no propertiesParameters - result.isisFishVersion = getIsisFishVersion(); - result.description = getDescription(); - result.regionName = getRegionName(); - result.numberOfYear = getNumberOfYear(); - result.simulatorName = getSimulatorName(); - result.useOptimization = getUseOptimization(); - result.useStatistic = getUseStatistic(); - result.usePreScript = getUsePreScript(); - result.preScript = getPreScript(); - result.useAnalysePlan = getUseAnalysePlan(); - result.analysePlanNumber = getAnalysePlanNumber(); - if (exportNames != null) { - result.exportNames = new LinkedList<String>(exportNames); - } - if (strategies != null) { - result.strategies = new LinkedList<Strategy>(strategies); - } - if (populations != null) { - result.populations = new LinkedList<Population>(populations); - } - if (rules != null) { - result.rules = new LinkedList<Rule>(rules); - } - if (analysePlans != null) { - result.analysePlans = new LinkedList<AnalysePlan>(analysePlans); - } - if (resultEnabled != null) { - result.resultEnabled = new LinkedList<String>(resultEnabled); - } - if (numbers != null) { - result.numbers = new HashMap<Population, MatrixND>(numbers); - } - if (tagValue != null) { - result.tagValue = new HashMap<String, String>(tagValue); - } - result.simulLogLevel = getSimulLogLevel(); - result.scriptLogLevel = getScriptLogLevel(); - result.libLogLevel = getLibLogLevel(); - result.numberOfSensitivitySimulation = getNumberOfSensitivitySimulation(); - if (sensitivityExports != null) { - result.sensitivityExports = new LinkedList<SensitivityExport>(sensitivityExports); - } - result.sensitivityCalculator = sensitivityCalculator; - - return result; - } - /** * Make a deep copy of current parameters. * @@ -1584,112 +548,15 @@ * * @return new parameters instance */ - public SimulationParameter deepCopy() { - Properties props = toProperties(); - SimulationParameter newInstance = new SimulationParameter(); - newInstance.fromProperties(props); - return newInstance; - } + public abstract SimulationParameter deepCopy(); /** * The toString() method call getters. * * So make instances of rules/export/plans... */ - @Override - public String toString() { - StringBuffer result = new StringBuffer(); - result.append( - _("isisfish.params.toString.simulation.done", - getIsisFishVersion())).append('\n'); - result.append("--------------------\n"); - result.append(getDescription()).append('\n'); - result.append("--------------------\n"); + public abstract String toString(); - if (getUseAnalysePlan()) { - result.append(_("isisfish.params.toString.plan.number", - getAnalysePlanNumber())); - } - - RegionStorage region = getRegion(); - result.append(_("isisfish.params.toString.fishery", region.getName())); - result.append(_("isisfish.params.toString.number.years", - getNumberOfYear())); - - // startegies - List<Strategy> strs = getStrategies(); - result.append(_("isisfish.params.toString.strategies")); - String sep = ""; - for (Strategy str : strs) { - result.append(sep).append(str.getName()); - sep = ","; - } - result.append("\n\n"); - - // populations - result.append(_("isisfish.params.toString.populations")); - sep = ""; - for (Population pop : getPopulations()) { - result.append(sep).append(pop.getName()); - sep = ","; - } - result.append("\n\n"); - - // rules - for (Rule rule : getRules()) { - String name = RuleStorage.getName(rule); - String param = ""; - try { - param = RuleStorage.getParamAsString(rule); - } catch (IsisFishException eee) { - if (log.isWarnEnabled()) { - log.warn("Can't convert rule parameter to string for " - + name, eee); - } - } - result.append(_("isisfish.params.toString.rule", name)); - result.append('\n'); - result.append(param); - result.append("\n"); - - } - result.append("\n\n"); - - // analyse plans - for (AnalysePlan plan : getAnalysePlans()) { - String name = RuleStorage.getName(plan); - String param = ""; - try { - param = AnalysePlanStorage.getParamAsString(plan); - } catch (IsisFishException eee) { - if (log.isWarnEnabled()) { - log.warn("Can't convert plan parameter to string for " - + name, eee); - } - } - result.append(_("isisfish.params.toString.plan", name)); - result.append('\n'); - result.append(param); - result.append('\n'); - - } - result.append('\n'); - result.append(_("isisfish.params.toString.script.presimulation")) - .append(":\n"); - result.append(getPreScript()); - result.append('\n'); - result.append(_("isisfish.params.toString.simul.logger.level", - simulLogLevel)); - result.append('\n'); - result.append(_("isisfish.params.toString.script.logger.level", - scriptLogLevel)); - result.append('\n'); - result.append(_("isisfish.params.toString.lib.logger.level", - libLogLevel)); - result.append('\n'); - return result.toString(); - } - /** * Permet de convertir l'objet SimulationParameter en un objet Properties * Cela permet de le stocker facilement sur le disque. @@ -1704,197 +571,17 @@ * </ul> * * @return L'objet Properties representant les parametres - * @see #fromProperties(File, Properties) + * @see #fromProperties(Properties) */ - public Properties toProperties() { - Properties result = new SortedProperties(); + public abstract Properties toProperties(); - result.setProperty("isisFishVersion", getIsisFishVersion()); - result.setProperty("description", getDescription()); - result.setProperty("regionName", getRegionName()); - result.setProperty("numberOfYear", String.valueOf(getNumberOfYear())); - result.setProperty("simulatorName", getSimulatorName()); - result.setProperty("useOptimization", String.valueOf(getUseOptimization())); - result.setProperty("useStatistic", String.valueOf(getUseStatistic())); - - // strategies - if (strategies != null) { - String strategyList = ""; - for (Strategy str : getStrategies()) { - strategyList += str.getName() + ","; - } - result.setProperty("strategies", StringUtil.substring(strategyList, 0, -1)); - } else { - if (propertiesParameters != null - && propertiesParameters.containsKey("strategies")) { - result.setProperty("strategies", propertiesParameters.getProperty("strategies")); - } - } - - // populations - if (populations != null) { - String populationList = ""; - for (Population pop : getPopulations()) { - populationList += pop.getName() + ","; - MatrixND number = getNumberOf(pop); - String numberAsString = String.valueOf(number.toList()); - result.setProperty("population." + pop.getName() + ".number", numberAsString); - } - result.setProperty("populations", StringUtil.substring( - populationList, 0, -1)); - } else { - if (propertiesParameters != null - && propertiesParameters.containsKey("populations")) { - result.setProperty("populations", propertiesParameters.getProperty("populations")); - for (String key : propertiesParameters.stringPropertyNames()) { - if (key.startsWith("population.")) { - result.setProperty(key, propertiesParameters.getProperty(key)); - } - } - } - } - - // rules - if (rules != null) { - String ruleList = ""; - int ruleIndex = 0; - for (Rule rule : getRules()) { - ruleList += RuleStorage.getName(rule) + ","; - Properties ruleProp = ruleParametertoProperties(ruleIndex++, rule); - result.putAll(ruleProp); - } - result.setProperty("rules", ruleList); - } else { - if (propertiesParameters != null - && propertiesParameters.containsKey("rules")) { - result.setProperty("rules", propertiesParameters - .getProperty("rules")); - for (String key : propertiesParameters.stringPropertyNames()) { - if (key.startsWith("rule.")) { - result.setProperty(key, propertiesParameters - .getProperty(key)); - } - } - } - } - - // anaylyse plans - if (analysePlans != null) { - String planList = ""; - int planIndex = 0; - for (AnalysePlan plan : getAnalysePlans()) { - planList += AnalysePlanStorage.getName(plan) + ","; - Properties planProp = planParametertoProperties(planIndex++, plan); - result.putAll(planProp); - } - result.setProperty("plans", planList); - } else { - if (propertiesParameters != null - && propertiesParameters.containsKey("plans")) { - result.setProperty("plans", propertiesParameters - .getProperty("plans")); - for (String key : propertiesParameters.stringPropertyNames()) { - if (key.startsWith("plan.")) { - result.setProperty(key, propertiesParameters.getProperty(key)); - } - } - } - } - - // export names - String exportList = ""; - for (String export : getExportNames()) { - exportList += export + ","; - - } - result.setProperty("exports", exportList); - - // number of sensitivity simulation - result.setProperty("numberOfSensitivitySimulation", String - .valueOf(getNumberOfSensitivitySimulation())); - - // calculator name - if (sensitivityCalculator != null) { - String calculatorName = SensitivityStorage - .getName(getSensitivityCalculator()); - result.setProperty("sensitivitycalculator", calculatorName); - - // calculator parameter - Properties calculatorParams = sensitivityCalculatorParametertoProperties( - 0, getSensitivityCalculator()); - result.putAll(calculatorParams); - } else { - if (propertiesParameters != null - && propertiesParameters.containsKey("sensitivitycalculator")) { - result.setProperty("sensitivitycalculator", - propertiesParameters.getProperty("sensitivitycalculator")); - for (String key : propertiesParameters.stringPropertyNames()) { - if (key.startsWith("sensitivity.")) { - result.setProperty(key, propertiesParameters.getProperty(key)); - } - } - } - } - - // sensitivity exports - if (sensitivityExports != null) { - String sensitivityExportList = ""; - int sensitivityExportIndex = 0; - for (SensitivityExport sensitivityExport : getSensitivityExport()) { - sensitivityExportList += SensitivityExportStorage - .getName(sensitivityExport) + ","; - Properties exportProp = sensitivityExportParametertoProperties( - sensitivityExportIndex++, sensitivityExport); - result.putAll(exportProp); - } - result.setProperty("sensitivityexports", sensitivityExportList); - } else { - if (propertiesParameters != null - && propertiesParameters.containsKey("sensitivityexports")) { - result.setProperty("sensitivityexports", propertiesParameters - .getProperty("sensitivityexports")); - for (String key : propertiesParameters.stringPropertyNames()) { - if (key.startsWith("sensitivityexport.")) { - result.setProperty(key, propertiesParameters.getProperty(key)); - } - } - } - } - - result.setProperty("usePreScript", String.valueOf(getUsePreScript())); - result.setProperty("preScript", getPreScript()); - result.setProperty("useAnalysePlan", String.valueOf(getUseAnalysePlan())); - result.setProperty("analysePlanNumber", String.valueOf(getAnalysePlanNumber())); - - String resultList = ""; - for (String r : getResultEnabled()) { - resultList += r + ","; - } - result.setProperty("resultNames", resultList); - - for (Map.Entry<String, String> e : getTagValue().entrySet()) { - result.setProperty("tagValue." + e.getKey(), e.getValue()); - } - - result.setProperty("simulLogLevel", getSimulLogLevel()); - result.setProperty("scriptLogLevel", getScriptLogLevel()); - result.setProperty("libLogLevel", getLibLogLevel()); - return result; - } - /** * Load properties from file. * * @param props property to read */ - public void fromProperties(Properties props) { + public abstract void fromProperties(Properties props); - // save properties (use full to read again parameter) - // for exports, or rules.... - this.propertiesParameters = props; - - } - /** * Reload parameters du to context change. * @@ -1904,59 +591,6 @@ * * @throws TopiaException */ - public void reloadContextParameters() throws TopiaException { + public abstract void reloadContextParameters() throws TopiaException; - // On verifie tout d'abord que l'on ai pas dans une simulation - // si on y es, on utilise le context static non null du thread local - // Resoud les lazy exceptions des parametres des regles - boolean mustClose = false; - TopiaContext tx = SimulationContext.get().getDB(); - - if (tx == null) { - // not in simulation, create transaction - tx = getRegion().getStorage().beginTransaction(); - mustClose = true; - } - - // reload rules - if (log.isDebugEnabled()) { - log.debug("Reloading rules"); - } - for (Rule rule : getRules()) { - try { - for (Field field : rule.getClass().getFields()) { - // le champ ne doit pas être privé - if (Modifier.isPublic(field.getModifiers())) { - // si le type est topia entity (ou sous classe) - if (TopiaEntity.class.isAssignableFrom(field.getType())) { - TopiaEntity entity = (TopiaEntity) field.get(rule); - // il est possible que les parametres soient null - // dans ce cas, il ne faut pas essayer de les recharger - if (entity != null) { - // reloading - TopiaEntity newEntity = tx.findByTopiaId(entity - .getTopiaId()); - field.set(rule, newEntity); - } - } - } - } - } catch (IllegalArgumentException e) { - if (log.isErrorEnabled()) { - log.error("Can't refresh rule field", e); - } - } catch (IllegalAccessException e) { - if (log.isErrorEnabled()) { - log.error("Can't access rule field", e); - } - } - } - - // si la transaction a été ouverte (pas dans une simulation) - // on la referme - if (mustClose) { - tx.commitTransaction(); - tx.closeContext(); - } - } -} +} \ No newline at end of file Copied: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterCache.java (from rev 3147, isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterCache.java) =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterCache.java (rev 0) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterCache.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -0,0 +1,895 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 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 + * 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.simulator; + +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.Reader; +import java.io.Writer; +import java.lang.ref.SoftReference; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +import org.apache.commons.io.IOUtils; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.topia.TopiaException; + +import fr.ifremer.isisfish.IsisFishRuntimeException; +import fr.ifremer.isisfish.datastore.RegionStorage; +import fr.ifremer.isisfish.entities.Population; +import fr.ifremer.isisfish.entities.Strategy; +import fr.ifremer.isisfish.export.SensitivityExport; +import fr.ifremer.isisfish.rule.Rule; +import fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator; + +/** + * SimulationParameter soft reference implementation. + * + * Store simulation file on disk, and a soft reference of delegate real + * SimulationParameter. + * + * If soft reference has been cleared by garbage collector, reload it from + * disk. + * + * Warning, use only this class for parameter reading. Using setters cause + * parameters to be written on disk. Use with caution. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class SimulationParameterCache implements SimulationParameter { + + /** Parameter file (disk storage). */ + protected File paramFile; + + /** Parameter memory reference. */ + protected SoftReference<SimulationParameter> ref; + + /** + * + * @param param param to cache + */ + public SimulationParameterCache(SimulationParameter param) { + + try { + paramFile = File.createTempFile("isis-fish-param", ".properties"); + paramFile.deleteOnExit(); + store(param); + } + catch (IOException eee) { + throw new IsisFishRuntimeException("Can't cache param to disk", eee); + } + + ref = new SoftReference<SimulationParameter>(param); + } + + protected void store(SimulationParameter param) { + Properties prop = param.toProperties(); + Writer writer = null; + try { + writer = new BufferedWriter(new FileWriter(paramFile)); + prop.store(writer, "Parameter cache"); + } + catch (IOException eee) { + throw new IsisFishRuntimeException("Can't cache param to disk", eee); + } + finally { + IOUtils.closeQuietly(writer); + } + } + + protected SimulationParameter getParam() { + SimulationParameter result = ref.get(); + if (result == null) { + + Reader reader = null; + try { + reader = new BufferedReader(new FileReader(paramFile)); + Properties prop = new Properties(); + prop.load(reader); + result = new SimulationParameterImpl(); + result.fromProperties(prop); + ref = new SoftReference<SimulationParameter>(result); + } + catch (IOException eee) { + throw new IsisFishRuntimeException("Can't cache param to disk", eee); + } + finally { + IOUtils.closeQuietly(reader); + } + + } + return result; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#check() + */ + @Override + public List<String> check() { + SimulationParameter param = getParam(); + return param.check(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#getIsisFishVersion() + */ + @Override + public String getIsisFishVersion() { + SimulationParameter param = getParam(); + return param.getIsisFishVersion(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#setIsisFishVersion(java.lang.String) + */ + @Override + public void setIsisFishVersion(String isisFishVersion) { + SimulationParameter param = getParam(); + param.setIsisFishVersion(isisFishVersion); + store(param); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#getDescription() + */ + @Override + public String getDescription() { + SimulationParameter param = getParam(); + return param.getDescription(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#setDescription(java.lang.String) + */ + @Override + public void setDescription(String description) { + SimulationParameter param = getParam(); + param.setDescription(description); + store(param); + + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#getRegion() + */ + @Override + public RegionStorage getRegion() { + SimulationParameter param = getParam(); + return param.getRegion(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#getNumberOf(fr.ifremer.isisfish.entities.Population) + */ + @Override + public MatrixND getNumberOf(Population pop) { + SimulationParameter param = getParam(); + return param.getNumberOf(pop); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#getExtraRules() + */ + @Override + public List<String> getExtraRules() { + SimulationParameter param = getParam(); + return param.getExtraRules(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#addExtraRules(java.lang.String[]) + */ + @Override + public void addExtraRules(String... extraRules) { + SimulationParameter param = getParam(); + param.addExtraRules(extraRules); + store(param); + + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#getPopulations() + */ + @Override + public List<Population> getPopulations() { + SimulationParameter param = getParam(); + return param.getPopulations(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#setPopulations(java.util.List) + */ + @Override + public void setPopulations(List<Population> populations) { + SimulationParameter param = getParam(); + param.setPopulations(populations); + store(param); + + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#getStrategies() + */ + @Override + public List<Strategy> getStrategies() { + SimulationParameter param = getParam(); + return param.getStrategies(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#setStrategies(java.util.List) + */ + @Override + public void setStrategies(List<Strategy> strategies) { + SimulationParameter param = getParam(); + param.setStrategies(strategies); + store(param); + + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#addAnalysePlan(fr.ifremer.isisfish.simulator.AnalysePlan) + */ + @Override + public void addAnalysePlan(AnalysePlan plan) { + SimulationParameter param = getParam(); + param.addAnalysePlan(plan); + store(param); + + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#removeAnalysePlan(fr.ifremer.isisfish.simulator.AnalysePlan) + */ + @Override + public boolean removeAnalysePlan(AnalysePlan plan) { + SimulationParameter param = getParam(); + boolean result = param.removeAnalysePlan(plan); + store(param); + return result; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#getAnalysePlans() + */ + @Override + public List<AnalysePlan> getAnalysePlans() { + SimulationParameter param = getParam(); + return param.getAnalysePlans(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#setAnalysePlans(java.util.List) + */ + @Override + public void setAnalysePlans(List<AnalysePlan> plans) { + SimulationParameter param = getParam(); + param.setAnalysePlans(plans); + store(param); + + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#isIndependentPlan() + */ + @Override + public boolean isIndependentPlan() { + SimulationParameter param = getParam(); + return param.isIndependentPlan(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#clearPlans() + */ + @Override + public void clearPlans() { + SimulationParameter param = getParam(); + param.clearPlans(); + store(param); + + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#addRule(fr.ifremer.isisfish.rule.Rule) + */ + @Override + public void addRule(Rule rule) { + SimulationParameter param = getParam(); + param.addRule(rule); + store(param); + + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#removeRule(fr.ifremer.isisfish.rule.Rule) + */ + @Override + public boolean removeRule(Rule rule) { + SimulationParameter param = getParam(); + boolean result = param.removeRule(rule); + store(param); + return result; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#getRules() + */ + @Override + public List<Rule> getRules() { + SimulationParameter param = getParam(); + return param.getRules(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#setRules(java.util.List) + */ + @Override + public void setRules(List<Rule> rules) { + SimulationParameter param = getParam(); + param.setRules(rules); + store(param); + + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#clearRules() + */ + @Override + public void clearRules() { + SimulationParameter param = getParam(); + param.clearRules(); + store(param); + + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#getUseOptimization() + */ + @Override + public boolean getUseOptimization() { + SimulationParameter param = getParam(); + return param.getUseOptimization(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#setUseOptimization(boolean) + */ + @Override + public void setUseOptimization(boolean useOptimization) { + SimulationParameter param = getParam(); + param.setUseOptimization(useOptimization); + store(param); + + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#getUseStatistic() + */ + @Override + public boolean getUseStatistic() { + SimulationParameter param = getParam(); + return param.getUseStatistic(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#setUseStatistic(boolean) + */ + @Override + public void setUseStatistic(boolean useStatistic) { + SimulationParameter param = getParam(); + param.setUseStatistic(useStatistic); + store(param); + + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#getExportNames() + */ + @Override + public List<String> getExportNames() { + SimulationParameter param = getParam(); + return param.getExportNames(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#setExportNames(java.util.List) + */ + @Override + public void setExportNames(List<String> exportNames) { + SimulationParameter param = getParam(); + param.setExportNames(exportNames); + store(param); + + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#getNumberOfSensitivitySimulation() + */ + @Override + public int getNumberOfSensitivitySimulation() { + SimulationParameter param = getParam(); + return param.getNumberOfSensitivitySimulation(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#setNumberOfSensitivitySimulation(int) + */ + @Override + public void setNumberOfSensitivitySimulation( + int numberOfSensitivitySimulation) { + SimulationParameter param = getParam(); + param.setNumberOfSensitivitySimulation(numberOfSensitivitySimulation); + store(param); + + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#getSensitivityCalculator() + */ + @Override + public SensitivityCalculator getSensitivityCalculator() { + SimulationParameter param = getParam(); + return param.getSensitivityCalculator(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#setSensitivityCalculator(fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator) + */ + @Override + public void setSensitivityCalculator( + SensitivityCalculator sensitivityCalculator) { + SimulationParameter param = getParam(); + param.setSensitivityCalculator(sensitivityCalculator); + store(param); + + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#getSensitivityExport() + */ + @Override + public List<SensitivityExport> getSensitivityExport() { + SimulationParameter param = getParam(); + return param.getSensitivityExport(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#setSensitivityExport(java.util.List) + */ + @Override + public void setSensitivityExport(List<SensitivityExport> sensitivityExport) { + SimulationParameter param = getParam(); + param.setSensitivityExport(sensitivityExport); + store(param); + + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#getUseAnalysePlan() + */ + @Override + public boolean getUseAnalysePlan() { + SimulationParameter param = getParam(); + return param.getUseAnalysePlan(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#setUseAnalysePlan(boolean) + */ + @Override + public void setUseAnalysePlan(boolean useAnalysePlan) { + SimulationParameter param = getParam(); + param.setUseAnalysePlan(useAnalysePlan); + store(param); + + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#getAnalysePlanNumber() + */ + @Override + public int getAnalysePlanNumber() { + SimulationParameter param = getParam(); + return param.getAnalysePlanNumber(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#setAnalysePlanNumber(int) + */ + @Override + public void setAnalysePlanNumber(int analysePlanNumber) { + SimulationParameter param = getParam(); + param.setAnalysePlanNumber(analysePlanNumber); + store(param); + + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#getNumberOfYear() + */ + @Override + public int getNumberOfYear() { + SimulationParameter param = getParam(); + return param.getNumberOfYear(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#setNumberOfYear(int) + */ + @Override + public void setNumberOfYear(int numberOfYear) { + SimulationParameter param = getParam(); + param.setNumberOfYear(numberOfYear); + store(param); + + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#getUsePreScript() + */ + @Override + public boolean getUsePreScript() { + SimulationParameter param = getParam(); + return param.getUsePreScript(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#setUsePreScript(boolean) + */ + @Override + public void setUsePreScript(boolean usePreScript) { + SimulationParameter param = getParam(); + param.setUsePreScript(usePreScript); + store(param); + + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#getPreScript() + */ + @Override + public String getPreScript() { + SimulationParameter param = getParam(); + return param.getPreScript(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#setPreScript(java.lang.String) + */ + @Override + public void setPreScript(String preScript) { + SimulationParameter param = getParam(); + param.setPreScript(preScript); + store(param); + + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#getRegionName() + */ + @Override + public String getRegionName() { + SimulationParameter param = getParam(); + return param.getRegionName(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#setRegionName(java.lang.String) + */ + @Override + public void setRegionName(String regionName) { + SimulationParameter param = getParam(); + param.setRegionName(regionName); + store(param); + + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#getSimulatorName() + */ + @Override + public String getSimulatorName() { + SimulationParameter param = getParam(); + return param.getSimulatorName(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#setSimulatorName(java.lang.String) + */ + @Override + public void setSimulatorName(String simulatorName) { + SimulationParameter param = getParam(); + param.setSimulatorName(simulatorName); + store(param); + + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#getResultEnabled() + */ + @Override + public Collection<String> getResultEnabled() { + SimulationParameter param = getParam(); + return param.getResultEnabled(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#setResultEnabled(java.util.Collection) + */ + @Override + public void setResultEnabled(Collection<String> resultEnabled) { + SimulationParameter param = getParam(); + param.setResultEnabled(resultEnabled); + store(param); + + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#getTagValue() + */ + @Override + public Map<String, String> getTagValue() { + SimulationParameter param = getParam(); + return param.getTagValue(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#setTagValue(java.util.Map) + */ + @Override + public void setTagValue(Map<String, String> tagValue) { + SimulationParameter param = getParam(); + param.setTagValue(tagValue); + store(param); + + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#getSimulLogLevel() + */ + @Override + public String getSimulLogLevel() { + SimulationParameter param = getParam(); + return param.getSimulLogLevel(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#setSimulLogLevel(java.lang.String) + */ + @Override + public void setSimulLogLevel(String logLevel) { + SimulationParameter param = getParam(); + param.setSimulLogLevel(logLevel); + store(param); + + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#getScriptLogLevel() + */ + @Override + public String getScriptLogLevel() { + SimulationParameter param = getParam(); + return param.getScriptLogLevel(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#setScriptLogLevel(java.lang.String) + */ + @Override + public void setScriptLogLevel(String logLevel) { + SimulationParameter param = getParam(); + param.setScriptLogLevel(logLevel); + store(param); + + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#getLibLogLevel() + */ + @Override + public String getLibLogLevel() { + SimulationParameter param = getParam(); + return param.getLibLogLevel(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#setLibLogLevel(java.lang.String) + */ + @Override + public void setLibLogLevel(String logLevel) { + SimulationParameter param = getParam(); + param.setLibLogLevel(logLevel); + store(param); + + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#isSimulErrorLevel() + */ + @Override + public boolean isSimulErrorLevel() { + SimulationParameter param = getParam(); + return param.isSimulErrorLevel(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#isSimulWarnLevel() + */ + @Override + public boolean isSimulWarnLevel() { + SimulationParameter param = getParam(); + return param.isSimulErrorLevel(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#isSimulInfoLevel() + */ + @Override + public boolean isSimulInfoLevel() { + SimulationParameter param = getParam(); + return param.isScriptInfoLevel(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#isSimulDebugLevel() + */ + @Override + public boolean isSimulDebugLevel() { + SimulationParameter param = getParam(); + return param.isSimulDebugLevel(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#isScriptErrorLevel() + */ + @Override + public boolean isScriptErrorLevel() { + SimulationParameter param = getParam(); + return param.isScriptErrorLevel(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#isScriptWarnLevel() + */ + @Override + public boolean isScriptWarnLevel() { + SimulationParameter param = getParam(); + return param.isScriptWarnLevel(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#isScriptInfoLevel() + */ + @Override + public boolean isScriptInfoLevel() { + SimulationParameter param = getParam(); + return param.isScriptInfoLevel(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#isScriptDebugLevel() + */ + @Override + public boolean isScriptDebugLevel() { + SimulationParameter param = getParam(); + return param.isScriptDebugLevel(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#isLibErrorLevel() + */ + @Override + public boolean isLibErrorLevel() { + SimulationParameter param = getParam(); + return param.isLibErrorLevel(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#isLibWarnLevel() + */ + @Override + public boolean isLibWarnLevel() { + SimulationParameter param = getParam(); + return param.isLibWarnLevel(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#isLibInfoLevel() + */ + @Override + public boolean isLibInfoLevel() { + SimulationParameter param = getParam(); + return param.isLibInfoLevel(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#isLibDebugLevel() + */ + @Override + public boolean isLibDebugLevel() { + SimulationParameter param = getParam(); + return param.isLibDebugLevel(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#copy() + */ + @Override + public SimulationParameter copy() { + SimulationParameter param = getParam(); + return param.copy(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#deepCopy() + */ + @Override + public SimulationParameter deepCopy() { + SimulationParameter param = getParam(); + return param.deepCopy(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#toProperties() + */ + @Override + public Properties toProperties() { + SimulationParameter param = getParam(); + return param.toProperties(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#fromProperties(java.util.Properties) + */ + @Override + public void fromProperties(Properties props) { + SimulationParameter param = getParam(); + param.fromProperties(props); + store(param); + + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter#reloadContextParameters() + */ + @Override + public void reloadContextParameters() throws TopiaException { + SimulationParameter param = getParam(); + param.reloadContextParameters(); + store(param); + } +} Copied: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java (from rev 3147, isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java) =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java (rev 0) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -0,0 +1,1897 @@ +/* + * #%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.simulator; + +import static org.nuiton.i18n.I18n._; + +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +import org.apache.commons.beanutils.ConvertUtilsBean; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixHelper; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.util.SortedProperties; +import org.nuiton.util.StringUtil; + +import fr.ifremer.isisfish.IsisConfig; +import fr.ifremer.isisfish.IsisFishDAOHelper; +import fr.ifremer.isisfish.IsisFishException; +import fr.ifremer.isisfish.datastore.AnalysePlanStorage; +import fr.ifremer.isisfish.datastore.RegionStorage; +import fr.ifremer.isisfish.datastore.RuleStorage; +import fr.ifremer.isisfish.datastore.SensitivityExportStorage; +import fr.ifremer.isisfish.datastore.SensitivityStorage; +import fr.ifremer.isisfish.entities.Population; +import fr.ifremer.isisfish.entities.PopulationDAO; +import fr.ifremer.isisfish.entities.Strategy; +import fr.ifremer.isisfish.entities.StrategyDAO; +import fr.ifremer.isisfish.export.ExportHelper; +import fr.ifremer.isisfish.export.SensitivityExport; +import fr.ifremer.isisfish.rule.Rule; +import fr.ifremer.isisfish.rule.RuleHelper; +import fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator; +import fr.ifremer.isisfish.util.ConverterUtil; + +/** + * Real {@link SimulationParameter} implementation. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class SimulationParameterImpl implements SimulationParameter { + + /** Logger for this class. */ + private static Log log = LogFactory.getLog(SimulationParameter.class); + + /** Remember last read properties. */ + protected Properties propertiesParameters; + + /** + * Isis-fish version that permit to do the simulation. + * Must be set just before simulation by simulator. + */ + protected String isisFishVersion; + + /** Description de la simulation. */ + protected String description; + + /** Nom de la region sur lequel on simule. */ + protected String regionName; + + /** Nombre d'année sur lequel on souhaite simuler. */ + protected Integer numberOfYear; + + /** Le nom de l'objet script a utiliser pour faire la simulation. */ + protected String simulatorName; + + /** Utilisation ou non des optimisations. */ + protected Boolean useOptimization; + + /** Utilisation ou non des statistiques. */ + protected Boolean useStatistic; + + /** La liste des strategies a utiliser pour la simulation. */ + protected List<Strategy> strategies; + + /** La liste des populations a utiliser pour la simulation. */ + protected List<Population> populations; + + /** Les effectifs initiaux des différentes population. */ + protected Map<Population, MatrixND> numbers; + + /** La liste des regles de gestions a utiliser pour la simulation. */ + protected List<Rule> rules; + + /** La liste des regles potentiellement ajoutée par les plans d'analyse. */ + protected List<String> extraRules; + + /** La liste des plans a utiliser pour la simulation. */ + protected List<AnalysePlan> analysePlans; + + /** Ma liste des exports automatique a faire en fin de simulation. */ + protected List<String> exportNames; + + /** Utilisation du script de pre simulation. */ + protected Boolean usePreScript; + + /** Le script de pre simulation a utiliser. */ + protected String preScript; + + /** Utilisation du plan d'analyse. */ + protected Boolean useAnalysePlan; + + /** + * Le numero de sequence de la liste des plans d'analyse. Le premier + * élement du plan doit etre 0. Si la simulation ne fait pas partie d'un + * plan la valeur est -1. */ + protected Integer analysePlanNumber; + + /** Export utilisés pour les analyses de sensibilités. */ + protected List<SensitivityExport> sensitivityExports; + + /** + * Nombre de simulation constituant l'analyse de sensibilité. + * + * FIXME ce parametre ne devrait pas ce trouver à cet endroit. + * Ce n'est pas un parametres, mais une infos de simulation. + * Cela permet de savoir combien de simulation il y a au total + * pour savoir quand elle sont terminées. + */ + protected Integer numberOfSensitivitySimulation; + + /** Export utilisés pour les analyses de sensibilités. */ + protected SensitivityCalculator sensitivityCalculator; + + /** La liste des resultats qui nous interesse. */ + protected Collection<String> resultEnabled; + + /** Autre parametre defini par l'utilisateur. */ + protected Map<String, String> tagValue; + + /** + * Si vrai seul les exports automatiques ne sont souhaiter, la simulation + * pourrait etre supprimée a la fin. + */ + protected Boolean onlyExport; + + /** Le niveau de log du simulateur à utiliser pendant la simulation. Par defaut info. */ + protected String simulLogLevel = "info"; + /** Le niveau de log des scripts à utiliser pendant la simulation. Par defaut info. */ + protected String scriptLogLevel = "info"; + /** Le niveau de log des librairies à utiliser pendant la simulation. Par defaut error. */ + protected String libLogLevel = "error"; + + /** La region corespondant au parametre {@link #regionName}. */ + protected transient RegionStorage region; + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#check() + */ + @Override + public List<String> check() { + List<String> result = new ArrayList<String>(); + // TODO faire la verif et pour chaque erreur mettre un message + // dans la liste result (par exemple si pas d'effectif + // pour une pop + return result; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#getIsisFishVersion() + */ + @Override + public String getIsisFishVersion() { + // if not already set + if (isisFishVersion == null) { + if (propertiesParameters != null) { + isisFishVersion = propertiesParameters.getProperty("isisFishVersion", ""); + } else { + // default value + isisFishVersion = IsisConfig.getVersion(); + } + } + return isisFishVersion; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#setIsisFishVersion(java.lang.String) + */ + @Override + public void setIsisFishVersion(String isisFishVersion) { + this.isisFishVersion = isisFishVersion; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#getDescription() + */ + @Override + public String getDescription() { + + if (description == null) { + if (propertiesParameters != null) { + description = propertiesParameters.getProperty("description", ""); + } else { + // default value + description = ""; + } + } + return this.description; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#setDescription(java.lang.String) + */ + @Override + public void setDescription(String description) { + this.description = description; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#getRegion() + */ + @Override + public RegionStorage getRegion() { + + if (region == null || !region.getName().equals(getRegionName())) { + // bien faire attention ici que la bonne region est ouverte + // - isis-database-3 dans le cas d'une region normale + // - simulation dans le cas d'une simulation + region = RegionStorage.getRegion(getRegionName()); + } else { + if (log.isDebugEnabled()) { + log.debug(_("Region %s already inited", getRegionName())); + } + } + return this.region; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#getNumberOf(fr.ifremer.isisfish.entities.Population) + */ + @Override + public MatrixND getNumberOf(Population pop) { + if (numbers == null) { + numbers = new LinkedHashMap<Population, MatrixND>(); + } + MatrixND result = numbers.get(pop); + if (result == null) { + List groups = pop.getPopulationGroup(); + List zones = pop.getPopulationZone(); + + if (groups.size() == 0) { + groups.add("No group"); + } + if (zones.size() == 0) { + zones.add("No zone"); + } + List[] semantics = new List[] { groups, zones }; + result = MatrixFactory.getInstance().create(semantics); + + numbers.put(pop, result); + } + return result; + } + + /** + * Permet de mettre les parametres de la regle sous une forme String pour + * pouvoir les relire ensuite. + * + * @param ruleIndex l'index de la rule + * @param rule La regle dont on souhaite mettre les parametres dans l'objet + * Properties retourne + * @return L'objet Properties contenant les valeurs des parametres de la + * regle + */ + protected Properties ruleParametertoProperties(int ruleIndex, Rule rule) { + Properties result = new Properties(); + ConvertUtilsBean beanUtils = ConverterUtil.getConverter(getRegion() + .getStorage()); + for (String paramName : RuleStorage.getParameterNames(rule).keySet()) { + String paramValueString; + try { + Object value = RuleStorage.getParameterValue(rule, paramName); + paramValueString = beanUtils.convert(value); + if (paramValueString != null) { + result.setProperty("rule." + ruleIndex + ".parameter." + paramName, paramValueString); + } + } catch (IsisFishException eee) { + if (log.isWarnEnabled()) { + log.warn("Can't convert parameter value to String: " + paramName, eee); + } + } + } + + return result; + } + + /** + * Permet de mettre les parametres de l'export sous une forme String pour + * pouvoir les relire ensuite. + * + * @param sensitivityExportIndex l'index de l'export + * @param sensitivityExport l'export dont on souhaite mettre les parametres dans l'objet + * Properties retourné + * @return L'objet Properties contenant les valeurs des parametres de l'export + */ + protected Properties sensitivityExportParametertoProperties( + int sensitivityExportIndex, SensitivityExport sensitivityExport) { + Properties result = new Properties(); + ConvertUtilsBean beanUtils = ConverterUtil.getConverter(getRegion().getStorage()); + for (String paramName : SensitivityExportStorage.getParameterNames(sensitivityExport).keySet()) { + try { + Object value = SensitivityExportStorage.getParameterValue( + sensitivityExport, paramName); + String paramValueString = beanUtils.convert(value); + if (paramValueString != null) { + result.setProperty("sensitivityexport." + + sensitivityExportIndex + ".parameter." + + paramName, paramValueString); + } + } catch (IsisFishException eee) { + if (log.isWarnEnabled()) { + log.warn("Can't convert parameter value to String: " + + paramName, eee); + } + } + } + + return result; + } + + /** + * Permet de mettre les parametres du calculateur sous une forme String pour + * pouvoir les relire ensuite. + * + * @param sensitivityIndex l'index du calculateur de sensitivity + * @param calculator Le calculateurdont on souhaite mettre les parametres dans l'objet + * Properties retourne + * @return L'objet Properties contenant les valeurs des parametres du calculateur de sensibilité + */ + protected Properties sensitivityCalculatorParametertoProperties( + int sensitivityIndex, SensitivityCalculator calculator) { + Properties result = new Properties(); + ConvertUtilsBean beanUtils = ConverterUtil.getConverter(getRegion().getStorage()); + for (String paramName : SensitivityStorage.getParameterNames(calculator).keySet()) { + try { + Object value = SensitivityStorage.getParameterValue(calculator, + paramName); + String paramValueString = beanUtils.convert(value); + if (paramValueString != null) { + result.setProperty("sensitivity." + sensitivityIndex + ".parameter." + paramName, paramValueString); + } + } catch (IsisFishException eee) { + if (log.isWarnEnabled()) { + log.warn("Can't convert parameter value to String: " + + paramName, eee); + } + } + } + + return result; + } + + /** + * Permet de mettre les parametres du plan sous une forme String pour + * pouvoir les relire ensuite. + * + * @param planIndex l'index du plan + * @param plan Le plan dont on souhaite mettre les parametres dans l'objet + * Properties retourne + * @return L'objet Properties contenant les valeurs des parametres du plan + */ + protected Properties planParametertoProperties(int planIndex, + AnalysePlan plan) { + Properties result = new Properties(); + ConvertUtilsBean beanUtils = ConverterUtil.getConverter(getRegion().getStorage()); + for (String paramName : AnalysePlanStorage.getParameterNames(plan).keySet()) { + try { + Object value = AnalysePlanStorage.getParameterValue(plan,paramName); + String paramValueString = beanUtils.convert(value); + if (paramValueString != null) { + result.setProperty("plan." + planIndex + ".parameter." + + paramName, paramValueString); + } + } catch (IsisFishException eee) { + if (log.isWarnEnabled()) { + log.warn("Can't convert parametre value to String: " + + paramName, eee); + } + } + } + + return result; + } + + /** + * Recupere dans prop les valeurs des champs specifique au plan et met a + * jour les champs du plan. + * + * @param planIndex l'index du plan + * @param plan le plan dont les parametres doivent etre lu depuis les + * proprietes + * @param props les proprietes contenant les parametre du plan + */ + protected void populateAnalysePlan(int planIndex, AnalysePlan plan, + Properties props) { + ConvertUtilsBean beanUtils = ConverterUtil.getConverter(getRegion() + .getStorage()); + String planName = AnalysePlanStorage.getName(plan); + String paramTag = "plan." + planIndex + ".parameter."; + + for (Map.Entry<String, Class<?>> entry : AnalysePlanStorage.getParameterNames(plan).entrySet()) { + String propName = entry.getKey(); + Class<?> type = entry.getValue(); + if (TopiaEntity.class.isAssignableFrom(type)) { + type = TopiaEntity.class; + } + String valueString = props.getProperty(paramTag + propName); + Object value = beanUtils.convert(valueString, type); + try { + AnalysePlanStorage.setParameterValue(plan, propName, value); + } catch (IsisFishException eee) { + if (log.isWarnEnabled()) { + log.warn("Can't reload field " + propName + " for plan " + + planName, eee); + } + } + } + } + + /** + * Recupere dans prop les valeurs des champs specifique au calculateur de + * sensibilité et met a jour les champs du calculateur. + * + * @param calculatorIndex l'index du calculateur + * @param calculator le calculateur dont les parametres doivent etre lu depuis lesproprietes + * @param props les proprietes contenant les parametre du calculateur + */ + protected void populateSensitivityCalculator(int calculatorIndex, + SensitivityCalculator calculator, Properties props) { + ConvertUtilsBean beanUtils = ConverterUtil.getConverter(getRegion() + .getStorage()); + String calculatorName = SensitivityStorage.getName(calculator); + String paramTag = "sensitivity." + calculatorIndex + ".parameter."; + + for (Map.Entry<String, Class<?>> entry : SensitivityStorage.getParameterNames(calculator).entrySet()) { + String propName = entry.getKey(); + Class<?> type = entry.getValue(); + if (TopiaEntity.class.isAssignableFrom(type)) { + type = TopiaEntity.class; + } + String valueString = props.getProperty(paramTag + propName); + Object value = beanUtils.convert(valueString, type); + try { + SensitivityStorage.setParameterValue(calculator, propName, value); + } catch (IsisFishException eee) { + if (log.isWarnEnabled()) { + log.warn("Can't reload field " + propName + + " for sensitivity calculator " + calculatorName, + eee); + } + } + } + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#getExtraRules() + */ + @Override + public List<String> getExtraRules() { + + if (extraRules == null) { + // no properties in config ? + extraRules = new ArrayList<String>(); + } + return extraRules; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#addExtraRules(java.lang.String) + */ + @Override + public void addExtraRules(String... extraRules) { + getExtraRules().addAll(Arrays.asList(extraRules)); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#getPopulations() + */ + @Override + public List<Population> getPopulations() { + if (populations == null) { + populations = new ArrayList<Population>(); + + if (propertiesParameters != null) { + + try { + // On verifie tout d'abord que l'on ai pas dans une simulation + // si on y es, on utilise le context static non null du thread local + // Resoud les lazy exceptions des parametres des regles + boolean mustClose = false; + TopiaContext tx = SimulationContext.get().getDB(); + + if (tx == null) { + // not in simulation, create transaction + tx = getRegion().getStorage().beginTransaction(); + mustClose = true; + } + + PopulationDAO populationDAO = IsisFishDAOHelper + .getPopulationDAO(tx); + String[] populationList = propertiesParameters.getProperty( + "populations", "").split(","); + for (String name : populationList) { + if (name != null && !"".equals(name)) { + try { + Population population = populationDAO.findByName(name); + populations.add(population); + + String numberAsString = propertiesParameters.getProperty("population." + name + ".number"); + List number = MatrixHelper.convertStringToList(numberAsString); + MatrixND mat = getNumberOf(population); + mat.fromList(number); + } catch (TopiaException eee) { + if (log.isWarnEnabled()) { + log.warn("Can't find population: " + name, eee); + } + } + } + } + + // si la transaction a été ouverte (pas dans une simulation) + // on la referme + if (mustClose) { + tx.closeContext(); + } + } catch (TopiaException eee1) { + if (log.isWarnEnabled()) { + log.warn("Can't get PopulationDAO", eee1); + } + } + } else { + if (log.isDebugEnabled()) { + log.debug("No last read properties, skip population reloading"); + } + } + } + return populations; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#setPopulations(java.util.List) + */ + @Override + public void setPopulations(List<Population> populations) { + this.populations = populations; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#getStrategies() + */ + @Override + public List<Strategy> getStrategies() { + + if (strategies == null) { + + strategies = new ArrayList<Strategy>(); + + if (propertiesParameters != null) { + strategies = new ArrayList<Strategy>(); + + try { + + // On verifie tout d'abord que l'on ai pas dans une simulation + // si on y es, on utilise le context static non null du thread local + // Resoud les lazy exceptions des parametres des regles + boolean mustClose = false; + TopiaContext tx = SimulationContext.get().getDB(); + + if (tx == null) { + // not in simulation, create transaction + tx = getRegion().getStorage().beginTransaction(); + mustClose = true; + } + + StrategyDAO strategyDAO = IsisFishDAOHelper.getStrategyDAO(tx); + String[] strategyList = propertiesParameters.getProperty("strategies", "").split(","); + for (String name : strategyList) { + if (name != null && !"".equals(name)) { + try { + Strategy str = strategyDAO.findByName(name); + strategies.add(str); + } catch (TopiaException eee) { + if (log.isWarnEnabled()) { + log.warn("Can't find strategy: " + name, eee); + } + } + } + } + + // si la transaction a été ouverte (pas dans une simulation) + // on la referme + if (mustClose) { + tx.closeContext(); + } + } catch (TopiaException eee1) { + if (log.isWarnEnabled()) { + log.warn("Can't get StrategyDAO", eee1); + } + } + } else { + if (log.isDebugEnabled()) { + log.debug("No last read properties, skip strategies reloading"); + } + } + } + return strategies; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#setStrategies(java.util.List) + */ + @Override + public void setStrategies(List<Strategy> strategies) { + this.strategies = strategies; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#addAnalysePlan(fr.ifremer.isisfish.simulator.AnalysePlan) + */ + @Override + public void addAnalysePlan(AnalysePlan plan) { + getAnalysePlans().add(plan); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#removeAnalysePlan(fr.ifremer.isisfish.simulator.AnalysePlan) + */ + @Override + public boolean removeAnalysePlan(AnalysePlan plan) { + return getAnalysePlans().remove(plan); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#getAnalysePlans() + */ + @Override + public List<AnalysePlan> getAnalysePlans() { + if (analysePlans == null) { + + analysePlans = new ArrayList<AnalysePlan>(); + + if (propertiesParameters != null) { + // analyse plan + String[] planList = propertiesParameters.getProperty("plans", + "").split(","); + int planIndex = 0; + for (String name : planList) { + if (name != null && !"".equals(name)) { + try { + AnalysePlan plan = AnalysePlanStorage + .getAnalysePlan(name) + .getNewAnalysePlanInstance(); + populateAnalysePlan(planIndex++, plan, propertiesParameters); + analysePlans.add(plan); + } catch (IsisFishException eee) { + if (log.isWarnEnabled()) { + log.warn("Can't find plan: " + name, eee); + } + } + } + } + } else { + if (log.isDebugEnabled()) { + log.debug("No last read properties, skip plans reloading"); + } + } + } + return this.analysePlans; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#setAnalysePlans(java.util.List) + */ + @Override + public void setAnalysePlans(List<AnalysePlan> plans) { + this.analysePlans = plans; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#isIndependentPlan() + */ + @Override + public boolean isIndependentPlan() { + boolean result = true; + for (AnalysePlan plan : getAnalysePlans()) { + if (!(plan instanceof AnalysePlanIndependent)) { + result = false; + break; + } + } + return result; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#clearPlans() + */ + @Override + public void clearPlans() { + if (analysePlans != null) { + analysePlans.clear(); + } + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#addRule(fr.ifremer.isisfish.rule.Rule) + */ + @Override + public void addRule(Rule rule) { + getRules().add(rule); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#removeRule(fr.ifremer.isisfish.rule.Rule) + */ + @Override + public boolean removeRule(Rule rule) { + return getRules().remove(rule); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#getRules() + */ + @Override + public List<Rule> getRules() { + if (rules == null) { + rules = new ArrayList<Rule>(); + + if (propertiesParameters != null) { + try { + // On verifie tout d'abord que l'on ai pas dans une simulation + // si on y es, on utilise le context static non null du thread local + // Resoud les lazy exceptions des parametres des regles + boolean mustClose = false; + TopiaContext tx = SimulationContext.get().getDB(); + + if (tx == null) { + // not in simulation, create transaction + tx = getRegion().getStorage().beginTransaction(); + mustClose = true; + } + + // rules + String[] ruleList = propertiesParameters.getProperty("rules", "").split(","); + int ruleIndex = 0; + for (String name : ruleList) { + if (name != null && !"".equals(name)) { + try { + Rule rule = RuleStorage.getRule(name).getNewRuleInstance(); + RuleHelper.populateRule(ruleIndex++, tx, rule, propertiesParameters); + rules.add(rule); + } catch (IsisFishException eee) { + if (log.isWarnEnabled()) { + log.warn("Can't find rule: " + name, eee); + } + } + } + } + + // si la transaction a été ouverte (pas dans une simulation) + // on la referme + if (mustClose) { + tx.closeContext(); + } + } catch (TopiaException eee1) { + if (log.isWarnEnabled()) { + log.warn("Can't get TopiaContext", eee1); + } + } + } else { + if (log.isDebugEnabled()) { + log.debug("No last read properties, skip rule reloading"); + } + } + } + return rules; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#setRules(java.util.List) + */ + @Override + public void setRules(List<Rule> rules) { + this.rules = rules; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#clearRules() + */ + @Override + public void clearRules() { + if (rules != null) { + rules.clear(); + } + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#getUseOptimization() + */ + @Override + public boolean getUseOptimization() { + + if (useOptimization == null) { + if (propertiesParameters != null) { + useOptimization = Boolean.valueOf(propertiesParameters.getProperty("useOptimization", "true")); + } else { + useOptimization = Boolean.TRUE; + } + } + return useOptimization.booleanValue(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#setUseOptimization(boolean) + */ + @Override + public void setUseOptimization(boolean useOptimization) { + this.useOptimization = useOptimization; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#getUseStatistic() + */ + @Override + public boolean getUseStatistic() { + + if (useStatistic == null) { + if (propertiesParameters != null) { + useStatistic = Boolean.valueOf(propertiesParameters.getProperty("useStatistic", "false")); + } else { + useStatistic = Boolean.FALSE; + } + } + return this.useStatistic; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#setUseStatistic(boolean) + */ + @Override + public void setUseStatistic(boolean useStatistic) { + this.useStatistic = useStatistic; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#getExportNames() + */ + @Override + public List<String> getExportNames() { + if (exportNames == null) { + exportNames = new ArrayList<String>(); + + if (propertiesParameters != null) { + // exports + String[] exportList = propertiesParameters.getProperty("exports", "").split(","); + for (String name : exportList) { + if (name != null && !"".equals(name)) { + exportNames.add(name); + } + } + } + } + return this.exportNames; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#setExportNames(java.util.List) + */ + @Override + public void setExportNames(List<String> exportNames) { + this.exportNames = exportNames; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#getNumberOfSensitivitySimulation() + */ + @Override + public int getNumberOfSensitivitySimulation() { + + if (numberOfSensitivitySimulation == null) { + + if (propertiesParameters != null) { + numberOfSensitivitySimulation = Integer.valueOf(propertiesParameters.getProperty( + "numberOfSensitivitySimulation", "-1")); + } else { + numberOfSensitivitySimulation = Integer.valueOf(-1); + } + } + + return numberOfSensitivitySimulation.intValue(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#setNumberOfSensitivitySimulation(int) + */ + @Override + public void setNumberOfSensitivitySimulation( + int numberOfSensitivitySimulation) { + this.numberOfSensitivitySimulation = numberOfSensitivitySimulation; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#getSensitivityCalculator() + */ + @Override + public SensitivityCalculator getSensitivityCalculator() { + + if (sensitivityCalculator == null) { + if (propertiesParameters != null) { + String calculatorName = propertiesParameters + .getProperty("sensitivitycalculator"); + if (!StringUtils.isEmpty(calculatorName)) { + try { + SensitivityStorage sensitivityStorage = SensitivityStorage.getSensitivity(calculatorName); + sensitivityCalculator = sensitivityStorage.getNewSensitivityInstance(); + // 0 = only single sensitivity + populateSensitivityCalculator(0, sensitivityCalculator, propertiesParameters); + } catch (IsisFishException eee) { + sensitivityCalculator = null; + if (log.isWarnEnabled()) { + log.warn("Can't find sensitivity: " + sensitivityCalculator, eee); + } + } + } + } + } + + return sensitivityCalculator; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#setSensitivityCalculator(fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator) + */ + @Override + public void setSensitivityCalculator( + SensitivityCalculator sensitivityCalculator) { + this.sensitivityCalculator = sensitivityCalculator; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#getSensitivityExport() + */ + @Override + public List<SensitivityExport> getSensitivityExport() { + if (sensitivityExports == null) { + sensitivityExports = new ArrayList<SensitivityExport>(); + + if (propertiesParameters != null) { + try { + // On verifie tout d'abord que l'on ai pas dans une simulation + // si on y es, on utilise le context static non null du thread local + // Resoud les lazy exceptions des parametres des regles + boolean mustClose = false; + TopiaContext tx = SimulationContext.get().getDbResult(); + + if (tx == null) { + // not in simulation, create transaction + tx = getRegion().getStorage().beginTransaction(); + mustClose = true; + } + + // sensitivity export + String[] sensitivityExportList = propertiesParameters + .getProperty("sensitivityexports", "").split(","); + int sensitivityExportIndex = 0; + for (String name : sensitivityExportList) { + try { + if (!StringUtils.isEmpty(name)) { + SensitivityExport sensitivityExport = SensitivityExportStorage + .getSensitivityExport(name) + .getNewSensitivityExportInstance(); + ExportHelper.populateSensitivityExport( + sensitivityExportIndex++, tx, + sensitivityExport, + propertiesParameters); + sensitivityExports.add(sensitivityExport); + } + } catch (IsisFishException eee) { + if (log.isWarnEnabled()) { + log.warn("Can't find SensitivityExport: " + name, eee); + } + } + } + + // si la transaction a été ouverte (pas dans une simulation) + // on la referme + if (mustClose) { + tx.closeContext(); + } + } catch (TopiaException eee1) { + if (log.isWarnEnabled()) { + log.warn("Can't get TopiaContext", eee1); + } + } + } else { + if (log.isDebugEnabled()) { + log.debug("No last read properties, skip sensitivity exports reloading"); + } + } + } + return sensitivityExports; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#setSensitivityExport(java.util.List) + */ + @Override + public void setSensitivityExport(List<SensitivityExport> sensitivityExport) { + this.sensitivityExports = sensitivityExport; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#getUseAnalysePlan() + */ + @Override + public boolean getUseAnalysePlan() { + + if (useAnalysePlan == null) { + + if (propertiesParameters != null) { + useAnalysePlan = Boolean.valueOf(propertiesParameters.getProperty("useAnalysePlan", "false")); + } else { + useAnalysePlan = Boolean.FALSE; + } + } + return this.useAnalysePlan; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#setUseAnalysePlan(boolean) + */ + @Override + public void setUseAnalysePlan(boolean useAnalysePlan) { + this.useAnalysePlan = useAnalysePlan; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#getAnalysePlanNumber() + */ + @Override + public int getAnalysePlanNumber() { + + if (analysePlanNumber == null) { + + if (propertiesParameters != null) { + analysePlanNumber = Integer.valueOf(propertiesParameters.getProperty("analysePlanNumber", "-1")); + } else { + analysePlanNumber = Integer.valueOf(-1); + } + } + + return this.analysePlanNumber.intValue(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#setAnalysePlanNumber(int) + */ + @Override + public void setAnalysePlanNumber(int analysePlanNumber) { + this.analysePlanNumber = analysePlanNumber; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#getNumberOfYear() + */ + @Override + public int getNumberOfYear() { + + if (numberOfYear == null) { + + if (propertiesParameters != null) { + numberOfYear = Integer.valueOf(propertiesParameters.getProperty("numberOfYear", "1")); + } else { + numberOfYear = Integer.valueOf(1); + } + } + return numberOfYear.intValue(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#setNumberOfYear(int) + */ + @Override + public void setNumberOfYear(int numberOfYear) { + this.numberOfYear = numberOfYear; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#getUsePreScript() + */ + @Override + public boolean getUsePreScript() { + + if (usePreScript == null) { + + if (propertiesParameters != null) { + usePreScript = Boolean.valueOf(propertiesParameters.getProperty("usePreScript", "false")); + } else { + usePreScript = Boolean.FALSE; + } + } + + return usePreScript.booleanValue(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#setUsePreScript(boolean) + */ + @Override + public void setUsePreScript(boolean usePreScript) { + this.usePreScript = usePreScript; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#getPreScript() + */ + @Override + public String getPreScript() { + + if (preScript == null) { + + if (propertiesParameters != null) { + preScript = propertiesParameters.getProperty("preScript", ""); + } else { + preScript = ""; + } + } + + return preScript; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#setPreScript(java.lang.String) + */ + @Override + public void setPreScript(String preScript) { + this.preScript = preScript; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#getRegionName() + */ + @Override + public String getRegionName() { + + if (regionName == null) { + if (propertiesParameters != null) { + regionName = propertiesParameters.getProperty("regionName", ""); + } else { + // defaut value + regionName = ""; + } + } + + return regionName; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#setRegionName(java.lang.String) + */ + @Override + public void setRegionName(String regionName) { + this.regionName = regionName; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#getSimulatorName() + */ + @Override + public String getSimulatorName() { + + if (simulatorName == null) { + if (propertiesParameters != null) { + simulatorName = propertiesParameters.getProperty( + "simulatorName", "DefaultSimulator.java"); + } else { + simulatorName = "DefaultSimulator.java"; + } + } + return simulatorName; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#setSimulatorName(java.lang.String) + */ + @Override + public void setSimulatorName(String simulatorName) { + this.simulatorName = simulatorName; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#getResultEnabled() + */ + @Override + public Collection<String> getResultEnabled() { + + if (resultEnabled == null) { + + resultEnabled = new LinkedList<String>(); + + if (propertiesParameters != null) { + String[] resultList = propertiesParameters.getProperty("resultNames", "").split(","); + for (String name : resultList) { + if (name != null && !"".equals(name)) { + resultEnabled.add(name); + } + } + } + } + return resultEnabled; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#setResultEnabled(java.util.Collection) + */ + @Override + public void setResultEnabled(Collection<String> resultEnabled) { + this.resultEnabled = resultEnabled; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#getTagValue() + */ + @Override + public Map<String, String> getTagValue() { + + if (tagValue == null) { + tagValue = new LinkedHashMap<String, String>(); + + if (propertiesParameters != null) { + for (Object k : propertiesParameters.keySet()) { + if (k.toString().startsWith("tagValue.")) { + String key = k.toString().substring("tagValue.".length()); + String value = propertiesParameters.getProperty(k.toString()); + getTagValue().put(key, value); + } + } + } + } + + return tagValue; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#setTagValue(java.util.Map) + */ + @Override + public void setTagValue(Map<String, String> tagValue) { + this.tagValue = tagValue; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#getSimulLogLevel() + */ + @Override + public String getSimulLogLevel() { + + if (simulLogLevel == null) { + + if (propertiesParameters != null) { + simulLogLevel = propertiesParameters.getProperty("simulLogLevel", "info"); + } else { + simulLogLevel = "info"; + } + } + + return simulLogLevel; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#setSimulLogLevel(java.lang.String) + */ + @Override + public void setSimulLogLevel(String logLevel) { + if (log.isDebugEnabled()) { + log.debug(_("isisfish.params.changeLogLev", simulLogLevel, + logLevel)); + } + this.simulLogLevel = logLevel; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#getScriptLogLevel() + */ + @Override + public String getScriptLogLevel() { + + if (scriptLogLevel == null) { + if (propertiesParameters != null) { + scriptLogLevel = propertiesParameters.getProperty( + "scriptLogLevel", "info"); + } else { + scriptLogLevel = "info"; + } + } + + return scriptLogLevel; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#setScriptLogLevel(java.lang.String) + */ + @Override + public void setScriptLogLevel(String logLevel) { + if (log.isDebugEnabled()) { + log.debug(_("isisfish.params.changeLogLev", scriptLogLevel, + logLevel)); + } + this.scriptLogLevel = logLevel; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#getLibLogLevel() + */ + @Override + public String getLibLogLevel() { + if (libLogLevel == null) { + if (propertiesParameters != null) { + libLogLevel = propertiesParameters.getProperty("libLogLevel", + "error"); + } else { + libLogLevel = "info"; + } + } + + return libLogLevel; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#setLibLogLevel(java.lang.String) + */ + @Override + public void setLibLogLevel(String logLevel) { + if (log.isDebugEnabled()) { + log.debug(_("isisfish.params.changeLogLev", libLogLevel, logLevel)); + } + this.libLogLevel = logLevel; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#isSimulErrorLevel() + */ + @Override + public boolean isSimulErrorLevel() { + return "error".equals(simulLogLevel); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#isSimulWarnLevel() + */ + @Override + public boolean isSimulWarnLevel() { + return "warn".equals(simulLogLevel); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#isSimulInfoLevel() + */ + @Override + public boolean isSimulInfoLevel() { + return "info".equals(simulLogLevel); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#isSimulDebugLevel() + */ + @Override + public boolean isSimulDebugLevel() { + return "debug".equals(simulLogLevel); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#isScriptErrorLevel() + */ + @Override + public boolean isScriptErrorLevel() { + return "error".equals(scriptLogLevel); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#isScriptWarnLevel() + */ + @Override + public boolean isScriptWarnLevel() { + return "warn".equals(scriptLogLevel); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#isScriptInfoLevel() + */ + @Override + public boolean isScriptInfoLevel() { + return "info".equals(scriptLogLevel); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#isScriptDebugLevel() + */ + @Override + public boolean isScriptDebugLevel() { + return "debug".equals(scriptLogLevel); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#isLibErrorLevel() + */ + @Override + public boolean isLibErrorLevel() { + return "error".equals(libLogLevel); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#isLibWarnLevel() + */ + @Override + public boolean isLibWarnLevel() { + return "warn".equals(libLogLevel); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#isLibInfoLevel() + */ + @Override + public boolean isLibInfoLevel() { + return "info".equals(libLogLevel); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#isLibDebugLevel() + */ + @Override + public boolean isLibDebugLevel() { + return "debug".equals(libLogLevel); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#copy() + */ + @Override + public SimulationParameter copy() { + SimulationParameterImpl result = new SimulationParameterImpl(); + + if (propertiesParameters != null) { + result.propertiesParameters = new SortedProperties(); + // I think that iteration work better than parameters in contructor + result.propertiesParameters.putAll(propertiesParameters); + } + + // still needed to be copied, if there is no propertiesParameters + result.isisFishVersion = getIsisFishVersion(); + result.description = getDescription(); + result.regionName = getRegionName(); + result.numberOfYear = getNumberOfYear(); + result.simulatorName = getSimulatorName(); + result.useOptimization = getUseOptimization(); + result.useStatistic = getUseStatistic(); + result.usePreScript = getUsePreScript(); + result.preScript = getPreScript(); + result.useAnalysePlan = getUseAnalysePlan(); + result.analysePlanNumber = getAnalysePlanNumber(); + if (exportNames != null) { + result.exportNames = new LinkedList<String>(exportNames); + } + if (strategies != null) { + result.strategies = new LinkedList<Strategy>(strategies); + } + if (populations != null) { + result.populations = new LinkedList<Population>(populations); + } + if (rules != null) { + result.rules = new LinkedList<Rule>(rules); + } + if (analysePlans != null) { + result.analysePlans = new LinkedList<AnalysePlan>(analysePlans); + } + if (resultEnabled != null) { + result.resultEnabled = new LinkedList<String>(resultEnabled); + } + if (numbers != null) { + result.numbers = new HashMap<Population, MatrixND>(numbers); + } + if (tagValue != null) { + result.tagValue = new HashMap<String, String>(tagValue); + } + result.simulLogLevel = getSimulLogLevel(); + result.scriptLogLevel = getScriptLogLevel(); + result.libLogLevel = getLibLogLevel(); + result.numberOfSensitivitySimulation = getNumberOfSensitivitySimulation(); + if (sensitivityExports != null) { + result.sensitivityExports = new LinkedList<SensitivityExport>(sensitivityExports); + } + result.sensitivityCalculator = sensitivityCalculator; + + return result; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#deepCopy() + */ + @Override + public SimulationParameter deepCopy() { + Properties props = toProperties(); + SimulationParameter newInstance = new SimulationParameterImpl(); + newInstance.fromProperties(props); + return newInstance; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#toString() + */ + @Override + public String toString() { + StringBuffer result = new StringBuffer(); + result.append( + _("isisfish.params.toString.simulation.done", + getIsisFishVersion())).append('\n'); + result.append("--------------------\n"); + result.append(getDescription()).append('\n'); + result.append("--------------------\n"); + + if (getUseAnalysePlan()) { + result.append(_("isisfish.params.toString.plan.number", + getAnalysePlanNumber())); + } + + RegionStorage region = getRegion(); + result.append(_("isisfish.params.toString.fishery", region.getName())); + result.append(_("isisfish.params.toString.number.years", + getNumberOfYear())); + + // startegies + List<Strategy> strs = getStrategies(); + result.append(_("isisfish.params.toString.strategies")); + String sep = ""; + for (Strategy str : strs) { + result.append(sep).append(str.getName()); + sep = ","; + } + result.append("\n\n"); + + // populations + result.append(_("isisfish.params.toString.populations")); + sep = ""; + for (Population pop : getPopulations()) { + result.append(sep).append(pop.getName()); + sep = ","; + } + result.append("\n\n"); + + // rules + for (Rule rule : getRules()) { + String name = RuleStorage.getName(rule); + String param = ""; + try { + param = RuleStorage.getParamAsString(rule); + } catch (IsisFishException eee) { + if (log.isWarnEnabled()) { + log.warn("Can't convert rule parameter to string for " + + name, eee); + } + } + result.append(_("isisfish.params.toString.rule", name)); + result.append('\n'); + result.append(param); + result.append("\n"); + + } + result.append("\n\n"); + + // analyse plans + for (AnalysePlan plan : getAnalysePlans()) { + String name = RuleStorage.getName(plan); + String param = ""; + try { + param = AnalysePlanStorage.getParamAsString(plan); + } catch (IsisFishException eee) { + if (log.isWarnEnabled()) { + log.warn("Can't convert plan parameter to string for " + + name, eee); + } + } + result.append(_("isisfish.params.toString.plan", name)); + result.append('\n'); + result.append(param); + result.append('\n'); + + } + result.append('\n'); + result.append(_("isisfish.params.toString.script.presimulation")) + .append(":\n"); + result.append(getPreScript()); + result.append('\n'); + result.append(_("isisfish.params.toString.simul.logger.level", + simulLogLevel)); + result.append('\n'); + result.append(_("isisfish.params.toString.script.logger.level", + scriptLogLevel)); + result.append('\n'); + result.append(_("isisfish.params.toString.lib.logger.level", + libLogLevel)); + result.append('\n'); + return result.toString(); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#toProperties() + */ + @Override + public Properties toProperties() { + Properties result = new SortedProperties(); + + result.setProperty("isisFishVersion", getIsisFishVersion()); + result.setProperty("description", getDescription()); + result.setProperty("regionName", getRegionName()); + result.setProperty("numberOfYear", String.valueOf(getNumberOfYear())); + result.setProperty("simulatorName", getSimulatorName()); + result.setProperty("useOptimization", String.valueOf(getUseOptimization())); + result.setProperty("useStatistic", String.valueOf(getUseStatistic())); + + // strategies + if (strategies != null) { + String strategyList = ""; + for (Strategy str : getStrategies()) { + strategyList += str.getName() + ","; + } + result.setProperty("strategies", StringUtil.substring(strategyList, 0, -1)); + } else { + if (propertiesParameters != null + && propertiesParameters.containsKey("strategies")) { + result.setProperty("strategies", propertiesParameters.getProperty("strategies")); + } + } + + // populations + if (populations != null) { + String populationList = ""; + for (Population pop : getPopulations()) { + populationList += pop.getName() + ","; + MatrixND number = getNumberOf(pop); + String numberAsString = String.valueOf(number.toList()); + result.setProperty("population." + pop.getName() + ".number", numberAsString); + } + result.setProperty("populations", StringUtil.substring( + populationList, 0, -1)); + } else { + if (propertiesParameters != null + && propertiesParameters.containsKey("populations")) { + result.setProperty("populations", propertiesParameters.getProperty("populations")); + for (String key : propertiesParameters.stringPropertyNames()) { + if (key.startsWith("population.")) { + result.setProperty(key, propertiesParameters.getProperty(key)); + } + } + } + } + + // rules + if (rules != null) { + String ruleList = ""; + int ruleIndex = 0; + for (Rule rule : getRules()) { + ruleList += RuleStorage.getName(rule) + ","; + Properties ruleProp = ruleParametertoProperties(ruleIndex++, rule); + result.putAll(ruleProp); + } + result.setProperty("rules", ruleList); + } else { + if (propertiesParameters != null + && propertiesParameters.containsKey("rules")) { + result.setProperty("rules", propertiesParameters + .getProperty("rules")); + for (String key : propertiesParameters.stringPropertyNames()) { + if (key.startsWith("rule.")) { + result.setProperty(key, propertiesParameters + .getProperty(key)); + } + } + } + } + + // anaylyse plans + if (analysePlans != null) { + String planList = ""; + int planIndex = 0; + for (AnalysePlan plan : getAnalysePlans()) { + planList += AnalysePlanStorage.getName(plan) + ","; + Properties planProp = planParametertoProperties(planIndex++, plan); + result.putAll(planProp); + } + result.setProperty("plans", planList); + } else { + if (propertiesParameters != null + && propertiesParameters.containsKey("plans")) { + result.setProperty("plans", propertiesParameters + .getProperty("plans")); + for (String key : propertiesParameters.stringPropertyNames()) { + if (key.startsWith("plan.")) { + result.setProperty(key, propertiesParameters.getProperty(key)); + } + } + } + } + + // export names + String exportList = ""; + for (String export : getExportNames()) { + exportList += export + ","; + + } + result.setProperty("exports", exportList); + + // number of sensitivity simulation + result.setProperty("numberOfSensitivitySimulation", String + .valueOf(getNumberOfSensitivitySimulation())); + + // calculator name + if (sensitivityCalculator != null) { + String calculatorName = SensitivityStorage + .getName(getSensitivityCalculator()); + result.setProperty("sensitivitycalculator", calculatorName); + + // calculator parameter + Properties calculatorParams = sensitivityCalculatorParametertoProperties( + 0, getSensitivityCalculator()); + result.putAll(calculatorParams); + } else { + if (propertiesParameters != null + && propertiesParameters.containsKey("sensitivitycalculator")) { + result.setProperty("sensitivitycalculator", + propertiesParameters.getProperty("sensitivitycalculator")); + for (String key : propertiesParameters.stringPropertyNames()) { + if (key.startsWith("sensitivity.")) { + result.setProperty(key, propertiesParameters.getProperty(key)); + } + } + } + } + + // sensitivity exports + if (sensitivityExports != null) { + String sensitivityExportList = ""; + int sensitivityExportIndex = 0; + for (SensitivityExport sensitivityExport : getSensitivityExport()) { + sensitivityExportList += SensitivityExportStorage + .getName(sensitivityExport) + ","; + Properties exportProp = sensitivityExportParametertoProperties( + sensitivityExportIndex++, sensitivityExport); + result.putAll(exportProp); + } + result.setProperty("sensitivityexports", sensitivityExportList); + } else { + if (propertiesParameters != null + && propertiesParameters.containsKey("sensitivityexports")) { + result.setProperty("sensitivityexports", propertiesParameters + .getProperty("sensitivityexports")); + for (String key : propertiesParameters.stringPropertyNames()) { + if (key.startsWith("sensitivityexport.")) { + result.setProperty(key, propertiesParameters.getProperty(key)); + } + } + } + } + + result.setProperty("usePreScript", String.valueOf(getUsePreScript())); + result.setProperty("preScript", getPreScript()); + result.setProperty("useAnalysePlan", String.valueOf(getUseAnalysePlan())); + result.setProperty("analysePlanNumber", String.valueOf(getAnalysePlanNumber())); + + String resultList = ""; + for (String r : getResultEnabled()) { + resultList += r + ","; + } + result.setProperty("resultNames", resultList); + + for (Map.Entry<String, String> e : getTagValue().entrySet()) { + result.setProperty("tagValue." + e.getKey(), e.getValue()); + } + + result.setProperty("simulLogLevel", getSimulLogLevel()); + result.setProperty("scriptLogLevel", getScriptLogLevel()); + result.setProperty("libLogLevel", getLibLogLevel()); + return result; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#fromProperties(java.util.Properties) + */ + @Override + public void fromProperties(Properties props) { + + // save properties (use full to read again parameter) + // for exports, or rules.... + this.propertiesParameters = props; + + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationParameter2#reloadContextParameters() + */ + @Override + public void reloadContextParameters() throws TopiaException { + + // On verifie tout d'abord que l'on ai pas dans une simulation + // si on y es, on utilise le context static non null du thread local + // Resoud les lazy exceptions des parametres des regles + boolean mustClose = false; + TopiaContext tx = SimulationContext.get().getDB(); + + if (tx == null) { + // not in simulation, create transaction + tx = getRegion().getStorage().beginTransaction(); + mustClose = true; + } + + // reload rules + if (log.isDebugEnabled()) { + log.debug("Reloading rules"); + } + for (Rule rule : getRules()) { + try { + for (Field field : rule.getClass().getFields()) { + // le champ ne doit pas être privé + if (Modifier.isPublic(field.getModifiers())) { + // si le type est topia entity (ou sous classe) + if (TopiaEntity.class.isAssignableFrom(field.getType())) { + TopiaEntity entity = (TopiaEntity) field.get(rule); + // il est possible que les parametres soient null + // dans ce cas, il ne faut pas essayer de les recharger + if (entity != null) { + // reloading + TopiaEntity newEntity = tx.findByTopiaId(entity + .getTopiaId()); + field.set(rule, newEntity); + } + } + } + } + } catch (IllegalArgumentException e) { + if (log.isErrorEnabled()) { + log.error("Can't refresh rule field", e); + } + } catch (IllegalAccessException e) { + if (log.isErrorEnabled()) { + log.error("Can't access rule field", e); + } + } + } + + // si la transaction a été ouverte (pas dans une simulation) + // on la referme + if (mustClose) { + tx.commitTransaction(); + tx.closeContext(); + } + } +} Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScript.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScript.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScript.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2007 - 2009 - * 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.simulator; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2007 Ifremer, Code Lutin, 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 Ifremer, Code Lutin, 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.simulator; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultGetter.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultGetter.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultGetter.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,32 +1,26 @@ -/* *##% - * Copyright (C) 2007 - * 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * SimulationResultGetter.java - * - * Created: 13 nov. 07 12:00:14 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * + * You should have received 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.simulator; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultListener.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultListener.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultListener.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,32 +1,26 @@ -/* *##% - * Copyright (C) 2007 - * 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * SimulationResultListener.java - * - * Created: 13 nov. 07 11:59:53 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * + * You should have received 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.simulator; @@ -36,12 +30,17 @@ import fr.ifremer.isisfish.IsisFishException; import fr.ifremer.isisfish.types.Date; - /** + * SimulationResultListener.java + * + * Created: 13 nov. 07 11:59:53 + * * @author poussin + * @version $Revision$ * + * Last update: $Date$ + * by : $Author$ */ - public interface SimulationResultListener extends SimulationListener { public void addResult(SimulationContext context, Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultXML.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultXML.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultXML.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,32 +1,26 @@ -/* *##% - * Copyright (C) 2007 - * 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * SimulationResultXML.java - * - * Created: 19 nov. 07 11:23:24 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * + * You should have received 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.simulator; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/Simulator.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/Simulator.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/Simulator.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.simulator; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServerBadIdException.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServerBadIdException.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServerBadIdException.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,48 +1,53 @@ -/* *##% - * Copyright (C) 2002-2005 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ -/* * -* SimulatorServerBadIdException.java -* -* Created: Fri Sep 6 2002 -* -* @author <poussin at codelutin.com> -* Copyright Code Lutin -* @version $Revision$ -* -* Mise a jour: $Date$ -* par : $Author$ -*/ - package fr.ifremer.isisfish.simulator; +/** + * SimulatorServerBadIdException.java + * + * Created: Fri Sep 6 2002 + * + * @author <poussin at codelutin.com> + * Copyright Code Lutin + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ public class SimulatorServerBadIdException extends RuntimeException { // SimulatorServerBadIdException - /** */ + /** serialVersionUID. */ private static final long serialVersionUID = 4449196856169240128L; public SimulatorServerBadIdException(String msg) { super(msg); } - public SimulatorServerBadIdException(String msg, Throwable e) { - super(msg, e); + public SimulatorServerBadIdException(String msg, Throwable cause) { + super(msg, cause); } } // SimulatorServerBadIdException Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Benjamin Poussin +/* + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, 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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - *##%*/ + * You should have received 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.simulator.launcher; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/JDKPriorityBlockingQueue.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/JDKPriorityBlockingQueue.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/JDKPriorityBlockingQueue.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2002-2009 Ifremer, Code Lutin, Benjamin Poussin +/* + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, 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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - *##%*/ + * You should have received 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.simulator.launcher; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.simulator.launcher; @@ -1102,6 +1109,7 @@ Map<String, Object> root = new HashMap<String, Object>(); root.put("isishome", IsisFish.config.getSimulatorSshIsisHome()); root.put("isistemp", getRemoteTempDirectory()); + root.put("javapath", IsisFish.config.getSimulatorSshJavaPath()); root.put("simulationid", simuationId); root.put("simulationzip", simulationZip); root.put("simulationstandalonezip", standaloneZip); @@ -1141,10 +1149,15 @@ // command to : // - add script in qsub queue - // - use option -m n (to not send email) String remoteFilenameId = getRemoteTempDirectory() + "simulation-" + simulationId + "-pbs.id"; - String command = IsisFish.config.getSimulatorSshPbsBinPath() + "/qsub -m n"; + String command = IsisFish.config.getSimulatorSshPbsBinPath() + "/qsub"; + // add qsub options + String qsubOptions = IsisFish.config.getSimulatorSshPbsQsubOptions(); + if (StringUtils.isNotEmpty(qsubOptions)) { + command += " " + qsubOptions; + } + // multi job specific if (lastSimulationNumber >=0 ) { command+= " -J 0-" + String.valueOf(lastSimulationNumber); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2002-2009 Ifremer, Code Lutin, Benjamin Poussin +/* + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, 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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - *##%*/ + * You should have received 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.simulator.launcher; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationItem.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationItem.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationItem.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2002-2009 Ifremer, Code Lutin, Benjamin Poussin +/* + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, 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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - *##%*/ + * You should have received 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.simulator.launcher; @@ -23,6 +29,7 @@ import fr.ifremer.isisfish.simulator.SimulationControl; import fr.ifremer.isisfish.simulator.SimulationParameter; +import fr.ifremer.isisfish.simulator.SimulationParameterCache; /** * Objet representant une simulation qui doit être faite. @@ -97,11 +104,15 @@ * Constructor. * * @param control le control pour la simulation. - * @param param les parametres de simulation. + * @param param les parametres de simulation (can be null) */ public SimulationItem(SimulationControl control, SimulationParameter param) { this.control = control; - this.parameter = param; + + // use soft reference to improve minimum memory usage + if (param != null) { + this.parameter = new SimulationParameterCache(param); + } } /** @@ -164,15 +175,32 @@ * Get simulation prescript. * * @return the simulationPrescriptPath + * + * @deprecated use cached simulation parameter instead */ public String getSimulationPrescriptContent() { - return simulationPrescriptContent; + + String preScript = simulationPrescriptContent; + + // simulationPrescriptContent is not null when isis is lauched with + // simulation on comand line + // If preScript but params is not null, simulation has been launched by + // UI, use cached simulation parameters + if (preScript == null && parameter != null) { + if (parameter.getUsePreScript()) { + preScript = parameter.getPreScript(); + } + } + + return preScript; } /** * Set simulation prescript. * * @param simulationPrescriptContent the simulationPrescriptContent to set + * + * @deprecated use cached simulation parameter instead */ public void setSimulationPrescriptContent(String simulationPrescriptContent) { this.simulationPrescriptContent = simulationPrescriptContent; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2002-2009 Ifremer, Code Lutin, Benjamin Poussin +/* + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, 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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - *##%*/ + * You should have received 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.simulator.launcher; @@ -23,7 +29,6 @@ import java.rmi.RemoteException; import java.util.HashSet; -import java.util.Iterator; import java.util.Set; import org.apache.commons.logging.Log; @@ -209,12 +214,16 @@ && param.getUseAnalysePlan() && !param.isIndependentPlan()) { // on est sur un plan d'analyse dependant, il faut generer les // simulation les unes apres les autres - Iterator<SimulationJob> i = new SimulationService.PrepareSimulationJob( + SimulationService.PrepareSimulationJob i = new SimulationService.PrepareSimulationJob( simulationService, this); while (!control.isStopSimulationRequest() && i.hasNext()) { log.info(_("Generate next simulation")); SimulationJob subjob = i.next(); subjob.setLauncher(getLauncher()); + // c'est bloquant seulement le temps du lancement + // (envoie sur caparmor par exemple) + // l'appel peut ensuite passer alors que la simulation + // n'a pas effectivement demarré subjob.run(); // FIXME temp fix les thread des launchers @@ -225,9 +234,22 @@ SimulationControl subControl = subItem.getControl(); do { Thread.sleep(2000); + + // on boucle tant que: + // - la simulation n'a pas été arreté + // - la simulation n'est pas a 0 + // - la simulation n'est aps à la fin + // - la simulation n'existe pas localement } while (!subControl.isStopSimulationRequest() && - (subControl.getProgress() == 0 || subControl.getProgress() < subControl.getProgressMax()) - && !SimulationStorage.exists(subControl.getId())); + (subControl.getProgress() == 0 || subControl.getProgress() < subControl.getProgressMax() + || !SimulationStorage.exists(subControl.getId()))); + + // FIXME on fait manuellement le post simulation pour + // plans dépendant + if (!subControl.isStopSimulationRequest()) { + SimulationStorage simulation = subjob.getLauncher().getSimulationStorage(simulationService, subControl); + i.finished(subjob, simulation); + } } } else { @@ -255,11 +277,12 @@ //File zip = item.getSimulationZip(); // get prescript content, only if UsePreScript is set to true - String simulationPrescript = null; + // FIXME EC-20100410 use prescriot already present in params + /*String simulationPrescript = null; if(param.getUsePreScript()) { simulationPrescript = param.getPreScript(); item.setSimulationPrescriptContent(simulationPrescript); - } + }*/ launcher.simulate(simulationService, item); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.simulator.launcher; @@ -31,6 +38,7 @@ import java.rmi.RemoteException; import java.text.DateFormat; import java.text.SimpleDateFormat; +import java.util.AbstractMap.SimpleEntry; import java.util.Comparator; import java.util.Date; import java.util.LinkedList; @@ -39,7 +47,6 @@ import java.util.SortedSet; import java.util.Timer; import java.util.TreeSet; -import java.util.AbstractMap.SimpleEntry; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; @@ -52,6 +59,7 @@ import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.SimulationControl; import fr.ifremer.isisfish.simulator.SimulationParameter; +import fr.ifremer.isisfish.simulator.SimulationParameterImpl; import fr.ifremer.isisfish.simulator.launcher.SimulationJob.PostAction; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityException; @@ -120,6 +128,9 @@ */ protected SimulationMonitor() { + // nomme le thread + super("monitor-thread"); + monitorFolder = IsisFish.config.getMonitoringDirectory(); // init monitor check map @@ -246,7 +257,7 @@ // - un launcher // - un zip (pour relancement) // Et il est relance avec un parametre "checkonly" - SimulationParameter params = new SimulationParameter(); + SimulationParameter params = new SimulationParameterImpl(); SimulationControl control = new SimulationControl(simulationId); SimulationItem item = new SimulationItem(control, params); @@ -586,28 +597,42 @@ // force le download dans le cas de ssh SimulationStorage simulation = launcher.getSimulationStorage( service, control); + + //TODO simulation is null here when a in process simulation + //TODO has been restarted - // on ne fait de post traitement que si - // la simulation n'a pas été arretée - if (!control.isStopSimulationRequest()) { - - // do posts actions - for (PostAction action : job.getPostActions()) { - try { - action.finished(job, simulation); - } catch (Exception eee) { - if (log.isErrorEnabled()) { - log.error(_("Can't do post action %s", action), eee); + if (simulation != null) { + // on ne fait de post traitement que si + // la simulation n'a pas été arretée + if (!control.isStopSimulationRequest()) { + // post manage this storage + boolean simulationAvailable = true; //exportResult(job, simulation); + + // do posts actions + for (PostAction action : job.getPostActions()) { + try { + action.finished(job, simulation); + } catch (Exception eee) { + if (log.isErrorEnabled()) { + log.error(_("Can't do post action %s", action), eee); + } } } + + // sensitivity calculator analyze result call + // can't do analyze second pass if simulation + // has been deleted + if (simulationAvailable) { + analyzeSensitivityResult(job, simulation); + } } - - // sensitivity calculator analyze result call - // can't do analyze second pass if simulation - // has been deleted - // simulation can't be deleted anymore - analyzeSensitivityResult(job, simulation); } + else { + // allow simulation to restart to be properly removed + if (log.isWarnEnabled()) { + log.warn("Check null simulation check (launcher return null simulation)"); + } + } // notify simulation ended // to not check later... Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationQueue.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationQueue.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationQueue.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2002-2009 Ifremer, Code Lutin, Benjamin Poussin +/* + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, 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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - *##%*/ + * You should have received 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.simulator.launcher; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2002-2009 Ifremer, Code Lutin, Benjamin Poussin +/* + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, 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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - *##%*/ + * You should have received 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.simulator.launcher; @@ -838,8 +844,7 @@ // appel de tous les plans pour modifier la simulation for (AnalysePlan plan : param.getAnalysePlans()) { result = result - && plan.beforeSimulation(planContext, - sim); + && plan.beforeSimulation(planContext, sim); if (!result) { nextJob = null; break; @@ -856,9 +861,14 @@ nextJob = new SimulationJob(simulationService, job, item, job.getPriority()); nextJob.setLauncher(job.getLauncher()); - nextJob.addPostAction(this); // pour l'appel des after des plans + + // FIXME on retire la post action pour les plan dépendants + // sera appelé directement par le job de preparations + if (param.isIndependentPlan()) { + nextJob.addPostAction(this); // pour l'appel des after des plans + } } - + // close context for plan generator sim.closeStorage(); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceListener.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceListener.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceListener.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2002-2009 Ifremer, Code Lutin, Benjamin Poussin +/* + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, 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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - *##%*/ + * You should have received 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.simulator.launcher; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2002-2009 Ifremer, Code Lutin, Benjamin Poussin +/* + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, 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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - *##%*/ + * You should have received 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.simulator.launcher; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2002-2009 Ifremer, Code Lutin, Benjamin Poussin +/* + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, 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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - *##%*/ + * You should have received 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.simulator.launcher; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2002-2009 Ifremer, Code Lutin, 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. +/* + * #%L + * IsisFish * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.simulator.launcher; @@ -44,6 +50,9 @@ /** * Lanceur de simulation dans un sous processus. * + * Usefull article about sub process management : + * http://www.javaworld.com/javaworld/jw-12-2000/jw-1229-traps.html?page=4 + * * @see ProcessBuilder * @see Process * @@ -206,10 +215,10 @@ monitor.start(); // on attend que la simulation soit fini - process.waitFor(); + int status = process.waitFor(); if (log.isInfoEnabled()) { - log.info("SubProcess finished"); + log.info("SubProcess finished (status = " + status + ")"); } //finished = true; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/package-info.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/package-info.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/package-info.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 1999 - 2010 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 + * 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% + */ /** * <h1>Isis fish simulation launchers.</h1> * Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.simulator.sensitivity; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.simulator.sensitivity; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.simulator.sensitivity; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.simulator.sensitivity; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.simulator.sensitivity; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculator.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculator.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculator.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.simulator.sensitivity; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityException.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityException.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityException.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.simulator.sensitivity; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityScenarios.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityScenarios.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityScenarios.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.simulator.sensitivity; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.simulator.sensitivity.domain; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.simulator.sensitivity.domain; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomain.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.simulator.sensitivity.domain; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomain.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.simulator.sensitivity.domain; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/package-info.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/package-info.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/package-info.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * 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% + */ /** * Ensembles des implémentation de domaines. */ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/package-info.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/package-info.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/package-info.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * 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% + */ /** * Sensitivity analysis. * Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DesignPlanVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DesignPlanVisitor.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DesignPlanVisitor.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.simulator.sensitivity.visitor; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DomainVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DomainVisitor.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DomainVisitor.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.simulator.sensitivity.visitor; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/FactorVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/FactorVisitor.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/FactorVisitor.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.simulator.sensitivity.visitor; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/ScenarioVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/ScenarioVisitor.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/ScenarioVisitor.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.simulator.sensitivity.visitor; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/SensitivityScenariosVisitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/SensitivityScenariosVisitor.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/SensitivityScenariosVisitor.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.simulator.sensitivity.visitor; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/package-info.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/package-info.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/package-info.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * 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% + */ /** * XML import/export visitor. */ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/Date.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/Date.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/Date.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,34 +1,28 @@ /* - * *##% Copyright (C) 2005 - 2009 - * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2005 - 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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place - Suite 330, Boston, MA 02111-1307, USA. ##% + * You should have received 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% */ -/******************************************************************************* - * Date.java - * - * Created: 24 novembre 2005 18:08:39 CET - * - * @author Benjamin POUSSIN <poussin at codelutin.com> - * - * @version $Revision$ - * - * Last update: $Date$ by : $Author$ - */ - package fr.ifremer.isisfish.types; import java.io.Serializable; @@ -42,7 +36,7 @@ */ public class Date implements Cloneable, Serializable, Comparable<Date> { // Date - /** */ + /** serialVersionUID. */ private static final long serialVersionUID = 1L; protected int date = 0; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/Month.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/Month.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/Month.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,24 +1,28 @@ /* - * *##% Copyright (C) 2005 - 2009 - * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2005 - 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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place - Suite 330, Boston, MA 02111-1307, USA. ##% + * You should have received 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.types; import static org.nuiton.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/RangeOfValues.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/RangeOfValues.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/RangeOfValues.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,32 +1,26 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * RangeOfValues.java - * - * Created: 7 mars 2006 17:16:20 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * + * You should have received 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.types; @@ -35,15 +29,20 @@ import java.util.ArrayList; import java.util.List; - /** + * RangeOfValues.java + * + * Created: 7 mars 2006 17:16:20 + * * @author poussin + * @version $Revision$ * + * Last update: $Date$ + * by : $Author$ */ - public class RangeOfValues implements Cloneable, Serializable { - /** */ + /** serialVersionUID. */ private static final long serialVersionUID = 1L; static final public String [] TYPES = new String[]{"String", "Integer", "Float"}; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/TimeUnit.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/TimeUnit.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/TimeUnit.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,32 +1,26 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * TimeUnit.java - * - * Created: 20 janv. 2006 03:03:15 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * + * You should have received 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.types; @@ -35,17 +29,22 @@ import java.io.Serializable; - /** + * TimeUnit.java + * + * Created: 20 janv. 2006 03:03:15 + * * @author poussin + * @version $Revision$ * + * Last update: $Date$ + * by : $Author$ */ - public class TimeUnit implements Cloneable, Serializable, Comparable<TimeUnit> { static public final double HOUR_PER_DAY = 24; - /** */ + /** serialVersionUID. */ private static final long serialVersionUID = 1L; /** le temps en seconde */ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate/DateType.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate/DateType.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate/DateType.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,36 +1,28 @@ -/* *##% - * Copyright (C) 2002 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * DateType.java - * - * Created: 19 janv. 2006 - * - * @author Arnaud Thimel <thimel at codelutin.com> - * Copyright Code Lutin - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ - */ -/** * + * You should have received 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.types.hibernate; import java.sql.PreparedStatement; @@ -43,6 +35,18 @@ import fr.ifremer.isisfish.types.Date; +/** + * DateType.java + * + * Created: 19 janv. 2006 + * + * @author Arnaud Thimel <thimel at codelutin.com> + * Copyright Code Lutin + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ public class DateType extends ImmutableType { /** */ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,33 +1,28 @@ -/* *##% - * Copyright (C) 2002 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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% + */ -/* * - * MatrixType.java - * - * Created: 23 janv. 2006 - * - * @author Arnaud Thimel <thimel at codelutin.com> - * Copyright Code Lutin - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ - */ package fr.ifremer.isisfish.types.hibernate; import java.io.Serializable; @@ -56,6 +51,18 @@ import fr.ifremer.isisfish.util.ConverterUtil; import fr.ifremer.isisfish.util.TopiaEntityConverter; +/** + * MatrixType.java + * + * Created: 23 janv. 2006 + * + * @author Arnaud Thimel <thimel at codelutin.com> + * Copyright Code Lutin + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ public class MatrixType implements CompositeUserType { /** Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MonthType.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MonthType.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MonthType.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,36 +1,28 @@ -/* *##% - * Copyright (C) 2002 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * DateType.java - * - * Created: 19 janv. 2006 - * - * @author Arnaud Thimel <thimel at codelutin.com> - * Copyright Code Lutin - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ - */ -/** * + * You should have received 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.types.hibernate; import java.sql.PreparedStatement; @@ -43,6 +35,18 @@ import fr.ifremer.isisfish.types.Month; +/** + * MonthType.java + * + * Created: 19 janv. 2006 + * + * @author Arnaud Thimel <thimel at codelutin.com> + * Copyright Code Lutin + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ public class MonthType extends ImmutableType { /** serialVersionUID. */ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate/RangeOfValuesType.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate/RangeOfValuesType.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate/RangeOfValuesType.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,32 +1,26 @@ -/* *##% - * Copyright (C) 2002 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * DateType.java - * - * Created: 19 janv. 2006 - * - * @author Arnaud Thimel <thimel at codelutin.com> - * Copyright Code Lutin - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ + * + * You should have received 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.types.hibernate; @@ -41,6 +35,18 @@ import fr.ifremer.isisfish.types.RangeOfValues; +/** + * RangeOfValuesType.java + * + * Created: 19 janv. 2006 + * + * @author Arnaud Thimel <thimel at codelutin.com> + * Copyright Code Lutin + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ public class RangeOfValuesType extends ImmutableType { /** serialVersionUID. */ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeUnitType.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeUnitType.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeUnitType.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,36 +1,28 @@ -/* *##% - * Copyright (C) 2002 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * DateType.java - * - * Created: 19 janv. 2006 - * - * @author Arnaud Thimel <thimel at codelutin.com> - * Copyright Code Lutin - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ - */ -/** * + * You should have received 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.types.hibernate; import java.sql.PreparedStatement; @@ -43,9 +35,21 @@ import fr.ifremer.isisfish.types.TimeUnit; +/** + * TimeUnitType.java + * + * Created: 19 janv. 2006 + * + * @author Arnaud Thimel <thimel at codelutin.com> + * Copyright Code Lutin + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ public class TimeUnitType extends ImmutableType { - /** */ + /** serialVersionUID. */ private static final long serialVersionUID = -5295147041590169149L; /* (non-Javadoc) Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/ApplicationMonitorUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/ApplicationMonitorUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/ApplicationMonitorUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2006 - 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 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% + --> <JFrame visible="true" size='{new Dimension(400,400)}' title="isisfish.monitor.title" layout='{new BorderLayout()}'> <org.nuiton.widget.ApplicationMonitor Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/Help.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/Help.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/Help.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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% + */ /* *##% * Copyright (C) 2006 - 2009 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/SaveVerifier.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/SaveVerifier.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/SaveVerifier.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2006 - 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 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% + --> <Table> <script><![CDATA[ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2006 - 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 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% + --> <JPanel layout='{new BorderLayout()}'> <script><![CDATA[ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2006 - 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 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% + --> <JPanel layout='{new BorderLayout()}'> <script><![CDATA[ import fr.ifremer.isisfish.ui.simulator.SimulAction; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2006 - 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 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% + --> <JFrame title="isisfish.welcome.title" width='874' height='736' resizable="true" layout='{new BorderLayout()}'> <script><![CDATA[ import static org.nuiton.i18n.I18n._; @@ -197,7 +202,7 @@ </JMenu> <JMenu text="isisfish.welcome.menu.configuration"> <JMenuItem text="isisfish.welcome.menu.configuration" onActionPerformed='config()'/> - <JMenuItem text="isisfish.welcome.menu.configuration.vcs" onActionPerformed='configVCS()'/> + <JMenuItem text="isisfish.welcome.menu.configuration.vcs" onActionPerformed='configVCS()' enabled="false"/> <JMenuItem text="isisfish.welcome.menu.configuration.sshlauncher" onActionPerformed='configurationSSHLauncher()'/> </JMenu> <JMenu text="isisfish.welcome.menu.help"> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 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 License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.config; @@ -63,14 +70,15 @@ protected SSHLauncherConfigUI configUI; protected String currentSSHserver; - //protected String currentSSHsftpServer; protected String currentSSHUsername; protected File currentSSHKey; protected String currentSSHUserhome; protected String currentSSHDatapath; protected String currentSSHIsisHome; protected String currentSSHTempPath; + protected String currentSSHJavaPath; protected String currentSSHPbsBinPath; + protected String currentSSHPbsQsubOptions; protected String currentSSHMaxThreads; protected String currentSSHControlInterval; @@ -89,7 +97,6 @@ public void resetSSHConfiguration() { // server config configUI.getSshServerField().setText(IsisFish.config.getSimulatorSshServer()); - //configUI.getSshSftpServerField().setText(IsisFish.config.getSimulatorSshSftpServer()); configUI.getUsernameField().setText(IsisFish.config.getSimulatorSshUsername()); configUI.getSshKeyField().setText(IsisFish.config.getSSHPrivateKeyFilePath().getAbsolutePath()); @@ -98,7 +105,9 @@ configUI.getSshDatapathField().setText(IsisFish.config.getSimulatorSshDataPath()); configUI.getSshIsisHomeField().setText(IsisFish.config.getSimulatorSshIsisHome()); configUI.getSshTemppathField().setText(IsisFish.config.getSimulatorSshTmpPath()); + configUI.getSshJavaPathField().setText(IsisFish.config.getSimulatorSshJavaPath()); configUI.getSshPbsBinPathField().setText(IsisFish.config.getSimulatorSshPbsBinPath()); + configUI.getSshPbsQsubOptionsField().setText(IsisFish.config.getSimulatorSshPbsQsubOptions()); configUI.getSshControlIntervalField().setText(String.valueOf(IsisFish.config.getSimulatorSshControlCheckInterval())); configUI.getSshMaxThreadsField().setText(String.valueOf(IsisFish.config.getSimulatorSshMaxThreads())); @@ -174,6 +183,13 @@ setColor(false, configUI.getSshTemppathField()); } + currentSSHJavaPath = configUI.getSshJavaPathField().getText().trim(); + if (currentSSHJavaPath.isEmpty()) { + setColor(true, configUI.getSshJavaPathField()); + } else { + setColor(false, configUI.getSshJavaPathField()); + } + currentSSHPbsBinPath = configUI.getSshPbsBinPathField().getText() .trim(); if (currentSSHPbsBinPath.isEmpty()) { @@ -182,6 +198,9 @@ setColor(false, configUI.getSshPbsBinPathField()); } + // currentSSHPbsQsubOptions + currentSSHPbsQsubOptions = configUI.getSshPbsQsubOptionsField().getText().trim(); + // currentSSHMaxThreads currentSSHMaxThreads = configUI.getSshMaxThreadsField().getText().trim(); if (!currentSSHMaxThreads.matches("\\d+")) { @@ -213,7 +232,9 @@ IsisFish.config.setSimulatorSshDataPath(currentSSHDatapath); IsisFish.config.setSimulatorSshIsisHome(currentSSHIsisHome); IsisFish.config.setSimulatorSshTmpPath(currentSSHTempPath); + IsisFish.config.setSimulatorSshJavaPath(currentSSHJavaPath); IsisFish.config.setSimulatorSshPbsBinPath(currentSSHPbsBinPath); + IsisFish.config.setSimulatorSshPbsQsubOptions(currentSSHPbsQsubOptions); IsisFish.config.setSimulatorSshControlCheckInterval(Integer.parseInt(currentSSHControlInterval)); IsisFish.config.setSimulatorSshMaxThreads(Integer.parseInt(currentSSHMaxThreads)); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -<!-- ##% -Copyright (C) 2009 Ifremer, Code Lutin - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -##% --> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2010 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 + 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% + --> <JDialog resizable="false" title="isisfish.simulator.ssh.configuration.title" layout="{new BoxLayout(this.getContentPane(), BoxLayout.PAGE_AXIS)}"> @@ -40,16 +47,6 @@ onKeyReleased="getAction().doCheck()" /> </cell> </row> - <!-- <row> - <cell> - <JLabel id='sshSftpServerLabel' text='isisfish.config.main.simulation.ssh.sftpserver' - toolTipText='isisfish.config.main.simulation.ssh.sftpserver.description' /> - </cell> - <cell fill='horizontal' columns="2"> - <JTextField id='sshSftpServerField' toolTipText='isisfish.config.main.simulation.ssh.sftpserver.description' - onKeyReleased="getAction().doCheck()" enabled="false" /> - </cell> - </row> --> <row fill='horizontal'> <cell> <JLabel id='usernameLabel' text='isisfish.config.main.simulation.ssh.username' @@ -116,6 +113,17 @@ </row> <row fill='horizontal'> <cell> + <JLabel id='sshJavaPathLabel' text='isisfish.config.main.simulation.ssh.javapath' + toolTipText='isisfish.config.main.simulation.ssh.javapath.description' /> + </cell> + <cell> + <JTextField id='sshJavaPathField' + toolTipText='isisfish.config.main.simulation.ssh.javapath.description' + onKeyReleased="getAction().doCheck()" /> + </cell> + </row> + <row fill='horizontal'> + <cell> <JLabel id='sshPbsBinPathLabel' text='isisfish.config.main.simulation.ssh.pbsbinpath' toolTipText='isisfish.config.main.simulation.ssh.pbsbinpath.description' /> </cell> @@ -127,6 +135,17 @@ </row> <row fill='horizontal'> <cell> + <JLabel id='sshPbsQsubOptionsLabel' text='isisfish.config.main.simulation.ssh.pbsqsuboptions' + toolTipText='isisfish.config.main.simulation.ssh.pbsqsuboptions.description' /> + </cell> + <cell> + <JTextField id='sshPbsQsubOptionsField' + toolTipText='isisfish.config.main.simulation.ssh.pbsqsuboptions.description' + onKeyReleased="getAction().doCheck()" /> + </cell> + </row> + <row fill='horizontal'> + <cell> <JLabel id='sshMaxThreadsLabel' text='isisfish.config.main.simulation.ssh.max.threads' toolTipText='isisfish.config.main.simulation.ssh.max.threads.description' /> </cell> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%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 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% + --> <JDialog id="EquationEditorPane" modal="true" title="isisfish.equation.editor.title" width="400" height="400"> <script><![CDATA[ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ ---> + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <script><![CDATA[ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2005 - 2009 - * Ifremer, Code Lutin, Cedric 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2005 - 2010 Ifremer, Code Lutin, Cedric 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.ui.input; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 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 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ ---> + #%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 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% + --> <JPanel layout='{new BorderLayout()}' abstract="true"> <!-- UI state when editing. If no entity selected, actif = false --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeCellRenderer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeCellRenderer.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeCellRenderer.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.input; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2005 - 2009 - * Ifremer, Code Lutin, Cedric 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.input; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,23 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2010 - * Ifremer, Code Lutin, Cedric 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- Equation name (just for display purpose, not mandatory) --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2005 - 2009 - * Ifremer, Code Lutin, Cedric 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.input; @@ -315,7 +321,7 @@ /** * Save all non saved entities. * - * Change registred button states. + * Change registered button states. * Commit opened topia context. */ protected void topiaSave() { @@ -331,10 +337,21 @@ rootUI.repaintNode(currentNode.getContextPath()); rootUI.setStatusMessage(_("isisfish.message.save.finished")); } catch (TopiaException eee) { - if (log.isErrorEnabled()) { - log.error("Can't save region", eee); + + // EC-20100401 : ajouté pour avoir un context + // correct apres un erreur, sinon, on ne peut plus rien faire + // rien sauver d'autre... + try { + isisContext.rollbackTransaction(); + if (log.isErrorEnabled()) { + log.error("Can't save entity", eee); + } + ErrorHelper.showErrorDialog(_("isisfish.error.input.saveentity"), eee); + } catch (TopiaException eee2) { + if (log.isErrorEnabled()) { + log.error("Can't save or rollback entity", eee2); + } } - ErrorHelper.showErrorDialog(_("isisfish.error.input.saveentity"), eee); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2005 - 2009 - * Ifremer, Code Lutin, Cedric 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.input; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,23 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 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 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - - --> + #%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 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% + --> <JPanel layout='{new BorderLayout()}'> <javax.swing.tree.DefaultTreeSelectionModel id='navigationSelectionModel' selectionMode='{javax.swing.tree.TreeSelectionModel.SINGLE_TREE_SELECTION}'/> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,23 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 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 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> - + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,23 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 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 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> - + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,23 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> - + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,23 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> - + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <script><![CDATA[ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/NoneUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/NoneUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/NoneUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%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 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% + --> <JPanel layout='{new BorderLayout()}'> <JLabel id='none' horizontalAlignment="0" text="isisfish.input.selectRegion" constraints='BorderLayout.CENTER'/> </JPanel> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/OpenMapEvents.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/OpenMapEvents.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/OpenMapEvents.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2005 - 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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.input; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,23 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 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 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> - + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> @@ -84,8 +88,8 @@ */ protected void createGroups() { - int response = JOptionPane.showConfirmDialog(this, _("isisfish.populationBasics.confirmCreateGroups"), _("isisfish.common.confirm"), - JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE); + int response = JOptionPane.showConfirmDialog(this, _("isisfish.populationBasics.confirmCreateGroups"), + _("isisfish.common.confirm"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE); if (response == JOptionPane.YES_OPTION) { JFrame wizardFrame = new JFrame(); @@ -101,6 +105,7 @@ wizard.setCard("beginGroupLength"); } wizardFrame.pack(); + wizardFrame.setLocationRelativeTo(this); wizardFrame.setVisible(true); //refresh(); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 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 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,23 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ ---> - + #%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 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% + --> <!-- A terme, cette interface sera appelée à disparaitre. Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 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 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ ---> + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ ---> + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,23 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ ---> - + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,23 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> - + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,23 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> - + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 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 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,23 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> - + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 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 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ ---> + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 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 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ --> + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,23 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 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 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> - + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,23 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> - + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <script><![CDATA[ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesStructuredUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesStructuredUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesStructuredUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <Table> <fr.ifremer.isisfish.entities.SpeciesImpl id='bean' javaBean='null'/> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <script><![CDATA[ @@ -51,66 +56,66 @@ <JPanel id='body' layout='{new BorderLayout()}'> <Table constraints='BorderLayout.CENTER'> <row> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyJanuary' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.january")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.january"))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyFebuary' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.february")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.february"))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyMarch' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.march")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.march"))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyApril' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.april")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.april"))}' /> </cell> </row> <row> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyMay' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.may")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.may"))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyJune' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.june")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.june"))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyJuly' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.july")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.july"))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyAugust' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.august")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.august"))}' /> </cell> </row> <row> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategySeptember' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.september")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.september"))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyOctober' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.october")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.october"))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyNovember' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.november")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.november"))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyDecember' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.december")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.december"))}' /> </cell> </row> </Table> <Table constraints='BorderLayout.SOUTH'> <row> - <cell fill='horizontal' weightx='0.5'> + <cell fill='horizontal' weightx='1'> <JButton id='save' decorator='boxed'/> </cell> - <cell fill='horizontal' weightx='0.5'> + <cell fill='horizontal' weightx='1'> <JButton id='cancel' decorator='boxed'/> </cell> </row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,25 +1,31 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> - + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> + <String id="strategieMonthText" javaBean='null'/> + <!-- bean property --> <fr.ifremer.isisfish.entities.StrategyImpl id='bean' javaBean='null'/> @@ -108,7 +114,7 @@ <Table id='body'> <row> <cell columns='2' fill='horizontal' weightx='1.0' anchor='west'> - <JLabel id='StrategieMonth' enabled='{isActif()}'/> + <JLabel enabled='{isActif()}' text="{getStrategieMonthText()}" font-weight="bold"/> </cell> </row> <row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,23 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 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 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> - + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,23 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> - + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <script><![CDATA[ @Override Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,23 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> - + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%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 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% + --> <JPanel id="wizardGroup" layout='{new BorderLayout()}'> <script> <![CDATA[ @@ -420,7 +425,7 @@ <JLabel text="isisfish.wizardGroupCreation.firstAge"/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="firstAge" onFocusLost=''/> + <JTextField id="firstAge" onFocusLost='firstAgeChanged()'/> </cell> </row> <row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,28 +1,34 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%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 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% + --> <fr.ifremer.isisfish.ui.input.InputContentUI> <!-- bean property --> <fr.ifremer.isisfish.entities.ZoneImpl id='bean' javaBean='null'/> <script><![CDATA[ +import javax.swing.event.ListSelectionEvent; import fr.ifremer.isisfish.entities.Cell; import fr.ifremer.isisfish.entities.Zone; import fr.ifremer.isisfish.entities.ZoneImpl; @@ -114,12 +120,23 @@ return mapListener; } -protected void zoneCellsChange() { - java.util.List<Cell> cells = new ArrayList<Cell>(); - for (Object o : zoneCells.getSelectedValues()) { - cells.add((Cell) o); +protected void zoneCellsChange(ListSelectionEvent event) { + // sans ca, ca boucle (modification depuis la carte) + if (event.getValueIsAdjusting()) { + // pas a faie dans le cas d'une AS + if (isActif()) { + java.util.List<Cell> cells = new ArrayList<Cell>(); + for (Object o : zoneCells.getSelectedValues()) { + cells.add((Cell) o); + } + getBean().setCell(cells); + } } - getBean().setCell(cells); + else { + if (log.isDebugEnabled()) { + log.debug("Duplicated event skipped"); + } + } } ]]> </script> @@ -150,9 +167,9 @@ <row> <cell columns='2' fill='both' weighty='0.7' weightx='1.0'> <JScrollPane> + <!-- FIXME le binding genere un tas d'envenement multiples ! --> <JList id="zoneCells" enabled='{isActif()}' selectedValues='{getBean().getCell() == null ? null : getBean().getCell().toArray()}' - onMouseClicked='if ( isActif() ) { zoneCellsChange(); }' - decorator='boxed'/> + onValueChanged='zoneCellsChange(event)' decorator='boxed'/> </JScrollPane> </cell> </row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% -* Copyright (C) 2002 - 2009 Ifremer, Code Lutin -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Static 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 Static public License for more details. -* -* You should have received a copy of the GNU General Static public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*##%*/ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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.ui.input.check; @@ -53,7 +60,7 @@ import fr.ifremer.isisfish.util.EvaluatorHelper; /** - * CheckSaisie.java + * CheckRegion.java * * Created: 9 janv. 2004 * @@ -89,7 +96,7 @@ if (eq == null) { result.addError(parent, _("isisfish.error.invalid.nullequation", name)); } - if (0 != EvaluatorHelper.check(eq.getJavaInterface(), eq.getContent(), null)) { + else if (0 != EvaluatorHelper.check(eq.getJavaInterface(), eq.getContent(), null)) { result.addError(eq, _("isisfish.error.invalid.equation")); } } @@ -180,7 +187,7 @@ } return result; } - + static public double sumMatrix(MatrixND mat) { double result = 0; for (MatrixIterator i = mat.iterator(); i.next();) { @@ -195,6 +202,9 @@ check(infoSaisonPop, "Emigration", infoSaisonPop.getEmigrationEquation(), result); check(infoSaisonPop, "ImmigrationEquation", infoSaisonPop.getImmigrationEquation(), result); } else { + + // FIXME chatellier 20110221 NPE in getMigrationMatrix() + // with null zones or populations if (isEmptyMatrix(infoSaisonPop.getMigrationMatrix())) { result.addInfo(infoSaisonPop, _("isisfish.error.empty.migration")); } else if(isNullMatrix(infoSaisonPop.getMigrationMatrix())) { @@ -341,7 +351,8 @@ check(pop, "MeanWeight", pop.getMeanWeight(), result); check(pop, "ReproductionEquation", pop.getReproductionEquation(), result); check(pop, "NaturalDeathRate", pop.getNaturalDeathRate(), result); - + + // FIXME chatellier 20110221 NPE pop.getRecruitmentDistribution() if (sumMatrix(pop.getRecruitmentDistribution()) != 1) { result.addWarning(pop, _("isisfish.error.invalid.distribution.recruitment")); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,23 +1,28 @@ -/* *##% -* Copyright (C) 2002 - 2009 Code Lutin -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*##%*/ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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.ui.input.check; import java.util.LinkedHashSet; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2002 - 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.input.check; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2002 - 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.input.check; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableRenderer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableRenderer.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableRenderer.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2002 - 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.input.check; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/formule/FormuleComboModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/formule/FormuleComboModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/formule/FormuleComboModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.input.formule; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/formule/FormuleComboRenderer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/formule/FormuleComboRenderer.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/formule/FormuleComboRenderer.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.input.formule; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearPopulationSelectivityModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearPopulationSelectivityModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/gear/GearPopulationSelectivityModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.input.gear; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/gear/PopulationComboModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/gear/PopulationComboModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/gear/PopulationComboModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.input.gear; @@ -22,7 +29,6 @@ import javax.swing.DefaultComboBoxModel; -import fr.ifremer.isisfish.entities.MetierSeasonInfo; import fr.ifremer.isisfish.entities.Population; /** Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoComboModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoComboModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoComboModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.input.metier; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoComboRenderer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoComboRenderer.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoComboRenderer.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.input.metier; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoTargetSpeciesTableModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoTargetSpeciesTableModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoTargetSpeciesTableModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.input.metier; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/metier/SpeciesComboModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/metier/SpeciesComboModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/metier/SpeciesComboModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.input.metier; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonInfoComboModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonInfoComboModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonInfoComboModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.input.population; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonInfoComboRenderer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonInfoComboRenderer.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/population/PopulationSeasonInfoComboRenderer.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.input.population; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/population/ZoneListModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/population/ZoneListModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/population/ZoneListModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.input.population; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionListModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionListModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionListModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.input.setofvessels; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionListRenderer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionListRenderer.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/EffortDescriptionListRenderer.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.input.setofvessels; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/MetierListModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/MetierListModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/MetierListModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.input.setofvessels; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/MetierListRenderer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/MetierListRenderer.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/MetierListRenderer.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.input.setofvessels; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeListModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeListModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeListModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.input.triptype; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeListRenderer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeListRenderer.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/triptype/TripTypeListRenderer.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.input.triptype; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/logging/console/LogConsoleUI.jaxx =================================================================== (Binary files differ) Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/logging/console/LogMailUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/logging/console/LogMailUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/logging/console/LogMailUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +<!-- + #%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 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% + --> <JDialog> <script> public boolean isEmailValid(String text) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanComboModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanComboModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanComboModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.analyzeplan; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanComboRenderer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanComboRenderer.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanComboRenderer.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% +/* + * #%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 2 - * of the License, or (at your option) any later version. - * + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.analyzeplan; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanListModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanListModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanListModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.analyzeplan; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanListRenderer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanListRenderer.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanListRenderer.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% +/* + * #%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 2 - * of the License, or (at your option) any later version. - * + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.analyzeplan; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanParametersTableCellEditor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanParametersTableCellEditor.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanParametersTableCellEditor.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.analyzeplan; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanParametersTableCellRenderer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanParametersTableCellRenderer.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanParametersTableCellRenderer.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.analyzeplan; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanParametersTableModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanParametersTableModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/analyzeplan/AnalyzePlanParametersTableModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.analyzeplan; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.export; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListRenderer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListRenderer.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListRenderer.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% +/* + * #%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 2 - * of the License, or (at your option) any later version. - * + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.export; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.export; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListRenderer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListRenderer.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListRenderer.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% +/* + * #%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 2 - * of the License, or (at your option) any later version. - * + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.export; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportParametersTableCellEditor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportParametersTableCellEditor.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportParametersTableCellEditor.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.export; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportParametersTableCellRenderer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportParametersTableCellRenderer.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportParametersTableCellRenderer.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.export; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportParametersTableModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportParametersTableModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportParametersTableModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.export; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultListModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultListModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultListModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.result; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultListRenderer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultListRenderer.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultListRenderer.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% +/* + * #%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 2 - * of the License, or (at your option) any later version. - * + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.result; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleComboModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleComboModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleComboModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.rule; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleListCellRenderer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleListCellRenderer.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleListCellRenderer.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% +/* + * #%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 2 - * of the License, or (at your option) any later version. - * + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.rule; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleListModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleListModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleListModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.rule; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersTableCellEditor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersTableCellEditor.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersTableCellEditor.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.rule; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersTableCellRenderer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersTableCellRenderer.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersTableCellRenderer.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.rule; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersTableModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersTableModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersTableModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.rule; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorComboModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorComboModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorComboModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.sensitivity; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorComboRenderer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorComboRenderer.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorComboRenderer.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% +/* + * #%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 2 - * of the License, or (at your option) any later version. - * + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.sensitivity; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorListModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorListModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorListModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.sensitivity; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorListRenderer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorListRenderer.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorListRenderer.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% +/* + * #%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 2 - * of the License, or (at your option) any later version. - * + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.sensitivity; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorParametersTableCellEditor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorParametersTableCellEditor.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorParametersTableCellEditor.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.sensitivity; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorParametersTableCellRenderer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorParametersTableCellRenderer.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorParametersTableCellRenderer.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.sensitivity; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorParametersTableModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorParametersTableModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivity/SensitivityCalculatorParametersTableModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% +/* + * #%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 2 - * of the License, or (at your option) any later version. - * + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.sensitivity; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.sensitivityexport; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListRenderer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListRenderer.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListRenderer.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% +/* + * #%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 2 - * of the License, or (at your option) any later version. - * + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.sensitivityexport; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.sensitivityexport; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% +/* + * #%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 2 - * of the License, or (at your option) any later version. - * + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.sensitivityexport; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportParametersTableCellEditor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportParametersTableCellEditor.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportParametersTableCellEditor.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.sensitivityexport; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportParametersTableCellRenderer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportParametersTableCellRenderer.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportParametersTableCellRenderer.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.sensitivityexport; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportParametersTableModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportParametersTableModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportParametersTableModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.sensitivityexport; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/simulation/SimulationNamesComboModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/simulation/SimulationNamesComboModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/models/simulation/SimulationNamesComboModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% +/* + * #%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 2 - * of the License, or (at your option) any later version. - * + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.models.simulation; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/queue/ComponentTableCellRenderer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/queue/ComponentTableCellRenderer.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/queue/ComponentTableCellRenderer.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.queue; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueAction.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueAction.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.queue; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,23 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 - * Ifremer, Code Lutin, Cedric 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%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 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% + --> <Table> <script><![CDATA[ import fr.ifremer.isisfish.simulator.launcher.SimulationServiceTableModel; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/DataResult.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/DataResult.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/DataResult.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,15 +1,27 @@ -/** -* DataResult.java -* -* Created: Mon Jul 24 2000 -* -* @author POUSSIN Benjamin <bpoussin at free.fr> -* Copyright -* @version $Revision$ -* -* Mise a jour: $Date$ -* par : $Author$ -*/ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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.ui.result; @@ -22,13 +34,15 @@ import org.nuiton.math.matrix.MatrixND; import org.nuiton.util.FileUtil; - /** -* Objet permettant l'affichage des donnees resultats sous forme de -* matrice. -*/ + * Objet permettant l'affichage des donnees resultats sous forme de + * matrice. + */ public class DataResult extends DataResultUI { // IfremerSimulation + /** serialVersionUID. */ + private static final long serialVersionUID = -4089377865270062094L; + /** Class logger. */ private static Log log = LogFactory.getLog(DataResult.class); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/DataResultUI.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/DataResultUI.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/DataResultUI.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,10 +1,26 @@ -/** - * DataResult - * - * Generated: Thu Jul 27 22:04:41 CEST 2006 - * By GGen Copyright Code Lutin - * http://www.codelutin.com - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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.ui.result; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/DataResultUICallback.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/DataResultUICallback.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/DataResultUICallback.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,12 +1,27 @@ -/** - * DataResultUICallback - * - * Generated: Thu Jul 27 22:04:41 CEST 2006 - * By GGen Copyright Code Lutin - * http://www.codelutin.com - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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.ui.result; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/GraphBean.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/GraphBean.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/GraphBean.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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.ui.result; import java.awt.event.ItemEvent; @@ -14,14 +38,11 @@ import org.jfree.chart.renderer.category.BarRenderer; import org.jfree.chart.renderer.category.BarRenderer3D; import org.jfree.chart.renderer.category.CategoryItemRenderer; -import org.jfree.chart.renderer.category.IntervalBarRenderer; -import org.jfree.chart.renderer.category.LayeredBarRenderer; import org.jfree.chart.renderer.category.LineAndShapeRenderer; import org.jfree.chart.renderer.category.LineRenderer3D; import org.jfree.chart.renderer.category.MinMaxCategoryRenderer; import org.jfree.chart.renderer.category.StackedAreaRenderer; import org.jfree.chart.renderer.category.StackedBarRenderer; -import org.jfree.chart.renderer.category.StackedBarRenderer3D; /** * GraphBean. Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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.ui.result; import java.util.HashSet; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUI.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUI.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUI.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,10 +1,26 @@ -/** - * GraphBean - * - * Generated: Thu Jul 27 22:04:40 CEST 2006 - * By GGen Copyright Code Lutin - * http://www.codelutin.com - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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.ui.result; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUICallback.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUICallback.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanUICallback.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,10 +1,26 @@ -/** - * GraphBeanUICallback - * - * Generated: Thu Jul 27 22:04:40 CEST 2006 - * By GGen Copyright Code Lutin - * http://www.codelutin.com - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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.ui.result; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/GraphComboRenderer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/GraphComboRenderer.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/GraphComboRenderer.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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.ui.result; import static org.nuiton.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/GraphEvent.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/GraphEvent.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/GraphEvent.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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.ui.result; import java.util.EventObject; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/GraphListener.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/GraphListener.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/GraphListener.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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.ui.result; import java.util.EventListener; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/GraphMatrixNDDataset.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/GraphMatrixNDDataset.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/GraphMatrixNDDataset.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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.ui.result; import java.util.ArrayList; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoItem.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoItem.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoItem.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,17 +1,28 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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% + */ -/** -* InfoItem.java -* -* -* Created: Thu Jul 06 13:54:59 2000 -* -* @author PERNEL Xavier -* @version $Revision$ -* -* Mise a jour: $Date$ -* par : $Author$ -*/ - package fr.ifremer.isisfish.ui.result; import static org.nuiton.i18n.I18n._; @@ -22,6 +33,17 @@ import org.nuiton.util.Resource; +/** + * InfoItem.java + * + * Created: Thu Jul 06 13:54:59 2000 + * + * @author PERNEL Xavier + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ public class InfoItem extends InfoItemUI implements InfoPanelable { protected int position; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDate.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDate.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDate.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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% + */ /** * InfoItemDate.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDateListRenderer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDateListRenderer.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDateListRenderer.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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.ui.result; import java.awt.Component; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDateUI.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDateUI.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDateUI.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,10 +1,26 @@ -/** - * InfoItemDate - * - * Generated: Thu Jul 27 22:04:44 CEST 2006 - * By GGen Copyright Code Lutin - * http://www.codelutin.com - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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.ui.result; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDateUICallback.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDateUICallback.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDateUICallback.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,15 +1,30 @@ -/** - * InfoItemDateUICallback - * - * Generated: Thu Jul 27 22:04:42 CEST 2006 - * By GGen Copyright Code Lutin - * http://www.codelutin.com - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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.ui.result; - public interface InfoItemDateUICallback{ } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemUI.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemUI.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemUI.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,10 +1,26 @@ -/** - * InfoItem - * - * Generated: Thu Jul 27 22:04:44 CEST 2006 - * By GGen Copyright Code Lutin - * http://www.codelutin.com - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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.ui.result; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemUICallback.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemUICallback.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemUICallback.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,15 +1,30 @@ -/** - * InfoItemUICallback - * - * Generated: Thu Jul 27 22:04:42 CEST 2006 - * By GGen Copyright Code Lutin - * http://www.codelutin.com - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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.ui.result; - public interface InfoItemUICallback{ } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoPanelable.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoPanelable.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/InfoPanelable.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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.ui.result; import javax.swing.*; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/LegendModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/LegendModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/LegendModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,24 +1,30 @@ -/**##%% - * Copyright (C) 2002, 2003 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%%**/ + * You should have received 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.ui.result; - /** * LegendModel. * Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/LegendPanel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/LegendPanel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/LegendPanel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/**##%% - * Copyright (C) 2002, 2003 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%%**/ + * + * You should have received 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.ui.result; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/MatrixInfoTableModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/MatrixInfoTableModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/MatrixInfoTableModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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.ui.result; import org.nuiton.math.matrix.MatrixND; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultAction.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultAction.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2005 - 2010 Ifremer, Code Lutin, Cedric 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% + */ /* *##% * Copyright (C) 2005 * Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultEdit.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultEdit.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultEdit.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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% + */ /** * ResultatEdit2.java * Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultEditUI.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultEditUI.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultEditUI.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,10 +1,26 @@ -/** - * ResultEdit - * - * Generated: Thu Jul 27 22:04:42 CEST 2006 - * By GGen Copyright Code Lutin - * http://www.codelutin.com - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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.ui.result; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultEditUICallback.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultEditUICallback.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultEditUICallback.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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% + */ /** * ResultEditUICallback * Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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.ui.result; /** @@ -39,6 +63,9 @@ private FilterModel<SimulationProperties, String> filterModel; private DefaultComboBoxModel model; + /* + * FIXME this code reload ALL simulation (too long) + */ SimulationServiceListener listener = new SimulationServiceListener() { @Override @@ -78,11 +105,15 @@ private void initSimulation() throws IOException, ParseException { // keep in context list of old simulation names (for filter process) java.util.List<String> value = SimulationStorage.getSimulationNames(); + + // TODO filering disabled since it's read all simulation + // TODO can take more than 20m with a lot of simulations... + // create filter model - filterModel = SimulationFilterUtil.createFilterModel(value); + //filterModel = SimulationFilterUtil.createFilterModel(value); // to used directly model.getFilteredResult() in xml // we must fill filterModel result with original items - filterModel.selectAll(); + //filterModel.selectAll(); getSimulation().setEditable(false); model = new DefaultComboBoxModel(value.toArray()); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUI.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,10 +1,26 @@ -/** - * ResultView - * - * Generated: Thu Jul 27 22:04:42 CEST 2006 - * By GGen Copyright Code Lutin - * http://www.codelutin.com - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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.ui.result; @@ -358,6 +374,9 @@ JButton result = new JButton(_("isisfish.filter"), icon); + // TODO disabled, filtering is too long + result.setEnabled(false); + result.addMouseListener(new MouseAdapter(){ public void mouseClicked(MouseEvent e){ on_filterSimulationLogButton_clicked(); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUICallback.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUICallback.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultViewUICallback.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,10 +1,26 @@ -/** - * ResultViewUICallback - * - * Generated: Thu Jul 27 22:04:42 CEST 2006 - * By GGen Copyright Code Lutin - * http://www.codelutin.com - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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.ui.result; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,6 +1,29 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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.ui.result; - /** * ResumePanel. * Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanelUI.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanelUI.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanelUI.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,10 +1,26 @@ -/** - * ResumePanel - * - * Generated: Thu Jul 27 22:04:44 CEST 2006 - * By GGen Copyright Code Lutin - * http://www.codelutin.com - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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.ui.result; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanelUICallback.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanelUICallback.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanelUICallback.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,15 +1,30 @@ -/** - * ResumePanelUICallback - * - * Generated: Thu Jul 27 22:04:44 CEST 2006 - * By GGen Copyright Code Lutin - * http://www.codelutin.com - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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.ui.result; - public interface ResumePanelUICallback{ } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBean.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBean.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBean.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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.ui.result; import static org.nuiton.i18n.I18n._; @@ -9,15 +33,14 @@ import fr.ifremer.isisfish.map.ResultatLayer; /** -* SimpleResultatMapBean.java -* -* -* Created: Fri Jun 7 13:02:18 2002 -* -* @author <a href="mailto:seb.regnier at free.fr"></a> -* @version -*/ - + * SimpleResultatMapBean.java + * + * + * Created: Fri Jun 7 13:02:18 2002 + * + * @author <a href="mailto:seb.regnier at free.fr"></a> + * @version + */ public class SimpleResultatMapBean extends SimpleResultatMapBeanUI { public SimpleResultatMapBean (){ super(); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUI.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUI.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUI.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,10 +1,26 @@ -/** - * SimpleResultatMapBean - * - * Generated: Thu Jul 27 22:04:14 CEST 2006 - * By GGen Copyright Code Lutin - * http://www.codelutin.com - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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.ui.result; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUICallback.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUICallback.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/result/SimpleResultatMapBeanUICallback.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,15 +1,30 @@ -/** - * SimpleResultatMapBeanUICallback - * - * Generated: Thu Jul 27 22:04:11 CEST 2006 - * By GGen Copyright Code Lutin - * http://www.codelutin.com - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * 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.ui.result; - public interface SimpleResultatMapBeanUICallback{ } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,23 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 - * Ifremer, Code Lutin, Cedric 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2010 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 + 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% + --> <JDialog modal="true" resizable='false' title='isisfish.script.export'> <script> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/FileSelectionTableModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/FileSelectionTableModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/FileSelectionTableModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.script; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.css =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.css 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.css 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * 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% + */ #newFilesLabel { foreground: "{new java.awt.Color(051,102,225)}"; } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ ---> + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2010 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 + 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% + --> <JDialog modal="true" resizable='false' title='isisfish.script.import'> <style source="ImportDialogUI.css" /> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.ui.script; @@ -658,7 +664,7 @@ UpdateDialogUI ui = new UpdateDialogUI(); ui.setVisible(true); //TODO Use FileState new mechanism to obtain state - if (codeStorage == null) { + if (codeStorage != null) { codeStorage.update(); codeStorage.reload(); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptTypesComboModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptTypesComboModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptTypesComboModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.script; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,23 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2010 - * Ifremer, Code Lutin, Cedric 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2010 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 + 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% + --> <JPanel layout='{new BorderLayout()}'> <ScriptAction id="scriptAction" javaBean="new ScriptAction(this)" /> @@ -58,11 +62,11 @@ <JMenuItem id="miPaste" text="isisfish.script.menu.paste" onActionPerformed="getScriptAction().paste()" icon="page_paste.png" enabled='{isSingleFileSelected()}' /> </JMenu> <JMenu id="scriptTxtVCS" text="isisfish.script.menu.txtVCS"> - <JMenuItem id="miCommitVCS" text="isisfish.script.menu.commit" icon="database_go.png" onActionPerformed="getScriptAction().commitScript()" enabled='{isSingleFileSelected()}' /> + <JMenuItem id="miCommitVCS" text="isisfish.script.menu.commit" icon="database_go.png" onActionPerformed="getScriptAction().commitScript()" enabled='false' /> <JMenuItem id="miDiffVCS" text="isisfish.script.menu.diff" accelerator="mnDiffVCS" onActionPerformed="getScriptAction().diffScript()" enabled='{isSingleFileSelected()}' /> - <JMenuItem id="miUpdateVCS" text="isisfish.script.menu.update" icon="database_refresh.png" onActionPerformed="getScriptAction().updateScript()"/> + <JMenuItem id="miUpdateVCS" text="isisfish.script.menu.update" icon="database_refresh.png" onActionPerformed="getScriptAction().updateScript()" enabled='false'/> <JSeparator/> - <JMenuItem id="miDeleteVCS" text="isisfish.script.menu.deleteLocalyServer" onActionPerformed='getScriptAction().deleteScript(true)' icon="database_delete.png" enabled='{isSingleFileSelected()}'/> + <JMenuItem id="miDeleteVCS" text="isisfish.script.menu.deleteLocalyServer" onActionPerformed='getScriptAction().deleteScript(true)' icon="database_delete.png" enabled='false'/> </JMenu> <JMenu id="scriptTxtCode" text="isisfish.script.menu.code"> <JMenuItem id="miCheckSyntax" text="isisfish.script.menu.checkSyntax" icon="script_code_red.png" onActionPerformed="getScriptAction().checkScript()" enabled='{isJavaFileSelected()}' /> @@ -81,7 +85,7 @@ <JButton id="buttonScriptNew" text="isisfish.script.new" toolTipText='isisfish.script.new.tooltip' onActionPerformed='getScriptAction().newScript()' icon="script.png" /> <JButton id="buttonScriptSave" text="isisfish.script.save" toolTipText="isisfish.script.save.tooltip" enabled='{isSingleFileSelected()}' onActionPerformed='getScriptAction().saveScript()' icon="script_save.png" /> <JButton id="buttonScriptExport" text="isisfish.script.export" toolTipText="isisfish.script.export.tooltip" enabled='false' onActionPerformed='getScriptAction().exportScript()' icon="page_white_compressed.png" /> - <JButton id="buttonScriptCommit" text="isisfish.script.commit" toolTipText="isisfish.script.commit.tooltip" enabled='{isSingleFileSelected()}' onActionPerformed='getScriptAction().commitScript()' icon="database_go.png" /> + <JButton id="buttonScriptCommit" text="isisfish.script.commit" toolTipText="isisfish.script.commit.tooltip" enabled='false' onActionPerformed='getScriptAction().commitScript()' icon="database_go.png" /> <JButton id="buttonScriptCut" text="isisfish.script.cut" toolTipText="isisfish.script.cut.tooltip" enabled='{isTextSelected()}' onActionPerformed='getScriptAction().cut()' icon="cut.png" /> <JButton id="buttonScriptCopy" text="isisfish.script.copy" toolTipText="isisfish.script.copy.tooltip" enabled='{isTextSelected()}' onActionPerformed='getScriptAction().copy()' icon="page_copy.png" /> <JButton id="buttonScriptPaste" text="isisfish.script.paste" toolTipText="isisfish.script.paste.tooltip" enabled='{isSingleFileSelected()}' onActionPerformed='getScriptAction().paste()' icon="page_paste.png" /> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/BackupAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/BackupAction.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/BackupAction.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2005 - 2009 - * Ifremer, Code Lutin, Cedric 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2005 - 2010 Ifremer, Code Lutin, Cedric 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.ui.script.action; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/CancelAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/CancelAction.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/CancelAction.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2005 - 2009 - * Ifremer, Code Lutin, Cedric 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2005 - 2010 Ifremer, Code Lutin, Cedric 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.ui.script.action; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ChooseFileAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ChooseFileAction.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ChooseFileAction.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2005 - 2009 - * Ifremer, Code Lutin, Cedric 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2005 - 2010 Ifremer, Code Lutin, Cedric 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.ui.script.action; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ExportAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ExportAction.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ExportAction.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2006 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.script.action; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ImportAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ImportAction.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ImportAction.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2006 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.script.action; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeCellRenderer.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeCellRenderer.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeCellRenderer.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.script.model; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.script.model; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/model/package-info.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/model/package-info.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/model/package-info.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2005 - 2010 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 + * 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% + */ /** * Contains model and renderers for all script uis. */ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/package-info.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/package-info.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/package-info.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2005 - 2010 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 + * 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% + */ /** * Script UI. */ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/ContinuousPanelContainerUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/ContinuousPanelContainerUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/ContinuousPanelContainerUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2010 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 + 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% + --> <JPanel id='continuousPanelContainer' layout='{new BorderLayout()}'> <Boolean id='continuePossible' javaBean='true'/> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2010 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 + 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% + --> <ContinuousPanelContainerUI> <script><![CDATA[ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.sensitivity; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 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 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2010 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 + 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% + --> <ContinuousPanelContainerUI> <String id='text' javaBean='null'/> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ --> + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2010 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 + 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% + --> <JDialog title='isisfish.sensitivity.title' modal='{true}' layout='{new BorderLayout()}'> <Boolean id='continuePossible' javaBean='true'/> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2010 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 + 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% + --> <ContinuousPanelContainerUI> <org.nuiton.math.matrix.MatrixND id='matrix' javaBean='null'/> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityAction.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityAction.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.sensitivity; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ ---> + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2010 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 + 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% + --> <Table> <script><![CDATA[ import javax.swing.table.DefaultTableModel; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.sensitivity; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2010 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 + 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% + --> <Table> <script><![CDATA[ import java.util.ArrayList; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 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 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2010 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 + 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% + --> <JPanel layout='{new BorderLayout()}'> <javax.swing.tree.DefaultTreeSelectionModel id='navigationSelectionModel' selectionMode='{javax.swing.tree.TreeSelectionModel.SINGLE_TREE_SELECTION}'/> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.sensitivity; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTableModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTableModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTableModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2010 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 License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.sensitivity; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 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 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2010 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 + 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% + --> <fr.ifremer.isisfish.ui.SimulationUI> <script><![CDATA[ import jaxx.runtime.JAXXInitialContext; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUtils.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUtils.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUtils.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2002-2009 Ifremer, Code Lutin, Benjamin Poussin +/* + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * 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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - * ##%*/ + * You should have received 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.ui.sensitivity; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2010 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 License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.sensitivity; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 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 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2010 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 + 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% + --> <Table> <Boolean id='ajout' javaBean='false'/> <Boolean id='remove' javaBean='false'/> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 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 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2005 - 2010 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 + 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% + --> <Table> <script><![CDATA[ import fr.ifremer.isisfish.ui.WelcomePanelUI; @@ -30,6 +35,9 @@ } public void refresh() { + + // FIXME listen for export modification here + // fill export setListSimulExportChooseModel(); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 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 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ ---> + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2010 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 + 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% + --> <Table> <Boolean id="regionLoaded" javaBean="false" /> @@ -348,10 +353,10 @@ <JComboBox id="fieldSimulParamsSelect" model='{getSimulParamsSelectModel()}' onActionPerformed='loadOldSimulation()'/> </cell> <cell> - <JButton text="isisfish.params.filter" id="buttonSimulParamsSelectFilter" onActionPerformed='selectFilter()'/> + <JButton text="isisfish.params.filter" id="buttonSimulParamsSelectFilter" onActionPerformed='selectFilter()' enabled="false"/> </cell> <cell> - <JButton text="isisfish.params.clearFilter" id="buttonSimulParamsSelectClearFilter" onActionPerformed='resetFilter()'/> + <JButton text="isisfish.params.clearFilter" id="buttonSimulParamsSelectClearFilter" onActionPerformed='resetFilter()' enabled="false"/> </cell> </row> </Table> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 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 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2005 - 2010 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 + 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% + --> <JPanel layout='{new BorderLayout()}'> <script><![CDATA[ public PreScriptsUI(SimulAction action) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 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 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2005 - 2010 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 + 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% + --> <JPanel layout='{new BorderLayout()}'> <script><![CDATA[ import fr.ifremer.isisfish.ui.WelcomePanelUI; @@ -26,6 +31,9 @@ refresh(); public void refresh() { + + // FIXME listen for result name modification + setListSimulResultChooseModel(); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 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 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ ---> + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2005 - 2010 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 + 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% + --> <Table> <SimulAction id='simulAction' javaBean='getContextValue(SimulAction.class)' /> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2005 - 2010 - * Ifremer, Code Lutin, Cedric 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2005 - 2010 Ifremer, Code Lutin, Cedric 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.ui.simulator; @@ -64,6 +70,7 @@ import fr.ifremer.isisfish.rule.Rule; import fr.ifremer.isisfish.simulator.AnalysePlan; import fr.ifremer.isisfish.simulator.SimulationParameter; +import fr.ifremer.isisfish.simulator.SimulationParameterImpl; import fr.ifremer.isisfish.simulator.launcher.SimulationService; import fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher; import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; @@ -130,7 +137,7 @@ log.debug("Init "); } try { - param = new SimulationParameter(); + param = new SimulationParameterImpl(); List<String> resultNames = getResultNames(); // put default value in param param.setSimulatorName(IsisFish.config.getSimulatorClassfile()); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 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 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2005 - 2010 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 + 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% + --> <fr.ifremer.isisfish.ui.SimulationUI> <script><![CDATA[ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 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 + * 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.ui.simulator.filter; import fr.ifremer.isisfish.simulator.SimulationProperties; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2010 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 + 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% + --> <fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI modal="true"> <fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterPanelUI id='content' constructorParams='this'/> </fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2010 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 + 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% + --> <fr.ifremer.isisfish.ui.widget.filter.FilterPanelUI> <script> import fr.ifremer.isisfish.simulator.SimulationMeta; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterUtil.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterUtil.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterUtil.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 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 + * 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.ui.simulator.filter; import fr.ifremer.isisfish.simulator.SimulationMeta; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.util; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/util/IDialog.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/util/IDialog.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/util/IDialog.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,28 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * 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.ui.util; import javax.swing.AbstractAction; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/util/IsisAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/util/IsisAction.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/util/IsisAction.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,28 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * 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.ui.util; import javax.swing.AbstractAction; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/util/IsisActionWithBackup.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/util/IsisActionWithBackup.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/util/IsisActionWithBackup.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.util; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/util/JaxxUtil.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/util/JaxxUtil.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/util/JaxxUtil.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * 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.ui.util; import jaxx.runtime.JAXXObject; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/util/TooltipHelper.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/util/TooltipHelper.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/util/TooltipHelper.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.util; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/CommitDialogUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/CommitDialogUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/CommitDialogUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,22 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2010 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 + 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% + --> <JDialog modal="true" title='isisfish.vcs.commit'> <script><![CDATA[ // FIXME a refaire Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateConfirmDialogUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateConfirmDialogUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateConfirmDialogUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,23 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> - + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2010 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 + 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% + --> <JDialog modal="true" title='isisfish.vcs.updateconfirm'> <script><![CDATA[ // FIXME a refaire Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,23 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> - + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2010 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 + 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% + --> <JDialog modal="true" title='isisfish.vcs.update'> <script><![CDATA[ // FIXME a refaire Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,23 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> - + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2010 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 + 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% + --> <JDialog> <script><![CDATA[ import javax.swing.text.html.HTMLEditorKit; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,23 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> - + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2010 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 + 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% + --> <JDialog title='isisfish.server.ssh.generateKey.title' modal='true'> <script><![CDATA[ import com.jcraft.jsch.JSch; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSPassPhraseUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSPassPhraseUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSPassPhraseUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,23 +1,27 @@ <!-- -/* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - --> - + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2010 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 + 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% + --> <JDialog title='isisfish.vcs.ask.passphrase.title' modal='true'> <script><![CDATA[ private boolean cancel; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/Interval.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/Interval.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/Interval.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* ##%% - * Copyright (C) 2002 - 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%%**/ + * You should have received 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.ui.widget; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalGraphic.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalGraphic.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalGraphic.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* ##%% - * Copyright (C) 2002 - 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%%**/ + * You should have received 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.ui.widget; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalLabel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalLabel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalLabel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* ##%% - * Copyright (C) 2002 - 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%%**/ + * You should have received 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.ui.widget; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalPanel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalPanel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalPanel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2002 - 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.widget; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2002 - 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.widget.editor; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.ui.widget.editor; @@ -79,7 +85,7 @@ private static enum TypeClassMapping { /** for simple int. */ - Int(int.class), + Int(int.class, Integer.class), /** for a topia entity. */ Topia(TopiaEntity.class), /** for a mounth. */ @@ -87,24 +93,26 @@ /** for a simple date. */ Date(Date.class), /** for a simple boolean. */ - Double(double.class), + Double(double.class, Double.class), /** for a simple boolean. */ - Boolean(boolean.class), + Boolean(boolean.class, Boolean.class), /** for a file location. */ File(java.io.File.class), /** for a simple String. */ String(java.lang.String.class); - private final Class<?> klazz; + private final Class<?>[] klazz; - private TypeClassMapping(Class<?> klazz) { + private TypeClassMapping(Class<?>... klazz) { this.klazz = klazz; } protected static TypeClassMapping getMapping(Class<?> klazz) { for (TypeClassMapping t : TypeClassMapping.values()) { - if (t.klazz.isAssignableFrom(klazz)) { - return t; + for (Class<?> loopKlazz : t.klazz) { + if (loopKlazz.isAssignableFrom(klazz)) { + return t; + } } } throw new RuntimeException( Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/Acceptor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/Acceptor.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/Acceptor.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * 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.ui.widget.filter; /** Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/AcceptorFactory.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/AcceptorFactory.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/AcceptorFactory.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,28 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * 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.ui.widget.filter; import org.apache.commons.logging.Log; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/CompositeFilterAcceptor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/CompositeFilterAcceptor.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/CompositeFilterAcceptor.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,28 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * 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.ui.widget.filter; import org.apache.commons.logging.Log; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/DateInterval.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/DateInterval.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/DateInterval.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,28 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * 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.ui.widget.filter; /** class that represent a date interval stored in long object */ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterAcceptor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterAcceptor.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterAcceptor.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,28 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * 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.ui.widget.filter; /** Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialog.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialog.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialog.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,28 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * 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.ui.widget.filter; import java.util.List; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2010 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 + 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% + --> <JDialog> <script> import jaxx.runtime.JAXXObject; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,28 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * 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.ui.widget.filter; import org.apache.commons.logging.Log; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2010 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 + 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% + --> <JPanel> <script> import org.nuiton.widget.DatePicker; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterParamModel.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterParamModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterParamModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,28 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * 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.ui.widget.filter; import java.io.Serializable; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/ValueGetter.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/ValueGetter.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/ValueGetter.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,28 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * 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.ui.widget.filter; /** Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ArgTypes.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ArgTypes.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ArgTypes.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,32 +1,26 @@ -/* *##% - * Copyright (C) 2006 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * Args.java - * - * Created: 4 juil. 2006 12:40:46 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * + * You should have received 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.util; @@ -36,10 +30,16 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; - /** + * ArgTypes.java + * + * Created: 4 juil. 2006 12:40:46 + * * @author poussin + * @version $Revision$ * + * Last update: $Date$ + * by : $Author$ */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.METHOD}) Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/Args.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/Args.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/Args.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,32 +1,26 @@ -/* *##% - * Copyright (C) 2006 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * Args.java - * - * Created: 4 juil. 2006 12:40:46 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * + * You should have received 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.util; @@ -36,10 +30,16 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; - /** + * Args.java + * + * Created: 4 juil. 2006 12:40:46 + * * @author poussin + * @version $Revision$ * + * Last update: $Date$ + * by : $Author$ */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.METHOD}) Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CellPointcomparator.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CellPointcomparator.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CellPointcomparator.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,26 @@ /* - * *##% Copyright (C) 2005, 2009 - * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2005 - 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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place - Suite 330, Boston, MA 02111-1307, USA. ##% + * You should have received 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.util; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ClasspathTemplateLoader.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ClasspathTemplateLoader.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ClasspathTemplateLoader.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2010 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 + * 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% + */ /* *##% * Copyright (C) 2008, 2009 Code Lutin * Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2010 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.util; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.util; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/DateConverter.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/DateConverter.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/DateConverter.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,32 +1,26 @@ -/* *##% - * Copyright (C) 2006 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * DateConverter.java - * - * Created: 13 janv. 2006 01:13:41 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * + * You should have received 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.util; @@ -39,9 +33,10 @@ /** * Classe utilise pour convertir une chaine en un objet Date. - * Utilisé pour la conversion et le stockage en propriete des parametres + * + * Utilisé pour la conversion et le stockage en propriete des parametres. + * * @author poussin - * */ public class DateConverter implements Converter { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/Doc.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/Doc.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/Doc.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.util; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/DocHelper.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/DocHelper.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/DocHelper.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2007 - 2009 - * 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.util; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/Docable.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/Docable.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/Docable.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.util; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.util; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.util; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/MatrixConverter.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/MatrixConverter.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/MatrixConverter.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,19 +1,26 @@ -/* *##% Copyright (C) 2009-2010 - * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin +/* + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place - Suite 330, Boston, MA 02111-1307, USA. ##% + * You should have received 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.util; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/MonthConverter.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/MonthConverter.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/MonthConverter.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,32 +1,26 @@ -/* *##% - * Copyright (C) 2006 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * MonthConverter.java - * - * Created: 12 janv. 2006 20:23:35 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * + * You should have received 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.util; @@ -36,14 +30,13 @@ import fr.ifremer.isisfish.types.Month; - /** * Classe utilise pour convertir une chaine en un objet Month. + * * Utilisé pour la conversion et le stockage en propriete des parametres + * * @author poussin - * */ - public class MonthConverter implements Converter { /* (non-Javadoc) Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/RangeOfValuesConverter.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/RangeOfValuesConverter.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/RangeOfValuesConverter.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,32 +1,26 @@ -/* *##% - * Copyright (C) 2006 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * DateConverter.java - * - * Created: 13 janv. 2006 01:13:41 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * + * You should have received 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.util; @@ -39,9 +33,10 @@ /** * Classe utilise pour convertir une chaine en un objet RangeOfValues. + * * Utilisé pour la conversion et le stockage en propriete des parametres + * * @author poussin - * */ public class RangeOfValuesConverter implements Converter { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/StringConverter.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/StringConverter.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/StringConverter.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,19 +1,26 @@ -/* *##% Copyright (C) 2006 - 2010 - * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin +/* + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place - Suite 330, Boston, MA 02111-1307, USA. ##% + * You should have received 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.util; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/TimeUnitConverter.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/TimeUnitConverter.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/TimeUnitConverter.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,32 +1,26 @@ -/* *##% - * Copyright (C) 2006 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * DateConverter.java - * - * Created: 13 janv. 2006 01:13:41 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * + * You should have received 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.util; @@ -39,9 +33,10 @@ /** * Classe utilise pour convertir une chaine en un objet TimeUnit. + * * Utilisé pour la conversion et le stockage en propriete des parametres + * * @author poussin - * */ public class TimeUnitConverter implements Converter { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,32 +1,26 @@ -/* *##% - * Copyright (C) 2006 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ - -/* * - * TopiaEntityConverter.java - * - * Created: 12 janv. 2006 20:42:32 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * + * You should have received 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.util; @@ -49,9 +43,10 @@ /** * Classe utilise pour convertir une chaine en un objet TopiaEntity. + * * Utilisé pour la conversion et le stockage en propriete des parametres + * * @author poussin - * */ public class TopiaEntityConverter implements Converter { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/Trace.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/Trace.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/Trace.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2002-2009 Ifremer, Code Lutin, Benjamin Poussin +/* + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, 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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - *##%*/ + * You should have received 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.util; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/InvalidPassphraseException.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/InvalidPassphraseException.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/InvalidPassphraseException.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.util.ssh; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/ProgressMonitor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/ProgressMonitor.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/ProgressMonitor.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * 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% + */ /* *##% * Copyright (C) 2009 Code Lutin, Chatellier Eric * Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.util.ssh; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHException.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHException.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHException.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.util.ssh; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUserInfo.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUserInfo.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUserInfo.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.util.ssh; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUtils.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUtils.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUtils.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.util.ssh; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/package-info.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/package-info.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/package-info.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * 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% + */ /** * Utility classes for {@link fr.ifremer.isisfish.simulator.launcher.SSHSimulatorLauncher}. * Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/AbstractVCS.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/AbstractVCS.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/AbstractVCS.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,19 +1,27 @@ -/* *##% Isis-Fish - * Copyright (C) 2007 - 2009 CodeLutin - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 Ifremer, CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * 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/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.vcs; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCS.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCS.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCS.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,19 +1,27 @@ -/* *##% Isis-Fish - * Copyright (C) 2007 - 2009 Ifremer, CodeLutin - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 Ifremer, CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * 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/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.vcs; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSActionEvent.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSActionEvent.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSActionEvent.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,19 +1,27 @@ -/* *##% Isis-Fish - * Copyright (C) 2007 - 2009 CodeLutin - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 1999 - 2010 Ifremer, CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * 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/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.vcs; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSException.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSException.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSException.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,28 @@ -/* *##% - * Copyright (C) 2002 - 2009 Code Lutin, Benjamin Poussin, Tony Chemit - * - * This program is free software; you can redistribute it and/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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 1999 - 2010 Ifremer, Code Lutin, Benjamin Poussin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.vcs; /** Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSFactory.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSFactory.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSFactory.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2002-2009 Code Lutin, Benjamin Poussin +/* + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, 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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - *##%*/ + * You should have received 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.vcs; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSNone.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSNone.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSNone.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,19 +1,27 @@ -/* *##% Isis-Fish - * Copyright (C) 2008 - 2009 CodeLutin - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2010 Ifremer, CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * 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/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.vcs; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,19 +1,27 @@ -/* *##% Isis-Fish - * Copyright (C) 2008 - 2009 CodeLutin - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2010 Ifremer, CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * 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/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.vcs; @@ -1139,7 +1147,7 @@ try { SVNURL url = getRemoteURL(); url = url.appendPath("tags/" + version, true); - SVNInfo info = getSVNManager().getWCClient().doInfo(url, null, + SVNInfo info = getSVNManager().getWCClient().doInfo(url, SVNRevision.HEAD, SVNRevision.HEAD); // si le tag n'existe pas, on n'arrive pas ici car une exception // est leve, et donc result reste a faux Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VetoableActionListener.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VetoableActionListener.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VetoableActionListener.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,26 @@ /* - * Copyright (C) 2002-2009 Code Lutin, Benjamin Poussin + * #%L + * IsisFish * - * This program is free software; you can redistribute it and/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. + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, 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. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. + * You should have received 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.vcs; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/package.html =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/package.html 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/package.html 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 2002 - 2010 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 + 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% + --> <html> <body>Try to keep this classes agnostic about IsisFish specific objects. This permit library creation in near futur. Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-en_GB.properties 2011-03-02 16:57:16 UTC (rev 3148) @@ -171,10 +171,14 @@ isisfish.config.main.simulation.ssh.datapath.description=Isis-Fish database path isisfish.config.main.simulation.ssh.isis.home=Isis-Fish home 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.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 isisfish.config.main.simulation.ssh.pbsbinpath.description=PBS executables (qsub, qdel...) directory +isisfish.config.main.simulation.ssh.pbsqsuboptions=Qsub arguments +isisfish.config.main.simulation.ssh.pbsqsuboptions.description=Arguments used at qsub job sumbit. Default to '-m n' don't send mail. isisfish.config.main.simulation.ssh.server=Simulation server isisfish.config.main.simulation.ssh.server.description=Simulation server address isisfish.config.main.simulation.ssh.sftpserver.description=Transfer server address (set empty to use scp from simulation server) Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish-fr_FR.properties 2011-03-02 16:57:16 UTC (rev 3148) @@ -171,10 +171,14 @@ isisfish.config.main.simulation.ssh.datapath.description=Emplacement de la base de donn\u00E9es (isis-database) isisfish.config.main.simulation.ssh.isis.home=Installation d'Isis-Fish 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\u00E9faut la valeur est celle de caparmor) isisfish.config.main.simulation.ssh.max.threads=Nombre de thread SSH isisfish.config.main.simulation.ssh.max.threads.description=Nombre de simulation simultan\u00E9e \u00E0 faire en SSH. Attention, ne doit \u00EAtre utilis\u00E9 que pour faire plusieurs plans d'analyse d\u00E9pendants en m\u00EAme temps, sinon laisser '1'. isisfish.config.main.simulation.ssh.pbsbinpath=Emplacement des executables PBS isisfish.config.main.simulation.ssh.pbsbinpath.description=Emplacement des commandes PBS (qsub, qdel...) sur le serveur +isisfish.config.main.simulation.ssh.pbsqsuboptions=Arguments qsub +isisfish.config.main.simulation.ssh.pbsqsuboptions.description=Arguments utilis\u00E9s lors de la soumission des jobs. Par d\u00E9faut '-m n' pas d'envoi de mails. isisfish.config.main.simulation.ssh.server=Serveur de simulation isisfish.config.main.simulation.ssh.server.description=Adresse du serveur de simulation isisfish.config.main.simulation.ssh.sftpserver.description=Adresse du serveur de transfert de fichier (laisser vide pour utiliser directement scp sur le serveur de simulation) @@ -326,7 +330,7 @@ isisfish.error.prepare.data=Can't prepare data isisfish.error.prepare.information.simulation=Can't prepare information for simulation isisfish.error.read.simulation=Can't read simulation information %1$s -isisfish.error.read.simulation.parameters=Impossible de lire les param\u00EAtres du fichier \: %1$s +isisfish.error.read.simulation.parameters=Impossible de lire les param\u00E8tres du fichier \: %1$s isisfish.error.region.addmap=Impossible d'ajouter une carte isisfish.error.region.already.exists=Cette r\u00E9gion existe d\u00E9j\u00E0 isisfish.error.region.cancel= @@ -735,7 +739,7 @@ isisfish.populationMigration.useEquation=Utiliser l'\u00E9quation isisfish.populationMigrationEmigration.coefficient=Coefficient isisfish.populationMigrationEmigration.departureZone=Zone de d\u00E9part -isisfish.populationMigrationEmigration.title=Migration +isisfish.populationMigrationEmigration.title=Emmigration isisfish.populationMigrationImmigration.arrivalZone=Zone d'arriv\u00E9e isisfish.populationMigrationImmigration.coefficient=Coefficient isisfish.populationMigrationImmigration.title=Immigration Modified: isis-fish/branches/3.3.1/src/main/resources/interpreter.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/interpreter.properties 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/interpreter.properties 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +### +# #%L +# IsisFish +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 1999 - 2010 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 +# 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% +### # ------------------------------------------------------------------- # Copyright 2002-2005 Delft University of Technology. # Modified: isis-fish/branches/3.3.1/src/main/resources/jnlp/index.html =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/jnlp/index.html 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/jnlp/index.html 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> <html> <body> Vous pouvez lancer l'application en utilisant Java Webstart grâce à <a href="isis-fish-3.jnlp">ce fichier</a>. Modified: isis-fish/branches/3.3.1/src/main/resources/log4j.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/log4j.properties 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/log4j.properties 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +### +# #%L +# IsisFish +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2005 - 2010 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 +# 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% +### # Global logging configuration log4j.rootLogger=ERROR, stdout # Console output... Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/ActiveRuleImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/ActiveRuleImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/ActiveRuleImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.isisfish.entities"> <class abstract="false" name="fr.ifremer.isisfish.entities.ActiveRuleImpl" node="fr.ifremer.isisfish.entities.ActiveRuleImpl" proxy="fr.ifremer.isisfish.entities.ActiveRule" table="activeRule"> Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/CellImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/CellImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/CellImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.isisfish.entities"> <class abstract="false" name="fr.ifremer.isisfish.entities.CellImpl" node="fr.ifremer.isisfish.entities.CellImpl" proxy="fr.ifremer.isisfish.entities.Cell" table="cell"> Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/EffortDescriptionImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/EffortDescriptionImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/EffortDescriptionImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.isisfish.entities"> <class abstract="false" name="fr.ifremer.isisfish.entities.EffortDescriptionImpl" node="fr.ifremer.isisfish.entities.EffortDescriptionImpl" proxy="fr.ifremer.isisfish.entities.EffortDescription" table="effortDescription"> Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/EquationImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/EquationImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/EquationImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.isisfish.entities"> <class abstract="false" name="fr.ifremer.isisfish.entities.EquationImpl" node="fr.ifremer.isisfish.entities.EquationImpl" proxy="fr.ifremer.isisfish.entities.Equation" table="equation"> Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/FisheryRegionImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/FisheryRegionImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/FisheryRegionImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.isisfish.entities"> <class abstract="false" name="fr.ifremer.isisfish.entities.FisheryRegionImpl" node="fr.ifremer.isisfish.entities.FisheryRegionImpl" proxy="fr.ifremer.isisfish.entities.FisheryRegion" table="fisheryRegion"> Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/GearImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/GearImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/GearImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.isisfish.entities"> <class abstract="false" name="fr.ifremer.isisfish.entities.GearImpl" node="fr.ifremer.isisfish.entities.GearImpl" proxy="fr.ifremer.isisfish.entities.Gear" table="gear"> Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.isisfish.entities"> <class abstract="false" name="fr.ifremer.isisfish.entities.MetierImpl" node="fr.ifremer.isisfish.entities.MetierImpl" proxy="fr.ifremer.isisfish.entities.Metier" table="metier"> Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.isisfish.entities"> <union-subclass abstract="false" extends="fr.ifremer.isisfish.entities.SeasonImpl" name="fr.ifremer.isisfish.entities.MetierSeasonInfoImpl" node="fr.ifremer.isisfish.entities.MetierSeasonInfoImpl" proxy="fr.ifremer.isisfish.entities.MetierSeasonInfo" table="metierSeasonInfo"> Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/PopulationGroupImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/PopulationGroupImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/PopulationGroupImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.isisfish.entities"> <class abstract="false" name="fr.ifremer.isisfish.entities.PopulationGroupImpl" node="fr.ifremer.isisfish.entities.PopulationGroupImpl" proxy="fr.ifremer.isisfish.entities.PopulationGroup" table="populationGroup"> Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.isisfish.entities"> <class abstract="false" name="fr.ifremer.isisfish.entities.PopulationImpl" node="fr.ifremer.isisfish.entities.PopulationImpl" proxy="fr.ifremer.isisfish.entities.Population" table="population"> Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.isisfish.entities"> <union-subclass abstract="false" extends="fr.ifremer.isisfish.entities.SeasonImpl" name="fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl" node="fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl" proxy="fr.ifremer.isisfish.entities.PopulationSeasonInfo" table="populationSeasonInfo"> Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/PortImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/PortImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/PortImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.isisfish.entities"> <class abstract="false" name="fr.ifremer.isisfish.entities.PortImpl" node="fr.ifremer.isisfish.entities.PortImpl" proxy="fr.ifremer.isisfish.entities.Port" table="port"> Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/ResultImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/ResultImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/ResultImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.isisfish.entities"> <class abstract="false" name="fr.ifremer.isisfish.entities.ResultImpl" node="fr.ifremer.isisfish.entities.ResultImpl" proxy="fr.ifremer.isisfish.entities.Result" table="result"> Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/SeasonImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/SeasonImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/SeasonImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.isisfish.entities"> <class abstract="false" name="fr.ifremer.isisfish.entities.SeasonImpl" node="fr.ifremer.isisfish.entities.SeasonImpl" proxy="fr.ifremer.isisfish.entities.Season" table="season"> Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/SelectivityImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/SelectivityImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/SelectivityImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.isisfish.entities"> <class abstract="false" name="fr.ifremer.isisfish.entities.SelectivityImpl" node="fr.ifremer.isisfish.entities.SelectivityImpl" proxy="fr.ifremer.isisfish.entities.Selectivity" table="selectivity"> Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/SetOfVesselsImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/SetOfVesselsImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/SetOfVesselsImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.isisfish.entities"> <class abstract="false" name="fr.ifremer.isisfish.entities.SetOfVesselsImpl" node="fr.ifremer.isisfish.entities.SetOfVesselsImpl" proxy="fr.ifremer.isisfish.entities.SetOfVessels" table="setOfVessels"> Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/SpeciesImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/SpeciesImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/SpeciesImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.isisfish.entities"> <class abstract="false" name="fr.ifremer.isisfish.entities.SpeciesImpl" node="fr.ifremer.isisfish.entities.SpeciesImpl" proxy="fr.ifremer.isisfish.entities.Species" table="species"> Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.isisfish.entities"> <class abstract="false" name="fr.ifremer.isisfish.entities.StrategyImpl" node="fr.ifremer.isisfish.entities.StrategyImpl" proxy="fr.ifremer.isisfish.entities.Strategy" table="strategy"> Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.isisfish.entities"> <class abstract="false" name="fr.ifremer.isisfish.entities.StrategyMonthInfoImpl" node="fr.ifremer.isisfish.entities.StrategyMonthInfoImpl" proxy="fr.ifremer.isisfish.entities.StrategyMonthInfo" table="strategyMonthInfo"> Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/TargetSpeciesImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/TargetSpeciesImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/TargetSpeciesImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.isisfish.entities"> <class abstract="false" name="fr.ifremer.isisfish.entities.TargetSpeciesImpl" node="fr.ifremer.isisfish.entities.TargetSpeciesImpl" proxy="fr.ifremer.isisfish.entities.TargetSpecies" table="targetSpecies"> Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/TripTypeImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/TripTypeImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/TripTypeImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.isisfish.entities"> <class abstract="false" name="fr.ifremer.isisfish.entities.TripTypeImpl" node="fr.ifremer.isisfish.entities.TripTypeImpl" proxy="fr.ifremer.isisfish.entities.TripType" table="tripType"> Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/VesselTypeImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/VesselTypeImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/VesselTypeImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.isisfish.entities"> <class abstract="false" name="fr.ifremer.isisfish.entities.VesselTypeImpl" node="fr.ifremer.isisfish.entities.VesselTypeImpl" proxy="fr.ifremer.isisfish.entities.VesselType" table="vesselType"> Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/ZoneImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/ZoneImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/0/fr/ifremer/isisfish/entities/ZoneImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="true" default-access="field" package="fr.ifremer.isisfish.entities"> <class abstract="false" name="fr.ifremer.isisfish.entities.ZoneImpl" node="fr.ifremer.isisfish.entities.ZoneImpl" proxy="fr.ifremer.isisfish.entities.Zone" table="zone"> Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ActiveRuleImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ActiveRuleImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ActiveRuleImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> <class name="fr.ifremer.isisfish.entities.ActiveRuleImpl" table="activeRule" node="fr.ifremer.isisfish.entities.ActiveRuleImpl" abstract="false" > Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/CellImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/CellImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/CellImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> <class name="fr.ifremer.isisfish.entities.CellImpl" table="cell" node="fr.ifremer.isisfish.entities.CellImpl" abstract="false" > Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/EffortDescriptionImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/EffortDescriptionImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/EffortDescriptionImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> <class name="fr.ifremer.isisfish.entities.EffortDescriptionImpl" table="effortDescription" node="fr.ifremer.isisfish.entities.EffortDescriptionImpl" abstract="false" > Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/EquationImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/EquationImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/EquationImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> <class name="fr.ifremer.isisfish.entities.EquationImpl" table="equation" node="fr.ifremer.isisfish.entities.EquationImpl" abstract="false" > Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/FisheryRegionImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/FisheryRegionImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/FisheryRegionImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> <class name="fr.ifremer.isisfish.entities.FisheryRegionImpl" table="fisheryRegion" node="fr.ifremer.isisfish.entities.FisheryRegionImpl" abstract="false" > Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/GearImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/GearImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/GearImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> <class name="fr.ifremer.isisfish.entities.GearImpl" table="gear" node="fr.ifremer.isisfish.entities.GearImpl" abstract="false" > Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> <class name="fr.ifremer.isisfish.entities.MetierImpl" table="metier" node="fr.ifremer.isisfish.entities.MetierImpl" abstract="false" > Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> <union-subclass name="fr.ifremer.isisfish.entities.MetierSeasonInfoImpl" extends="fr.ifremer.isisfish.entities.SeasonImpl" table="metierSeasonInfo" node="fr.ifremer.isisfish.entities.MetierSeasonInfoImpl" abstract="false" > Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationGroupImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationGroupImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationGroupImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> <class name="fr.ifremer.isisfish.entities.PopulationGroupImpl" table="populationGroup" node="fr.ifremer.isisfish.entities.PopulationGroupImpl" abstract="false" > Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> <class name="fr.ifremer.isisfish.entities.PopulationImpl" table="population" node="fr.ifremer.isisfish.entities.PopulationImpl" abstract="false" > Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> <union-subclass name="fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl" extends="fr.ifremer.isisfish.entities.SeasonImpl" table="populationSeasonInfo" node="fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl" abstract="false" > Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PortImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PortImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PortImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> <class name="fr.ifremer.isisfish.entities.PortImpl" table="port" node="fr.ifremer.isisfish.entities.PortImpl" abstract="false" > Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ResultImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ResultImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ResultImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> <class name="fr.ifremer.isisfish.entities.ResultImpl" table="result" node="fr.ifremer.isisfish.entities.ResultImpl" abstract="false" > Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SeasonImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SeasonImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SeasonImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> <class name="fr.ifremer.isisfish.entities.SeasonImpl" table="season" node="fr.ifremer.isisfish.entities.SeasonImpl" abstract="false" > Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SelectivityImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SelectivityImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SelectivityImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> <class name="fr.ifremer.isisfish.entities.SelectivityImpl" table="selectivity" node="fr.ifremer.isisfish.entities.SelectivityImpl" abstract="false" > Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SetOfVesselsImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SetOfVesselsImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SetOfVesselsImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> <class name="fr.ifremer.isisfish.entities.SetOfVesselsImpl" table="setOfVessels" node="fr.ifremer.isisfish.entities.SetOfVesselsImpl" abstract="false" > Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SpeciesImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SpeciesImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SpeciesImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> <class name="fr.ifremer.isisfish.entities.SpeciesImpl" table="species" node="fr.ifremer.isisfish.entities.SpeciesImpl" abstract="false" > Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> <class name="fr.ifremer.isisfish.entities.StrategyImpl" table="strategy" node="fr.ifremer.isisfish.entities.StrategyImpl" abstract="false" > Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> <class name="fr.ifremer.isisfish.entities.StrategyMonthInfoImpl" table="strategyMonthInfo" node="fr.ifremer.isisfish.entities.StrategyMonthInfoImpl" abstract="false" > Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/TargetSpeciesImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/TargetSpeciesImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/TargetSpeciesImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> <class name="fr.ifremer.isisfish.entities.TargetSpeciesImpl" table="targetSpecies" node="fr.ifremer.isisfish.entities.TargetSpeciesImpl" abstract="false" > Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/TripTypeImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/TripTypeImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/TripTypeImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> <class name="fr.ifremer.isisfish.entities.TripTypeImpl" table="tripType" node="fr.ifremer.isisfish.entities.TripTypeImpl" abstract="false" > Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/VesselTypeImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/VesselTypeImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/VesselTypeImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> <class name="fr.ifremer.isisfish.entities.VesselTypeImpl" table="vesselType" node="fr.ifremer.isisfish.entities.VesselTypeImpl" abstract="false" > Modified: isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ZoneImpl.hbm.xml =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ZoneImpl.hbm.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ZoneImpl.hbm.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> <class name="fr.ifremer.isisfish.entities.ZoneImpl" table="zone" node="fr.ifremer.isisfish.entities.ZoneImpl" abstract="false" > Modified: isis-fish/branches/3.3.1/src/main/resources/sensitivity.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/sensitivity.properties 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/sensitivity.properties 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,28 @@ -# this file contains authorized entities factors creation +### +# #%L +# IsisFish +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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 +# 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% +### +#ï¿œthis file contains authorized entities factors creation EffortDescription.crewFoodCost EffortDescription.crewShareRate EffortDescription.crewSize Modified: isis-fish/branches/3.3.1/src/main/resources/templates/ssh/qsub-script.ftl =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/templates/ssh/qsub-script.ftl 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/templates/ssh/qsub-script.ftl 2011-03-02 16:57:16 UTC (rev 3148) @@ -5,17 +5,17 @@ #source /usr/share/modules/init/csh #module load java/1.6.0 -<#assign commonCommand="/home3/caparmor/poussin/jdk/bin/java -Xmx2500M -jar isis-fish*.jar --option launch.ui false --option perform.vcsupdate false --option perform.migration false --option perform.cron false" /> +<#assign commonCommand="${javapath} -Xmx2000M -jar isis-fish*.jar --option launch.ui false --option perform.vcsupdate false --option perform.migration false --option perform.cron false" /> <#if qsubmutiplejob> <#-- localsimulationid is short simulation id version --> <#assign localsimulationid='${simulationid}_$PBS_ARRAY_INDEX' /> <#if simulationstandalonezip> - <#assign localsimulationzip='${simulationzip?replace("${simulationid}_[0-9]+", "${simulationid}_\\\\$PBS_ARRAY_INDEX","ri")}' /> + <#assign localsimulationzip='${simulationzip?replace("\\\\Q${simulationid}\\\\E_[0-9]+", "${simulationid}_\\\\$PBS_ARRAY_INDEX","ri")}' /> <#else> <#assign localsimulationzip='${simulationzip}' /> </#if> - <#assign localsimulationresultzip='${simulationresultzip?replace("${simulationid}_[0-9]+", "${simulationid}_\\\\$PBS_ARRAY_INDEX","ri")}' /> - <#assign localsimulationprescript='${simulationprescript?replace("${simulationid}_[0-9]+", "${simulationid}_\\\\$PBS_ARRAY_INDEX","ri")}' /> + <#assign localsimulationresultzip='${simulationresultzip?replace("\\\\Q${simulationid}\\\\E_[0-9]+", "${simulationid}_\\\\$PBS_ARRAY_INDEX","ri")}' /> + <#assign localsimulationprescript='${simulationprescript?replace("\\\\Q${simulationid}\\\\E_[0-9]+", "${simulationid}_\\\\$PBS_ARRAY_INDEX","ri")}' /> <#assign localsimulationoutput='${isistemp}simulation-${simulationid}_$PBS_ARRAY_INDEX-output.txt' /> <#else> <#assign localsimulationid='${simulationid}' /> Modified: isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-0_1.3.1.xsl =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-0_1.3.1.xsl 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-0_1.3.1.xsl 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <xsl:output method="xml" encoding="ISO-8859-1" indent="yes"/> Modified: isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-1.3.1_1.5.xsl =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-1.3.1_1.5.xsl 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-1.3.1_1.5.xsl 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <xsl:output method="xml" encoding="ISO-8859-1" indent="yes"/> @@ -14,7 +39,7 @@ - <!-- les equations sont maintenant conservé directement dans les objets --> + <!-- les equations sont maintenant conservï¿œ directement dans les objets --> <!-- Population.croissance --> <xsl:template match="attribute[((@name='croissance') and (../@type='Population')) or ((@name='inverseCroissance') and (../@type='Population')) or ((@name='equationReproduction') and (../@type='Population')) or ((@name='equation') and (../@type='Selectivite'))]"> <xsl:copy> @@ -29,68 +54,68 @@ - <!-- changement de version et ajout de formules préexistante --> + <!-- changement de version et ajout de formules prï¿œexistante --> <xsl:template match="/dbobjects"> <xsl:copy> <xsl:attribute name="version">1.5</xsl:attribute> <xsl:apply-templates select="child::*"/> <dbobject type ='Formule' __id__='fr.ifremer.db.FormuleFactory#1073656709925#0.8006227935493408'> <attribute name='categorie'>Croissance</attribute> - <attribute name='equation'><equation name="Modèle de Von Bertalanffy"> -# Modèle de Von Bertalanffy -# paramètre à modifier + <attribute name='equation'><equation name="Modï¿œle de Von Bertalanffy"> +# Modï¿œle de Von Bertalanffy +# paramï¿œtre ï¿œ modifier Linf = 0.0; K = 0.0; T0 = 0.0; (Linf*(1.0-Exp((K*(age-T0))))) </equation></attribute> - <attribute name='nom'>Modèle de Von Bertalanffy</attribute> + <attribute name='nom'>Modï¿œle de Von Bertalanffy</attribute> </dbobject> <dbobject type ='Formule' __id__='fr.ifremer.db.FormuleFactory#1073656824909#0.16536956353418875'> <attribute name='categorie'>InverseCroissance</attribute> - <attribute name='equation'><equation name="Modèle de Von Bertalanffy"> -# Modèle de Von Bertalanffy -# paramètre à modifier + <attribute name='equation'><equation name="Modï¿œle de Von Bertalanffy"> +# Modï¿œle de Von Bertalanffy +# paramï¿œtre ï¿œ modifier Linf = 0.0; K = 0.0; T0 = 0.0; (T0+((1.0/K)*Ln((1.0-(longueur/Linf))))) </equation></attribute> - <attribute name='nom'>Modèle de Von Bertalanffy</attribute> + <attribute name='nom'>Modï¿œle de Von Bertalanffy</attribute> </dbobject> <dbobject type ='Formule' __id__='fr.ifremer.db.FormuleFactory#1073657787384#0.2840732391087244'> <attribute name='categorie'>Croissance</attribute> - <attribute name='equation'><equation name="Modèle de Gompertz"> -#Modèle de Gompertz -# paramètres à modifier + <attribute name='equation'><equation name="Modï¿œle de Gompertz"> +#Modï¿œle de Gompertz +# paramï¿œtresￜￜ modifier L0 = 0.0; Lambda = 0.0; K = 0.0; (L0*Exp(((Lambda/K)*(1.0-Exp((-K*age)))))) </equation></attribute> - <attribute name='nom'>Modèle de Gompertz</attribute> + <attribute name='nom'>Modï¿œle de Gompertz</attribute> </dbobject> <dbobject type ='Formule' __id__='fr.ifremer.db.FormuleFactory#1073657838642#0.4157245134548563'> <attribute name='categorie'>InverseCroissance</attribute> - <attribute name='equation'><equation name="Modèle de Gompertz"> -#Modèle de Gompertz -# paramètres à modifier + <attribute name='equation'><equation name="Modï¿œle de Gompertz"> +#Modï¿œle de Gompertz +# paramï¿œtresￜￜ modifier L0 = 0.0; Lambda = 0.0; K = 0.0; (-(1.0/K)*Ln((1.0-((K/Lambda)*Ln((longueur/L0)))))) </equation></attribute> - <attribute name='nom'>Modèle de Gompertz</attribute> + <attribute name='nom'>Modï¿œle de Gompertz</attribute> </dbobject> <dbobject type ='Formule' __id__='fr.ifremer.db.FormuleFactory#1073658043019#0.17367161278659238'> <attribute name='categorie'>Croissance</attribute> - <attribute name='equation'><equation name="Modèle de Richards"> -#Modèle de Richards -#paramètres à modifier + <attribute name='equation'><equation name="Modï¿œle de Richards"> +#Modï¿œle de Richards +#paramï¿œtres ï¿œ modifier r = 0.0; C0 = 0.0; mu = 0.0; @@ -99,35 +124,35 @@ (((r**(1.0-n))+(C0*Exp((-mu*((n**(n/(n-1.0)))*(age/r))))))**(1.0/(1.0-n))) </equation></attribute> - <attribute name='nom'>Modèle de Richards</attribute> + <attribute name='nom'>Modï¿œle de Richards</attribute> </dbobject> <dbobject type ='Formule' __id__='fr.ifremer.db.FormuleFactory#1073658188487#0.6619503031669575'> <attribute name='categorie'>InverseCroissance</attribute> - <attribute name='equation'><equation name="Modèle de Richards"> -#Modèle de Richards -#paramètres à modifier + <attribute name='equation'><equation name="Modï¿œle de Richards"> +#Modï¿œle de Richards +#paramï¿œtres ï¿œ modifier r = 0.0; C0 = 0.0; mu = 0.0; # n > 1 n = 1.1; -# age est défini uniquement si longueur>r +# age est dï¿œfini uniquement si longueur>r -(r/((mu*(n**(n/(n-1.0))))*Ln((((1.0/C0)*(longueur**(1.0-n)))-(r**(1.0-n)))))) </equation></attribute> - <attribute name='nom'>Modèle de Richards</attribute> + <attribute name='nom'>Modï¿œle de Richards</attribute> </dbobject> <dbobject type ='Formule' __id__='fr.ifremer.db.FormuleFactory#1074729931692#0.9570000725697745'> <attribute name='categorie'>InverseCroissance</attribute> - <attribute name='equation'><equation name='Schnute K!=0 Gamma!=0'>#Modèle de Schnute K!=0 Gamma!=0 -# paramètres à modifier + <attribute name='equation'><equation name='Schnute K!=0 Gamma!=0'>#Modï¿œle de Schnute K!=0 Gamma!=0 +# paramï¿œtresￜￜ modifier K = 1.0; Gamma = 1.0; y1 = 1.0; y2 = 2.0; t1 = 1.0; t2 = 1.0; -#pour tester l'équation +#pour tester l'ï¿œquation #longueur=10; (t1-((1.0/K)*(Ln(((((Exp((-K*(t2-t1)))-1.0)**(1.0/Gamma))/((y2**Gamma)-(y1**Gamma)))*(longueur-(y1**Gamma))))**Gamma))) @@ -136,15 +161,15 @@ </dbobject> <dbobject type ='Formule' __id__='fr.ifremer.db.FormuleFactory#1074729028685#0.3259146274662742'> <attribute name='categorie'>Croissance</attribute> - <attribute name='equation'><equation name='Schnute K!=0 Gamma!=0'>#Modèle de Schnute K!=0 Gamma!=0 -# paramètres à modifier + <attribute name='equation'><equation name='Schnute K!=0 Gamma!=0'>#Modï¿œle de Schnute K!=0 Gamma!=0 +# paramï¿œtresￜￜ modifier K = 1.0; Gamma = 1.0; y1 = 0.0; y2 = 0.0; t1 = 0.0; t2 = 0.0; -#pour tester l'équation +#pour tester l'ï¿œquation #age=3; # erreur dans les parentheses # (y1**Gamma+(y2**Gamma-y1**Gamma)*((1-Exp(-K*(age-t1))/(1-Exp(-K*(t2-t1))))**(1/Gamma) @@ -155,15 +180,15 @@ </dbobject> <dbobject type ='Formule' __id__='fr.ifremer.db.FormuleFactory#1074730196177#0.7489965944422079'> <attribute name='categorie'>Croissance</attribute> - <attribute name='equation'><equation name='Schnute K!=0 Gamma=0'>#Modèle de Schnute K!=0 Gamma=0 -# paramètres à modifier + <attribute name='equation'><equation name='Schnute K!=0 Gamma=0'>#Modï¿œle de Schnute K!=0 Gamma=0 +# paramï¿œtresￜￜ modifier K = 1.0; Gamma = 0.0; y1 = 0.0; y2 = 0.0; t1 = 0.0; t2 = 0.0; -#pour tester l'équation +#pour tester l'ï¿œquation #age=3; #erreur dans les parentheses #y1*Exp(ln(y2/y1)*((1-Exp(-K*(age-t1))/(1-Exp(-K*(t2-t1))) @@ -174,15 +199,15 @@ </dbobject> <dbobject type ='Formule' __id__='fr.ifremer.db.FormuleFactory#1074730310533#0.3621028946344731'> <attribute name='categorie'>InverseCroissance</attribute> - <attribute name='equation'><equation name='Schnute K!=0 Gamma=0'>#Modèle de Schnute K!=0 Gamma=0 -# paramètres à modifier + <attribute name='equation'><equation name='Schnute K!=0 Gamma=0'>#Modï¿œle de Schnute K!=0 Gamma=0 +# paramï¿œtresￜￜ modifier K = 1.0; Gamma = 0.0; y1 = 1.0; y2 = 2.0; t1 = 3.0; t2 = 4.0; -#pour tester l'équation +#pour tester l'ï¿œquation #longueur=3; (t1-((1.0/K)*Ln((1.0-(((1.0-Exp((-K*(t2-t1))))/Ln((y2/y1)))*Ln((longueur/y1))))))) @@ -191,15 +216,15 @@ </dbobject> <dbobject type ='Formule' __id__='fr.ifremer.db.FormuleFactory#1074730681687#0.5277536816858678'> <attribute name='categorie'>InverseCroissance</attribute> - <attribute name='equation'><equation name='Schnute K=0 Gamma=0'>#Modèle de Schnute K=0 Gamma=0 -# paramètres à modifier + <attribute name='equation'><equation name='Schnute K=0 Gamma=0'>#Modï¿œle de Schnute K=0 Gamma=0 +# paramï¿œtresￜￜ modifier K = 0.0; Gamma = 0.0; y1 = 1.0; y2 = 2.0; t1 = 3.0; t2 = 4.0; -#pour tester l'équation +#pour tester l'ï¿œquation #longueur = 3.0; (t1+(((t2-t1)/Ln((y2/y1)))*Ln((longueur/y1)))) @@ -208,15 +233,15 @@ </dbobject> <dbobject type ='Formule' __id__='fr.ifremer.db.FormuleFactory#1074730643195#0.8365677142633519'> <attribute name='categorie'>Croissance</attribute> - <attribute name='equation'><equation name='Schnute K=0 Gamma=0'>#Modèle de Schnute K=0 Gamma=0 -# paramètres à modifier + <attribute name='equation'><equation name='Schnute K=0 Gamma=0'>#Modï¿œle de Schnute K=0 Gamma=0 +# paramï¿œtresￜￜ modifier K = 0.0; Gamma = 0.0; y1 = 1.0; y2 = 2.0; t1 = 3.0; t2 = 4.0; -#pour tester l'équation +#pour tester l'ï¿œquation #age = 3.0; (y1*Exp((Ln((y2/y1))*((age-t1)/(t2-t1))))) @@ -225,15 +250,15 @@ </dbobject> <dbobject type ='Formule' __id__='fr.ifremer.db.FormuleFactory#1074730591103#0.44588422256872773'> <attribute name='categorie'>Croissance</attribute> - <attribute name='equation'><equation name='Schnute K=0 Gamma!=0'>#Modèle de Schnute K=0 Gamma!=0 -# paramètres à modifier + <attribute name='equation'><equation name='Schnute K=0 Gamma!=0'>#Modï¿œle de Schnute K=0 Gamma!=0 +# paramï¿œtresￜￜ modifier K = 0.0; Gamma = 1.0; y1 = 1.0; y2 = 2.0; t1 = 3.0; t2 = 4.0; -#pour tester l'équation +#pour tester l'ï¿œquation #age = 3.0; (((y1**Gamma)+(((y2**Gamma)-(y1**Gamma))*((age-t1)/(t2-t1))))**(1.0/Gamma)) @@ -242,15 +267,15 @@ </dbobject> <dbobject type ='Formule' __id__='fr.ifremer.db.FormuleFactory#1074730520361#0.9952806739499448'> <attribute name='categorie'>InverseCroissance</attribute> - <attribute name='equation'><equation name='Schnute K=0 Gamma!=0'>#Modèle de Schnute K=0 Gamma!=0 -# paramètres à modifier + <attribute name='equation'><equation name='Schnute K=0 Gamma!=0'>#Modï¿œle de Schnute K=0 Gamma!=0 +# paramï¿œtresￜￜ modifier K = 0.0; Gamma = 1.0; y1 = 1.0; y2 = 2.0; t1 = 3.0; t2 = 4.0; -#pour tester l'équation +#pour tester l'ï¿œquation #longueur = 3.0; (t1+(((t2-t1)/((y2**Gamma)-(y1**Gamma)))*((longueur**(1.0/Gamma))-(y1**Gamma)))) Modified: isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-1.5_1.9.xsl =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-1.5_1.9.xsl 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-1.5_1.9.xsl 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <xsl:output method="xml" encoding="ISO-8859-1" indent="yes"/> @@ -12,7 +37,7 @@ </xsl:template> - <!-- changement de version et ajout de formules préexistante --> + <!-- changement de version et ajout de formules prï¿œexistante --> <xsl:template match="/dbobjects"> <xsl:copy> <xsl:attribute name="version">1.9</xsl:attribute> Modified: isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-1.9.1_2.0.xsl =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-1.9.1_2.0.xsl 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-1.9.1_2.0.xsl 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <xsl:output method="xml" encoding="ISO-8859-1" indent="yes"/> Modified: isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-1.9_1.9.1.xsl =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-1.9_1.9.1.xsl 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-1.9_1.9.1.xsl 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <xsl:output method="xml" encoding="ISO-8859-1" indent="yes"/> Modified: isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-2.0_2.1.xsl =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-2.0_2.1.xsl 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-2.0_2.1.xsl 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <xsl:output method="xml" encoding="ISO-8859-1" indent="yes"/> Modified: isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-2.1_2.2.xsl =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-2.1_2.2.xsl 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-2.1_2.2.xsl 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <xsl:output method="xml" encoding="ISO-8859-1" indent="yes"/> Modified: isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-2.2_2.3.xsl =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-2.2_2.3.xsl 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-2.2_2.3.xsl 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <xsl:output method="xml" encoding="ISO-8859-1" indent="yes"/> Modified: isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-cleaner.xsl =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-cleaner.xsl 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/resources/v2xsl/isis-fish-cleaner.xsl 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 2010 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 + 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% + --> + <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <xsl:output method="xml" encoding="ISO-8859-1" indent="yes"/> Modified: isis-fish/branches/3.3.1/src/main/xmi/isis-fish.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/xmi/isis-fish.properties 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/main/xmi/isis-fish.properties 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +### +# #%L +# IsisFish +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 1999 - 2010 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 +# 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% +### model.tagvalue.copyright=/* Copyright (C) 1999 - 2010 Ifremer - Code Lutin */ model.tagvalue.org.nuiton.math.matrix.MatrixND=fr.ifremer.isisfish.types.hibernate.MatrixType(name,dim,dimNames,semantics,data) model.tagvalue.fr.ifremer.isisfish.types.Month=fr.ifremer.isisfish.types.hibernate.MonthType @@ -5,4 +29,5 @@ model.tagvalue.fr.ifremer.isisfish.types.TimeUnit=fr.ifremer.isisfish.types.hibernate.TimeUnitType model.tagvalue.fr.ifremer.isisfish.types.RangeOfValues=fr.ifremer.isisfish.types.hibernate.RangeOfValuesType model.tagvalue.java.lang.String=text -model.tagvalue.hibernateProxyInterface=none \ No newline at end of file +model.tagvalue.hibernateProxyInterface=none +model.tagvalue.useLegacyDAO=true \ No newline at end of file Modified: isis-fish/branches/3.3.1/src/main/xmi/isis-fish.zargo =================================================================== (Binary files differ) Modified: isis-fish/branches/3.3.1/src/site/en/rst/index.rst =================================================================== --- isis-fish/branches/3.3.1/src/site/en/rst/index.rst 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/en/rst/index.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - ========= Isis-fish ========= Modified: isis-fish/branches/3.3.1/src/site/resources/css/site.css =================================================================== --- isis-fish/branches/3.3.1/src/site/resources/css/site.css 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/resources/css/site.css 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 1999 - 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 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% + */ #paypal { display: none; } Copied: isis-fish/branches/3.3.1/src/site/resources/images/IsisFishModel.png (from rev 3147, isis-fish/trunk/src/site/resources/images/IsisFishModel.png) =================================================================== (Binary files differ) Copied: isis-fish/branches/3.3.1/src/site/rst/contact.rst (from rev 3147, isis-fish/trunk/src/site/rst/contact.rst) =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/contact.rst (rev 0) +++ isis-fish/branches/3.3.1/src/site/rst/contact.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -0,0 +1,90 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - +Contacts/Assistance +=================== + +ISIS-Fish est un développement soutenu par l'Ifremer mais à pour but d'être le +plus communautaire possible. Pour cela de nombreux outils ont été mis en place +pour permettre de mieux communiquer et que cette communauté prenne une réelle +existance. + +Liste de diffusion +------------------ + +Différentes listes de diffusion ont été mises en place. Chacune d'elle à un but +précis. + +** Si vous avez un soucis lors de l'utilisation d'ISIS-Fish nous préférons que +vous utilisiez ces listes plutÃŽt que de nous envoyer des e-mails directement. +Car votre question et la réponse qui lui est apportée peuvent intéresser +d'autres personnes, et surtout de nombreuses personnes de ces listes peuvent +vous aider.** + +Même si la langue la plus parlée sur ces listes est le français, **vous pouvez +bien-sûr envoyer vos e-mails en anglais**. + +`Statistiques d utilisation des listes`_ + +.. _Statistiques d utilisation des listes:: listStats.html + +Les listes pour les utilisateurs +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + * `isis-fish-users at list.isis-fish.org <http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-users>`_ + : Liste principale pour les utilisateurs d'ISIS-Fish (page d'inscription). + * `Archives de la liste utilisateurs <http://list.isis-fish.org/pipermail/isis-fish-users/>`_ + * `isis-fish-data-commits at list.isis-fish.org <http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-data-commits>`_ + (lecture seule) : Liste recevant toutes les notifications de modification du + code source des scripts d'ISIS-Fish (page d'inscription). + +Les listes pour les développeurs +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + * `isis-fish-devel at list.isis-fish.org <http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-devel>`_ + : Liste pour les concepteurs du logiciel (page d'inscription). + * `isis-fish-bugreport at list.isis-fish.org <http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-bugreport>`_ + (lecture seule): Liste recevant tous les ajouts dans l'outil de report de + bugs (page d'inscription). + * `isis-fish-commits at list.isis-fish.org <http://list.isis-fish.org/cgi-bin/mailman/listinfo/isis-fish-commits>`_ + (lecture seule): Liste recevant toutes les notifications de modification du + code source d'ISIS-Fish (page d'inscription). + +Outils de suivis +---------------- + +Les outils de suivis permettent de garder les traces de demandes et de voir leur +évolution dans le temps. + +Pour éviter le spam dans ces outils, vous devrez vous +`créer un compte sur le labs <http://labs.libre-entreprise.org/account/register.php>`_ +avant de soumettre quelque chose. Cette inscription ne vous engage absolument à +rien. + + * `Report de bugs <http://labs.libre-entreprise.org/tracker?atid=113&group_id=8&func=browse>`_ + : Il sert à la notification d'un problÚme lors de l'utilisation d'ISIS-Fish. + * `Demande d'amélioration <http://labs.libre-entreprise.org/tracker/?atid=116&group_id=8&func=browse>`_ + : Il sert à ajouter des idées d'amélioration ISIS-Fish. + * `Report de problÚmes de traduction <http://labs.libre-entreprise.org/tracker/?atid=438&group_id=8&func=browse>`_ + : Il sert pour reporter les erreurs de traduction. Copied: isis-fish/branches/3.3.1/src/site/rst/documentation.rst (from rev 3147, isis-fish/trunk/src/site/rst/documentation.rst) =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/documentation.rst (rev 0) +++ isis-fish/branches/3.3.1/src/site/rst/documentation.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -0,0 +1,50 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - +Documentation d'ISIS-Fish +========================= + +* `Mise en garde`_ +* `Installation`_ +* `Manuel utilisateur`_ +* `Tutoriaux`_ +* `FAQ`_ +* `Manuel developpeur`_ +* `Documentation des APIs`_ +* `Exemples de scripts ISIS`_ +* `Exemples de scripts R`_ +* `Note pour le passage de la version 3.1.3 a la version 3.2.0`_ +* `Note aux utilisateurs de CAPARMOR`_ + +.. _Mise en garde:: documentation/warning.html +.. _Installation:: documentation/installation.html +.. _Manuel utilisateur:: documentation/userManual.html +.. _Tutoriaux:: documentation/tutorials.html +.. _FAQ:: documentation/FAQ.html +.. _Manuel developpeur:: documentation/devel.html +.. _Documentation des APIs:: documentation/API.html +.. _Exemples de scripts ISIS:: documentation/scripts.html +.. _Exemples de scripts R:: documentation/scriptsR.html +.. _Note pour le passage de la version 3.1.3 a la version 3.2.0:: documentation/changeVersion.html +.. _Note aux utilisateurs de Caparmor:: documentation/caparmor.html Copied: isis-fish/branches/3.3.1/src/site/rst/download.rst (from rev 3147, isis-fish/trunk/src/site/rst/download.rst) =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/download.rst (rev 0) +++ isis-fish/branches/3.3.1/src/site/rst/download.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -0,0 +1,62 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - +===================== +Télécharger ISIS-Fish +===================== + +ISIS-Fish (Version Java) +------------------------ + +La version Java d'ISIS-Fish est la seule supportée sur ce site. Vous pouvez +télécharger la derniÚre version (ou les anciennes) à partir d'ici. + +Telechargement__ (derniÚre version : Avril 2010) + +__ http://isis-fish.labs.libre-entreprise.org/download/version3/ + + +Base Golfe de Gascogne +~~~~~~~~~~~~~~~~~~~~~~ + +Voici une base de démonstration utilisable sur la version 3.3.0.3 d'ISIS-Fish. + +`Base Golfe de Gascogne`_ + +.. _Base Golfe de Gascogne::downloads/GolfeDeGascogneDemoV3.3.0.3.zip + + +ISIS-Fish (Version R) +--------------------- + +La version R d'ISIS-Fish nommée FLISIS et faisant partie du projet FLR n'est pas +supportée sur ce site. Vous pouvez néanmoins la télécharger à partir d'ici. + +Telechargement__ (derniÚre version : Janvier 2009) + +__ downloads/FLIsis_1.1.2.zip + +`Site du projet`_ + +.. _Site du projet::http://flr-project.org/wiki/doku.php?id=applications:isisflr Copied: isis-fish/branches/3.3.1/src/site/rst/history.rst (from rev 3147, isis-fish/trunk/src/site/rst/history.rst) =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/history.rst (rev 0) +++ isis-fish/branches/3.3.1/src/site/rst/history.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -0,0 +1,41 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - +Historique +========== + +Isis-FISH a beaucoup évolué depuis le début du développement, +l'`historique <history/history.html>`_ vous rappelle l'histoire du simulateur. +Vous pouvez consulter le `journal des modifications <history/changelog.html>`_ +de la version actuellement maintenue. + +Anciennes versions +------------------ + +Vous trouverez ici les informations des anciennes versions du simulateur. + + * `Version 1 <v1/changelog.html>`_ + * `Version 2 <v2/index.html>`_ + + \ No newline at end of file Modified: isis-fish/branches/3.3.1/src/site/rst/index.rst =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/index.rst 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/rst/index.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - ========= Isis-fish ========= @@ -28,7 +52,6 @@ celui-ci. L'analyse et la réalisation technique ont été confiées à différents partenaires: -- Irin (Intitue de Recherche en Informatique de Nantes) +- Irin (Institut de Recherche en Informatique de Nantes) - Cogitec (http://www.cogitec.fr) - Code Lutin (http://www.codelutin.com) - Copied: isis-fish/branches/3.3.1/src/site/rst/license.rst (from rev 3147, isis-fish/trunk/src/site/rst/license.rst) =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/license.rst (rev 0) +++ isis-fish/branches/3.3.1/src/site/rst/license.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -0,0 +1,309 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - +Licence du projet +================= + +:: + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + 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 + 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. + + 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. + + 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. + + 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. + + 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. + + 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. + + The precise terms and conditions for copying, distribution and + modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 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". + + 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. + + 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. + + 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. + + 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: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + 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. + + 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.) + + 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. + + 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. + + 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. + + 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) 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, + + 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, + + 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 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. + + 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. + + 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. + + 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. + + 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 + 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 + 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. + + 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. + + 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. + + This section is intended to make thoroughly clear what is believed to + be a consequence of the rest 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 + 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. + + 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. + + NO WARRANTY + + 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. + + 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. + + END OF TERMS AND CONDITIONS Copied: isis-fish/branches/3.3.1/src/site/rst/listStats.rst (from rev 3147, isis-fish/trunk/src/site/rst/listStats.rst) =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/listStats.rst (rev 0) +++ isis-fish/branches/3.3.1/src/site/rst/listStats.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -0,0 +1,104 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - +Statistiques des listes de diffusion +==================================== + +Liste users nombre de mail +-------------------------- + + * 2003: 0 + * 2004: 0 + * 2005: 850 + * 2006: 755 + * 2007: 1185 + * 2008: 1035 + * 2009: 1183 + +Total pour la liste users: 5008 + +Liste devel nombre de mail +-------------------------- + + * 2003: 12 + * 2004: 92 + * 2005: 848 + * 2006: 524 + * 2007: 652 + * 2008: 344 + * 2009: 613 + +Total pour la liste devel: 3085 + +Liste bugreport nombre de mail +------------------------------ + + * 2003: 0 + * 2004: 0 + * 2005: 90 + * 2006: 54 + * 2007: 102 + * 2008: 52 + * 2009: 626 + +Total pour la liste bugreport: 924 + +Liste commits nombre de mail +---------------------------- + + * 2003: 0 + * 2004: 0 + * 2005: 0 + * 2006: 0 + * 2007: 2 + * 2008: 956 + * 2009: 1702 + +Total pour la liste commits: 2660 + +Liste data-commits nombre de mail +--------------------------------- + + * 2003: 0 + * 2004: 0 + * 2005: 0 + * 2006: 0 + * 2007: 16 + * 2008: 92 + * 2009: 224 + +Total pour la liste data-commits: 332 + +Total par année +--------------- + + * 2003: 12 + * 2004: 92 + * 2005: 1788 + * 2006: 1333 + * 2007: 1957 + * 2008: 2479 + * 2009: 4348 + +Total : 12009 \ No newline at end of file Copied: isis-fish/branches/3.3.1/src/site/rst/news.rst (from rev 3147, isis-fish/trunk/src/site/rst/news.rst) =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/news.rst (rev 0) +++ isis-fish/branches/3.3.1/src/site/rst/news.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -0,0 +1,66 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - +========================================= +Les évÚnements autour du projet Isis-FISH +========================================= + +2010 +---- + +- *20-24 septembre 2010* : `Conference annuelle du CIEM - Nantes`_ , FRANCE +- *7 juillet 2010* : Conférence ISIS-Fish aux RMLL_ - Bordeaux, FRANCE +- *7-11 juin 2010* : `Ecole chercheur`_ (Analyse de sensibilité) - Giens, FRANCE + +2009 +---- + +- *1-3 décembre 2009* : Atelier collaboration IFREMER-MPO dans le cadre de l’Approche Écosystémique - Rimouski, CANADA +- *21-26 septembre 2009* : `Conference annuelle du CIEM - Berlin`_ , ALLEMAGNE +- *14-18 septembre 2009* : Séminaire Utilisateurs ISIS-Fish - Nantes, FRANCE - Inscriptions_ +- *8-11 septembre 2009* : `Atelier franco-australien - modeles bio-economiques`_ +- *29 août - 4 septembre 2009* : `Groupe de travail CIEM`_ (WKSHORT) : comparaison de modÚles pour l'Anchois +- *11-14 mai 2009* : Ecole chercheur (Analyse de sensibilité) + +2008 +---- + +- *3-4 décembre 2008* : réunion Mexico_ à Montpellier, France +- *28 novembre 2008* : causerie au département EMH, le modÚle ISIS-Fish anchois dans le Golfe de Gascogne +- *22-26 septembre 2008* : `Conference annuelle du CIEM - Halifax`_ , CANADA +- *2 juillet 2008* : Présentation Isis-FISH aux RMLL_ +- *5 et 6 juin 2008* : réunion Mexico_ à Nantes, FRANCE + + +...................................Links........................................... + +.. _RMLL::http://rmll.info +.. _Conference annuelle du CIEM - Nantes::http://www.ices.dk/iceswork/asc/2010/index.asp +.. _Ecole chercheur:: http://www.reseau-mexico.fr/node/165 +.. _Conference annuelle du CIEM - Berlin::http://www.ices.dk/iceswork/asc/2009/index.asp +.. _Inscriptions::http://pollen.chorem.org/pollen/poll/VoteFor/3e830a78-a9a9-4043-9da6-6232d47... +.. _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 Copied: isis-fish/branches/3.3.1/src/site/rst/othertools.rst (from rev 3147, isis-fish/trunk/src/site/rst/othertools.rst) =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/othertools.rst (rev 0) +++ isis-fish/branches/3.3.1/src/site/rst/othertools.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -0,0 +1,38 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - +Autres utilitaires +================== + +* `Eclipse <http://www.eclipse.org>`_ (licence cpl) logiciel libre pour editer + les fichiers et plus particuliÚrement programmer en java + + `Utilisation-Installation de Eclipse <tools/eclipse.html>`_ +* `Notepad++ <http://notepad-plus.sourceforge.net/fr/site.htm>`_ (licence gpl) + logiciel libre pour editer les fichiers et plus particuliÚrement programmer en + java +* `Netbeans <http://www.netbeans.org/>`_ (licence gpl) logiciel libre pour + éditer les fichiers et plus particuliÚrement programmer en java + + + `Utilisation-Installation de Netbeans <tools/netbeans.html`_ + \ No newline at end of file Copied: isis-fish/branches/3.3.1/src/site/rst/presentation.rst (from rev 3147, isis-fish/trunk/src/site/rst/presentation.rst) =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/presentation.rst (rev 0) +++ isis-fish/branches/3.3.1/src/site/rst/presentation.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -0,0 +1,53 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - +ISIS-Fish +--------- + +ISIS-Fish est un simulateur de pêcherie complexe. Il est entiÚrement écrit en +Java. Dans sa version 2 Le langage de script utilisé était ECMAScript, depuis la +version 3 on utilise directement du Java, ce qui permet de faire des +vérification syntaxique et indiquer à l'utilisateur la ligne en erreur. + +Pour utiliser Isis-fish, il vous faut Java d'installé sur votre machine. + +Les caractéristiques sont : + + * Base de données embarquée + * Création d'autant de région de pêche, contenant autant de population que l'on souhaite + * Création de mesures de gestion en langage de script + * Possibilité de modifier la façon de simuler en langage de script + * Possibilité d'exécuter une suite de simulations en modifiant une ou des données de simulation + * Possibilité d'envoyer les simulations ce faire sur une autre machine + * Affichage des résultats spatialement (carte) ou temporellement (graph) + * Possibilité de publier les résultats d'une simulation sur un serveur + * Possibilité de publier une région sur un serveur + +Ce projet est un projet initié à la demande de l'Ifremer et financé par +celui-ci. L'analyse et la réalisation technique ont été confiées à différents +partenaires : + + * 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 Copied: isis-fish/branches/3.3.1/src/site/rst/publication.rst (from rev 3147, isis-fish/trunk/src/site/rst/publication.rst) =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/publication.rst (rev 0) +++ isis-fish/branches/3.3.1/src/site/rst/publication.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -0,0 +1,101 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - +Publications +============ + +Articles +-------- + +===== ======================================================================================================================================================================================================================================================================================================================================================================================================================================================== ============================================================================================== =========================================================== +Année Publication Téléchargement Publication originale +===== ======================================================================================================================================================================================================================================================================================================================================================================================================================================================== ============================================================================================== =========================================================== +2009 **Pelletier, D.** , Mahévas, S., Drouineau, H., Vermard, Y., Thebaud, O., Guyader,O. & Poussin, B., 2009. 'Evaluation of the bioeconomic sustainability of multi-species multi-fleet fisheries under a wide range of policy options using ISIS-Fish.' **Ecological Modelling** 220 (7): pp. 1013-1033. `Ici <http://www.ifremer.fr/isis-fish/publications/PelletierEtAlEcologicalModelling.pdf>`_ `sciencedirect <http://www.sciencedirect.com/>`_ +2008 **Kraus, G.** , Pelletier, D., Dubreuil, J., Moellmann, C., Hinrichsen, H., Bastardie, F., Vermard,Y. & Mahévas, S. , 2008. 'A model-based evaluation of Marine Protected Areas as fishery management tool for a stock facing strong environmental variability - the example of Eastern Baltic cod (Gadus morhua callarias L.).' **ICES Journal of Marine Science** 66: pp. 109-121. `Ici <http://www.ifremer.fr/isis-fish/publications/KrausEtAlEcologicalModelling.pdf>`_ `sciencedirect <http://www.sciencedirect.com/>`_ +2006 **Drouineau, H.** , S. Mahévas, D. Pelletier, B. Beliaeff. 'Assessing the impact of different management options using ISIS-Fish: the French Merluccius merluccius – Nephrops norvegicus mixed fishery of the Bay of Biscay.' **Aquat. Living Resour.** 19, 15–29 `Ici <http://www.ifremer.fr/isis-fish/publications/DrouineauEtAl2006.pdf>`_ `ALR <http://www.alr-journal.org/>`_ +2005 **Pelletier, D.** & S. Mahévas. 'Fisheries simulation models for evaluating the impact of management policies, with emphasis on marine protected areas.' **Fish and Fisheries** ; 6 (4) : 307-349. `Ici <http://www.ifremer.fr/isis-fish/publications/PelletierMahevas2005FishAndFisheries.pdf>`_ `Fish and Fisheries <http://www.blackwellpublishing.com/>`_ +2004 **Mahévas, S.** & D. Pelletier, 2004. 'ISIS-Fish, a generic and spatially-explicit simulation tool for evaluating the impact of management measures on fisheries dynamics.' **Ecological Modelling** 171, 65-84. `Ici <http://www.ifremer.fr/isis-fish/publications/MahevasEtAlEcologicalModelling.pdf>`_ `sciencedirect <http://www.sciencedirect.com/>`_ +2001 **Pelletier, D.** , S. Mahévas, B. Poussin, J. Bayon, P. André and J.C. Royer. 2001. 'A conceptual model for evaluating the impact of spatial management measures on the dynamics of a mixed fishery', pp. 53-66 In : G. H. Kruse, N. Bez, T. Booth, M. Dorn, S. Hills, R. Lipcius, D. Pelletier, C. Roy, S. Smith, & D. Witherell (eds), Spatial Processes and Management of Marine Populations. University of Alaska Sea Grant, AK-SG-00-04, Fairbanks `Ici <http://www.ifremer.fr/isis-fish/publications/PelletierEtAl2001.pdf>`_ +===== ======================================================================================================================================================================================================================================================================================================================================================================================================================================================== ============================================================================================== =========================================================== + +Posters +------- + +===== ========================================================================================================================================================================================================================================================================= ================================================================================= +Année Publication Téléchargement +===== ========================================================================================================================================================================================================================================================================= ================================================================================= +2009 Rocklin D., Pelletier D., Mouillot D., Tomasini JA., Culioli JM. Simulating management scenarios for the spiny lobster fishery in a Mediterranean MPA using ISIS-Fish. Oral communication - International Marine Conservation Congress, Washington DC, 19-24 May +2009 Rocklin D., Pelletier D., Mouillot D., Tomasini JA., Culioli JM. Des modÚles et des indicateurs pour optimiser la gestion des stocks de langoustes dans une aire marine protégée par simulation de scénarios avec ISIS-Fish. Poster - Forum AFH, Brest, 30 juin-2 juillet +2008 Vermard, Y., Lehuta, S., Mahevas, S., Thebaud, O., Marchal, P., Gascuel, D., Including dynamic fishermen behaviour in a fisheries simulation model to assess the impact of environmental changes. `Ici <http://www.ifremer.fr/isis-fish/publications/Poster_Vermard_et_al.pdf>`_ +2005 D. Pelletier, S. Mahévas, M. Jarraya, M. Capoulade, H. Drouineau, Y. Vermard, F. Bastardie, 2005, Investigating the consequences of Marine Protected Areas upon fish populations and fisheries through ISIS-Fish, a generic simulation tool. `Ici <http://www.ifremer.fr/isis-fish/publications/PelletierEtAl2005IMPAC1.pdf>`_ +2005 Stéphanie Mahévas, Dominique Pelletier, Hilaire Drouineau, Paul Marchal, Olivier Guyader, Olivier Thebaud, Raul Prellezo, Marina Santurtún , Ane Iriondo, Simulating with ISIS-Fish the dynamics of a North-East Atlantic mixed fishery subject to spatial closures. `Ici <http://www.ifremer.fr/isis-fish/publications/MahevasEtAl2005NAAFE.pdf>`_ +2004 Drouineau, H., S. Mahévas, D. Pelletier, & B. Beliaeff, 2004. Assessing the impact of marine protected areas on the hake-nephrops fishery of the Bay of Biscay using ISIS-Fish. ICES CM 2004/Y:09. `Ici <http://www.ifremer.fr/isis-fish/publications/CiemIcesCM-2004-Y09.pdf>`_ +2004 D. Pelletier & S. Mahévas, 2004. Evaluating the dynamics of mixed fisheries in response to policy options: Match and mismatch between data resolution, model requirements and model objectives. 4th World Fisheries Congress, May 2-6, Vancouver, Canada. +2002 D. Pelletier & S. Mahévas, 2002. Modélisation de la dynamique de pêcherie complexe Intégration des informations pour la pêcherie du Plateau Celtique. Colloque du Défi Golfe de Gascogne, Brest, 11-13 décembre. +2001 Mahévas S., D. Pelletier, 2001. Impact de zones marines protégées sur la dynamique d'une pêcherie complexe. Actes du CinquiÚme Forum Halieumétrique, Lorient, 26-28 juin 2001, p. 215. +2001 D. Pelletier & S. Mahévas, 2001. Comparing the impact of Total Allowable Catches and Marine Protected Areas upon the dynamics of a mixed fishery. Conférence Scientifique Annuelle du CIEM, Oslo, ICES CM 2001/N:13, 11 p. +2000 D. Pelletier, S. Mahévas et B. Poussin 2000. Un outil de simulation pour explorer l'impact de mesures de gestion sur la dynamique d'une pêcherie complexe. Réunion annuelle de l'ART4/PNEC, Paris, 14-15 décembre. +2000 B. Poussin, S. Mahévas, et D. Pelletier, 2000. Utilisation d'un générateur d'infrastructure EJB pour le développement d'un simulateur de pêcherie complexe et multi-spécifique. Colloque Objets, Composants et ModÚles 2000, 18 mai 2000, Nantes. +===== ========================================================================================================================================================================================================================================================================= ================================================================================= + +Rapports +-------- + +===== ============================================================================================================================================================================================================================================================================================================================================================================================================ ============== +Année Publication Téléchargement +===== ============================================================================================================================================================================================================================================================================================================================================================================================================ ============== +2003 Pelletier, D. 2003. Dynamique spatiale et saisonniÚre de pêcheries démersales et benthiques : Caractérisation, modélisation, et conséquences pour la gestion par Zones Marines Protégées. Mémoire d'Habilitation à diriger les recherches, Université de Montpellier II. 281 p. +2001 Mahévas, S., & D. Pelletier. 2001. Un outil de simulation pour explorer l'impact de mesures de gestion sur la dynamique d'une pêcherie complexe. Ecole de printemps COREV,HyÚres, mai 2001. +2000 Pelletier, D., S. Mahévas, 2000. Selecting appropriate mathematical and computer tools for developing integrated models : the example of the dynamics of a mixed fishery, Groupe de travail «Integrated modelling and assessment» et «Complex, adaptive, hierarchical systems», Ecosummit 2000, Integrating the Sciences (International Society for Ecological Modelling), 18-22 juin 2000, Halifax, Canada. +===== ============================================================================================================================================================================================================================================================================================================================================================================================================ ============== + +Rapports de stage +----------------- + +===== ======================================================================= ================================================================================= ============================================================================================================================================================================================== ============== +Année Etudiant DiplÃŽme Titre Téléchargement +===== ======================================================================= ================================================================================= ============================================================================================================================================================================================== ============== +2006 CAVE M. Master Sciences halieutiques et aquacoles - Agrocampus Rennes Validation d’un modÚle bioéconomique de la pêcherie de langoustine du Golfe de Gascogne +2006 FARGIER L. Master 2 Modélisation de la pêcherie de sar dans la réserve de Bonafacio +2006 LEHUTA S. Master 1 Simuler la dynamique de la pêcherie pélagique anchois du Golfe de Gascogne +2006 SAVE V. Master 2 Evaluation de scénarios de restauration de la langouste en mer d'Iroise +2005 CAPOULADE M. Master de l'Université de Perpignan Modélisation de la dynamique de la population de sar commun (Diplodus sargus) autour de la réserve de Banyuls +2005 PREUSS B. Master de l'Ecole Normale Supérieure de Paris Analyse de scénarios de gestion pour la pêcherie démerso-benthique du Plateau Celtique +2004 DROUINEAU H. DAA de l'Ecole Nationale Supérieure Agronomique de Rennes, spécialité halieutique Évaluation de l'impact de différentes réglementations sur la pêcherie mixte merlu-langoustine de la Grande VasiÚre, à l'aide du simulateur ISIS-Fish +2003 VOISIN P. DEA de Sciences de l'Environnement Marin, Université de Marseille Etude des conséquences de l'allocation spatiale de l'effort de pêche sur la qualité des indices d'abondance issus des captures commerciales - Le cas de la pêcherie chalutiÚre de mer Celtique +2000 BALABAN A., BOUWYN P., LACROIX L., MARCHAND R., MAURANGE L., VINCENT G. Projet de DESS de Génie Informatique de l'Univ. de Nantes Contribution à l'analyse informatique des rÚgles de gestion dans le simulateur de pêcherie complexe +2000 QUILLON M. Stage de DESS « Compétence complémentaire en Informatique » (Univ. Grenoble) Développement des interfaces et étude de l'ergonomie du logiciel de simulation de pêcherie complexe +1999 CERISIER F., LETETREL V., MEAT G., SAKHO M. Projet de DESS de Génie Informatique de l'Univ. de Nantes Contribution à l'analyse informatique des entités d'un modÚle de pêcherie complexe. +1999 MEAT G. Stage de DESS de Génie Informatique de l'Univ. de Nantes Contribution au développement des interfaces homme-machine d'un simulateur de pêcherie complexe +1999 POUSSIN B. Stage de DESS de Génie Informatique de l'Univ. de Nantes Développement d'un prototype de simulateur de pêcherie complexe. (Poussin et al. 2000; Pelletier et al. 2001) +===== ======================================================================= ================================================================================= ============================================================================================================================================================================================== ============== + +Autres +------ + +===== =============================================================================================================================================================================================================================================================================== ============== +Année Publication Téléchargement +===== =============================================================================================================================================================================================================================================================================== ============== +2003 Pelletier, D. 2003. Dynamique spatiale et saisonniÚre de pêcheries démersales et benthiques : Caractérisation, modélisation, et conséquences pour la gestion par Zones Marines Protégées. Mémoire d'Habilitation à diriger les recherches, Université de Montpellier II. 281 p. +===== =============================================================================================================================================================================================================================================================================== ============== Copied: isis-fish/branches/3.3.1/src/site/rst/research.rst (from rev 3147, isis-fish/trunk/src/site/rst/research.rst) =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/research.rst (rev 0) +++ isis-fish/branches/3.3.1/src/site/rst/research.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -0,0 +1,37 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - +Projets de recherche liés à ISIS-Fish +===================================== + +===================== ============================================================================================================================== ============================================ ====================================================================================== =========== ========= +Nom Projet RÃŽle dans le projet Financement Année début Année fin +===================== ============================================================================================================================== ============================================ ====================================================================================== =========== ========= +UNCOVER Evaluer l'impact de changements biologiques pour mettre en place des plans de restauration partenaire EU - VIth PCRD- FP6-2004-SSP-4 (Priority 8.1.B.1.3 Task 2) 2006 2008 +EFIMAS Operational evaluation tools for fisheries management options partenaire EU FP6 n° SSP8-CT-2003-502516 2004 2007 +PROTECT Potential of marine protected areas for marine environmental PROTECTion coordination d'une tâche sur la modélisation EU FP6 n° SSP8-CT-2004-513670 2004 2007 +Liteau-AMP Développement d'outils diagnostics et exploratoires d'aide à la décision pour évaluer la performance d'Aires Marines Protégées dirigeant Lit'eau 2 (MEDD) 2004 2006 +ISIS-Fish development Développement d'un outil de simulation de pêcherie complexe avec l'Université de Nantes, COGITEC et Code Lutin responsable de projet IFREMER n° 99/210448, 99/210500, 01/210676, 02/210898, 03/210136, 04/210316, PNEC/ART4 1998 2006 +TECTAC TEChnological developments and TACtical adaptations of important EU fleets partenaire European Union n°Q5RS-2002-01291 2002 2005 +===================== ============================================================================================================================== ============================================ ====================================================================================== =========== ========= Modified: isis-fish/branches/3.3.1/src/site/rst/v1/changelog.rst =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/v1/changelog.rst 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/rst/v1/changelog.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,40 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - +Version 1 +========= + +Cette version n'est plus maintenue depuis 2004 + +Téléchargement +-------------- + +Cette version n'est plus disponible en téléchargement. + +Information sur les changement de cette version +----------------------------------------------- + ver-1-5RC2 (20040202) * bouton radio (spacialise/non spacialise) a la place de la case a coche matrice simple. Modified: isis-fish/branches/3.3.1/src/site/rst/v2/changelog.rst =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/v2/changelog.rst 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/rst/v2/changelog.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - ver-2.3.2 (20060727) * correction de grossValueOfLandingsPerSpeciesPerStrategyMet qui ne tenait pas compte du prix Modified: isis-fish/branches/3.3.1/src/site/rst/v2/devel/index.rst =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/v2/devel/index.rst 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/rst/v2/devel/index.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - Documentation développeur ========================= Copied: isis-fish/branches/3.3.1/src/site/rst/v2/index.rst (from rev 3147, isis-fish/trunk/src/site/rst/v2/index.rst) =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/v2/index.rst (rev 0) +++ isis-fish/branches/3.3.1/src/site/rst/v2/index.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -0,0 +1,242 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - +Version 2 +========= + +Cette version n'est plus maintenue depuis 2006 + +Documentation +------------- + +`FAQ <users/FAQ.html>`_ + Foire aux questions + +`Langage ECMAScript <users/ECMAScript.html>`_ + Tutorial sur le langage ECMAScript + +`Editeur ECMAScript <users/ECMAScriptEditor.html>`_ + Documentation sur l'utilisateur de l'éditeur de ISIS-Fish + +`RÚgles de gestion <users/Rules.html>`_ + Documentation sur les rÚgles de gestion et leur interface + +`Lanceur de simulations <users/SimulationLauncher.html>`_ + Documentation sur l'interface de lancement de simulation + +`Documentation d'Hilaire <users/ScriptHilaire.html>`_ + Document écrit et maintenu par Hilaire qui aide à la prise en main de tous les + aspects avancés d'ISIS-Fish + +Téléchargement +-------------- + +Cette version n'est plus disponible en téléchargement. + +Information sur les changement de cette version +----------------------------------------------- + +ver-2.3.2 (20060727) + * correction de grossValueOfLandingsPerSpeciesPerStrategyMet qui ne tenait pas compte du prix + +ver-2.3.1 (20060727) + * modification des equations economique qui contenait des erreurs + +ver-2.3.0 (20060623) + * passage en equation de `EspecesCapturables` + +ver-2.2.6 (20060605) + * sauvegarde des simulations directement dans un fichier compressé sans passé par une représentation DOM pour une utilisation moindre de la mémoire + * getMailleSecteur retourne une liste vide si la zone pour lequelle on souhaite les mailles est null. Ca evite une Exception. + * ajout d'un log warning si un metier n'a pas de zone pour un mois donné + +ver-2.2.5 (20060601) + * sauvegarde des simulations avant la sauvegarde des resultats (si la sauvegarde des resultats echoue on conserve les parametres de lancement) + * matrix ajout d'un ascenseur horizontal, ajout d'un menu contextuel (copier/coller, export/import cvs) + * correction bug introduit par l'optimisation (fishingMortality trop souvent recupérée dans le cache, car par de discremination sur le metier) + +ver-2.2.4 (20060523) + * optimization de `HashMapMultiKey`, Matrix (checkPos, checkDim), `SiMatrice2` + * utilisation de LRUMapMultiKey a la place de `HashMapMultiKey` + * suppression de tous les caches autres que LRU + * correction memory leak dans les Optimisations (il provenait de la modification du hashCode des `MultiKey` au cours du temps, les maps ne trouvaient plus les objet a supprimer) + * ajout du support de la base de données h2 + +ver-2.2.3 (20060512) + * correction mauvaise selection de mail pour les zones et les ports + +ver-2.2.2 (20060327) + * correction calcul de migration (N en 2D ou lieu de 1D passe en arg) + +ver-2.2.1 (20060320) + * ajout du parametre zone dans l'equation de mortalité + +ver-2.2.0 (20060315) + * mapping reproduction/recrutement avec un coefficient + * modif traduction de 'er mois' en '{0}er mois' idem pour 'Úme mois' + +ver-2.1.1 (20060306) + * On force l'encoding des fichiers en ISO-8859-1 partout + * ajout de try{}catch lors du chargement des combo de formules, utile lorsque la formule n'est pas correct (mauvais encodage) + * ajout de I18n pour le wizard + +ver-2.1.0 (20060303) + * Passage de la mortalite naturelle en equation + * Possibilite de definir les migrations en equation + * modification du modele pour supporter ces fonctionnalités + +ver-2.0.27 (20060302) + * correction d'optimisation pour `EffortPerStrMet` (bis) (suppression des methodes non optimisees) (autres petites corrections pour des manques de parametres d'opti) + +ver-2.0.26 (20060223) + * correction d'optimisation pour `EffortPerStrMet` + * support des \n pour les traductions + +ver-2.0.25 (20060124) + * ajout de chaine a traduire + * ajout du jar client R dans le all + +ver-2.0.24 (20051125) + * correction bug dans lancement simulation pour plusieurs fois la meme regle avec param different + +ver-2.0.23 (20051123) + * ajout de mot a traduire (arbre de saisie) + * modification de la boucle matriceCatchRatePerStrategyMet pour ne faire que les metiers de la strategie + +ver-2.0.22 (20051117) + * ajout pour chaque annee de simulation la memoire restant, les stats du cache et les stats d'appels de methodes + * correction cache, il libere les references + * ajout d'un yield en fin de chaque methode d'optimisation pour permettre au autre thread de travailler + * config de ShiftOne a 20000 objet par defaut + +ver-2.0.21 (20051115) + * suppression de l'optimisation pour certain calcul, il ne faisait pas gagner de temps et il consommait de la mémoire pour rien. + * La fenêtre de log n'affiche plus que les 100 premiÚres lignes de log et les 200 derniÚres, cela évite de manger beaucoup de mémoire pour les logs (la consomation semble etre stable dans les 200Mo) + +ver-2.0.20 (20051114) + * Inversion de la demande d'optimisation si false alors on la fait pas plus sur que de detecter true + * ajout lors du demarrage de l'affichage des variables d'environnement et des options de lancement. + +ver-2.0.19 (20051111) + * correction des optimisations, ajout de dependance sur date.getMois() pour toutes les methodes qui utilisent un argument date + * amelioration de le liberation du cache + +ver-2.0.18 (20051107) + * correction des resultats pour que les captures en poids et nombre se fasse avec les effectifs de au meme moment + +ver-2.0.17 (20051102) + * correction: La matrice créer pour le stockage des resultats n'etait pas utilisée + +ver-2.0.16 (20051025) + * Ajout de l'option -DOptimization=[true|false] qui permet de desactiver les optimisations totalement. (Permet de verifier que les optimisations ne modifient pas les resultats) + +ver-2.0.15 (20051025) + * Toutes les matrices misent en résultat sont copiées. + +ver-2.0.14 (20051021) + * Correction probleme passage de matrice de changement d'age de non spacialise a spacialise + +ver-2.0.13 (20051020) + * Correction probleme de dimension pour les pop en longueur dans la matrice de changement d'age + +ver-2.0.12 (20051013) + * utilisation de la nouvelle implantation de matrice (val par defaut) Si seulement 1/4 des elements de la matrice differe de la valeur par defaut alors les performances sont meilleurs + +ver-2.0.11 (20051005) + * passage de toutes les matrices en float pour prendre 2 fois moins de place + * amelioration de la liberation du cache de calcul + * ajout d'une condition pour les logs de `SiMatrice2` + * ajout de l'exception lors de log de probleme grave dans ifremerdb.xml + +ver-2.0.10 (20050923) + * ajout du cache Hard qui est le meme qu'avant + * suppression des l'anciennes stat des optimisations + * ajout du support de l'option -DCallAnalyze=[true|false] + * essai de non recalcule de Population.getMatriceZone + * tous les logs de `SiMatrice` & co en /*#...#*/ + * modification du calcul de loopOver, on calcule sur les metiers des `SetOfVessels` des Strategies + +ver-2.0.9 (20050915) + * ajout de 3 caches different pour l'optimisation des caculs les caches sont selectionnable au lancement d'isis + * ajout de la possibilité de faire les boucles Str/Met que sur les metiers de la strategie dans `SiMatrice`. Cette fontion est selectionnable au lancement d'isis + +ver-2.0.8 (20050???) + * selection plus fine des elements selectionnable dans une combobox + +ver-2.0.7 (20050613) + * ajout dans le `LogMonitor` des `StackTraces` + * ajout d'une rÚgle pour avoir les résultats économiques + * Amélioration des matrices Eco (ajout d'un nom à la matrice et au dimension, traitement special si pas d'effort) + * Lors de la sauvegarde des resultats l'export n'est vraiment fait que lorsqu'il y a au moins une méthode d'export selectionnée + * Ajout d'un cache pour le XMLEncoderDecoder + * On ne fait plus le Changement de classe si la `MetaPop` est en longueur + +ver-2.0.6 (20050603) + * correction bug#459, bug#460, mauvaise sauvegarde des correspondances s'il n'y avait qu'une zone repro et une zone recru (mapping toujours vide) + * ajout dans lutinutil de la method utilisé par le serveur de simulation pour supprimer recursivement un repertoire + * ajout du numero de version de isis dans les logs au lancement + +ver-2.0.5 (20050525) + * correction du l'email d'envoi du bugreport pour le `LogMonitor` + * ajout dans la status bar de la fenetre de log, l'utilisation memoire et une horloge + * correction pour les collections dans l'equation de reproduction + * correction du modele de données pour mettre des cardinalitées 0-1, la on il faut (corrige le probleme de creation d'objet) + * correction de la boite de dialog a propos + +ver-2.0.4 (20050518) + * Utilisation de `SecteurSimpleFactory` pour l'affichage des Secteurs dans l'arbre + * Modification de l'évaluation de la reproduction, utilisation de la méthode demandée par Stéphanie et Hilaire (comme la version qui avait été intégrée dans l'ancienne version du simulateur) + * ajout d'une fenêtre montrant les logs directements dans l'application + * ajout de l'attribut mapfiles dans Region + * ajout support de l'utilisation de carte utilisateur (sur filesystem) + * si le script de pre-simulation n'est pas selectionné il n'est pas pris en compte + * Message pour avertir que les données vont etre upgrade + * Arret du logiciel si les données sont trop recente pour la version d'isis utilisé + * dans les equations de croissance ajout de la variable classe de type `ClassePopulation` + * fermeture bug #444 + +ver-2.0.3 (20050429) + * Remplacement pour `Strategie->StrategyMonthInfo->numberOfTrips` du spinner par un JLabel car il n'est pas modifiable (calculé) + * Amélioration table de saisie du mapping repro->recru + * Amélioration de la recherche des dépendances entre objets lors d'une suppression. + * fermeture bug #425, #434, #437, #438 + +ver-2.0.2 (20050414) + * correction du bug de selection de maille sur la carte (fonctionne mais pas pour les mailles tres petites) + +ver-2.0.1 (20050408) + * correction erreurs de simulation + * correction erreurs de representation des matrices dans le rendu des résultats + * permet de supprimer des métiers de `MetierEffortDescription` dans `SetOfVessels` + +ver-2-RC1 (20040326) + * Secteur pour le nombre total de secteur retourne 1 et non 0, pour etre coherent avec le getAllSecteur dans lequel il s'ajoute lui meme. + * ajout sur Metier des methodes getValeurParamControlableAsString et getValeurParamControlableAsNumber + * modification de l'interface de Selectivite dans Engin, pour mettre une modification plus simple des equations + * modification de toutes l'interface de lancement des simulations + * amelioration de l'interface de creation de script d'enchainement de simulation. Si aucun editeur n'existe alors ne propose que les scripts + * 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 Modified: isis-fish/branches/3.3.1/src/site/rst/v2/user/ECMAScript.rst =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/v2/user/ECMAScript.rst 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/rst/v2/user/ECMAScript.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - ========== ECMAScript ========== Modified: isis-fish/branches/3.3.1/src/site/rst/v2/user/ECMAScriptEdit.rst =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/v2/user/ECMAScriptEdit.rst 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/rst/v2/user/ECMAScriptEdit.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - ============== ECMAScriptEdit ============== Modified: isis-fish/branches/3.3.1/src/site/rst/v2/user/FAQ.rst =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/v2/user/FAQ.rst 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/rst/v2/user/FAQ.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - =================== Foire Aux Questions =================== Modified: isis-fish/branches/3.3.1/src/site/rst/v2/user/Rules.rst =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/v2/user/Rules.rst 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/rst/v2/user/Rules.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - ===================== Les rÚgles de gestion ===================== Modified: isis-fish/branches/3.3.1/src/site/rst/v2/user/ScriptHilaire.rst =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/v2/user/ScriptHilaire.rst 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/rst/v2/user/ScriptHilaire.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - ======================= EcmaScript et ISIS-Fish ======================= Modified: isis-fish/branches/3.3.1/src/site/rst/v2/user/SimulationLauncher.rst =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/v2/user/SimulationLauncher.rst 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/rst/v2/user/SimulationLauncher.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - ================== SimulationLauncher ================== Modified: isis-fish/branches/3.3.1/src/site/rst/v2/user/index.rst =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/v2/user/index.rst 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/rst/v2/user/index.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - Documentation utilisateur ========================= Modified: isis-fish/branches/3.3.1/src/site/rst/v3/changelog.rst =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/v3/changelog.rst 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/rst/v3/changelog.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - ver-3.0.22 poussin 200711?? * bug correction when launch many simulation with AnalysePlan (OutOfMemory) now we don't use cglib but javassist Modified: isis-fish/branches/3.3.1/src/site/rst/v3/devel/SyntaxeOption.rst =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/v3/devel/SyntaxeOption.rst 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/rst/v3/devel/SyntaxeOption.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - Syntaxe des arguments d'une option ================================== Modified: isis-fish/branches/3.3.1/src/site/rst/v3/devel/index.rst =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/v3/devel/index.rst 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/rst/v3/devel/index.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - Documentation développeur ========================= Modified: isis-fish/branches/3.3.1/src/site/rst/v3/devel/isis-architecture.rst =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/v3/devel/isis-architecture.rst 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/rst/v3/devel/isis-architecture.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - ==================== Architecture globale ==================== Copied: isis-fish/branches/3.3.1/src/site/rst/v3/devel/usbkey.rst (from rev 3147, isis-fish/trunk/src/site/rst/v3/devel/usbkey.rst) =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/v3/devel/usbkey.rst (rev 0) +++ isis-fish/branches/3.3.1/src/site/rst/v3/devel/usbkey.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -0,0 +1,56 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - +Installation d'Isis sur clé USB +=============================== + +Procedure +--------- + +* Dézipper isis-fish-w.x.y.z-bin.zip +* Faire un checkout anonyme du tag correspondant dans le dosssier dezippé +* Ajouter les base de données +* Ajouter les simulations de référence +* Ajouter les regles specifiques +* Ajouter les export spécifiques +* Ajouter les fichiers de paramêtres des rÚgles + +Configuration +------------- + +Le fichier de configuration doit être placé dans le répertoire de lancemenent +et avoir son nom par défaut pour que ApplicationConfig le charge dans +le dossier courant. + +Cela fonctionne également pour les simulations en sous processus car elle +trouve également ce fichier. + +Il doit contenir (3.3.y.z) :: + + database.directory=isis-database-3 + user.name=mexicouser + vcs.protocol=svn + vcs.username=anonymous + compilation.directory=isis-build + monitoring.directory=isis-monitoring \ No newline at end of file Modified: isis-fish/branches/3.3.1/src/site/rst/v3/user/AnalysePlan.rst =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/v3/user/AnalysePlan.rst 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/rst/v3/user/AnalysePlan.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - ============== Plan d'analyse ============== Modified: isis-fish/branches/3.3.1/src/site/rst/v3/user/ExternalScriptEditor.rst =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/v3/user/ExternalScriptEditor.rst 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/rst/v3/user/ExternalScriptEditor.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - ==================================================== Utilisation d'un outil externe d'édition des scripts ==================================================== Modified: isis-fish/branches/3.3.1/src/site/rst/v3/user/FAQ.rst =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/v3/user/FAQ.rst 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/rst/v3/user/FAQ.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - =================== Foire Aux Questions =================== Modified: isis-fish/branches/3.3.1/src/site/rst/v3/user/Historique.rst =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/v3/user/Historique.rst 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/rst/v3/user/Historique.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - Historique du projet ISIS-Fish ============================== Modified: isis-fish/branches/3.3.1/src/site/rst/v3/user/Installation.rst =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/v3/user/Installation.rst 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/rst/v3/user/Installation.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - Installion et lancementd'ISIS-Fish ================================== Modified: isis-fish/branches/3.3.1/src/site/rst/v3/user/Introduction.rst =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/v3/user/Introduction.rst 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/rst/v3/user/Introduction.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - Introduction ============ Modified: isis-fish/branches/3.3.1/src/site/rst/v3/user/LaunchOption.rst =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/v3/user/LaunchOption.rst 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/rst/v3/user/LaunchOption.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - Option de lancement =================== Modified: isis-fish/branches/3.3.1/src/site/rst/v3/user/UserInterface.rst =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/v3/user/UserInterface.rst 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/rst/v3/user/UserInterface.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - ======================= L'interface utilisateur ======================= Modified: isis-fish/branches/3.3.1/src/site/rst/v3/user/addSshKey.rst =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/v3/user/addSshKey.rst 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/rst/v3/user/addSshKey.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - =============================== Ajouter la clef ssh sur le labs =============================== Modified: isis-fish/branches/3.3.1/src/site/rst/v3/user/index.rst =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/v3/user/index.rst 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/rst/v3/user/index.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - Documentation utilisateur ========================= Modified: isis-fish/branches/3.3.1/src/site/rst/v3/user/inputs.rst =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/v3/user/inputs.rst 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/rst/v3/user/inputs.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - ==================== Saisie d'un pêcherie ==================== Modified: isis-fish/branches/3.3.1/src/site/rst/v3/user/isisFishData.rst =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/v3/user/isisFishData.rst 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/rst/v3/user/isisFishData.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - ============================== Connexion à **isis-fish-data** ============================== Modified: isis-fish/branches/3.3.1/src/site/rst/v3/user/result.rst =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/v3/user/result.rst 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/rst/v3/user/result.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - =================== Rendu des résultats =================== Modified: isis-fish/branches/3.3.1/src/site/rst/v3/user/scripts.rst =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/v3/user/scripts.rst 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/rst/v3/user/scripts.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - ======================= Gestionnaire de scripts ======================= Modified: isis-fish/branches/3.3.1/src/site/rst/v3/user/simulations.rst =================================================================== --- isis-fish/branches/3.3.1/src/site/rst/v3/user/simulations.rst 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/rst/v3/user/simulations.rst 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 1999 - 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 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% +.. - ====================== Lanceur de simulations ====================== Modified: isis-fish/branches/3.3.1/src/site/site_en.xml =================================================================== --- isis-fish/branches/3.3.1/src/site/site_en.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/site_en.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 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 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% + --> + <project name="Isis-fish"> <bannerLeft> Modified: isis-fish/branches/3.3.1/src/site/site_fr.xml =================================================================== --- isis-fish/branches/3.3.1/src/site/site_fr.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/site/site_fr.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,10 +1,35 @@ <?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + #%L + IsisFish + + $Id$ + $HeadURL$ + %% + Copyright (C) 1999 - 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 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% + --> + <project name="Isis-fish"> <publishDate format="dd/MM/yyyy"/> <bannerLeft> - <name>Isis-fish Simulateur de pêcherie complexe</name> + <name>Isis-fish Simulateur de pï¿œcherie complexe</name> </bannerLeft> <bannerRight> @@ -21,37 +46,62 @@ <body> <links> <item name="Ifremer" href="http://www.ifremer.fr/"/> - <item name="Code Lutin" href="http://www.codelutin.com/"/> <item name="Site scientifique" href="http://www.ifremer.fr/isis-fish/index.html"/> - <item name="Labs" href="http://labs.libre-entreprise.org/projects/isis-fish"/> <item name="[fr" href="http://isis-fish.labs.libre-entreprise.org/index.html"/> <item name="en]" href="http://isis-fish.labs.libre-entreprise.org/en/index.html"/> </links> - <menu name="Survol"> - <item href="/index.html" name="Présentation"></item> + <menu name="ISIS-Fish"> + <item name="Presentation" href="index.html"/> + <item name="Nouvelles" href="news.html"/> + <item name="Tï¿œlï¿œchargement" href="download.html"/> + <item name="Documentation" href="documentation.html"> + <item name="Installation" href="documentation/installation.html"/> + <item name="Manuel utilisateur" href="documentation/userManual.html"/> + <item name="Tutoriaux" href="documentation/tutorials.html"/> + <item name="FAQ" href="documentation/FAQ.html"/> + <item name="Manuel dï¿œveloppeur" href="documentation/devel.html"/> + <item name="Documentation des APIs" href="documentation/API.html"/> + <item name="Exemples de scripts ISIS" href="documentation/scripts.html"/> + <item name="Exemples de scripts R" href="documentation/scriptsR.html"/> + </item> + <item name="Publications" href="publications.html"/> + <item name="Projets de recherche" href="research.html"/> + <item name="Historique" href="history.html"> + <item name="Le projet" href="history/history.html"/> + <item name="Journal des modifications" href="history/changelog.html"/> + <item name="Version 1" href="v1/changelog.html"/> + <item name="Version 2" href="v2/index.html"/> + </item> + <item name="Autres utilitaires" href="othertools.html"/> + <item name="License" href="license.html"/> + <item name="Contact/Assistance" href="contact.html"/> + </menu> + + <!--menu name="Survol"> + <item href="/index.html" name="Prï¿œsentation"></item> <item href="http://isis-fish.labs.libre-entreprise.org/wiki/fr:start" name="Wiki"></item> <item href="/jnlp/isis-fish-v3.jnlp" name="Lancer Isis-fish v3"></item> </menu> <menu name="Version 3"> <item href="/v3/changelog.html" name="News"></item> - <item href="/download/version3" name="Téléchargement"></item> + <item href="/download/version3" name="Tï¿œlï¿œchargement"></item> <item name="Documentation utilisateur" href="/v3/user/index.html" collapse="true"> <item href="/v3/user/Introduction.html" name="Introduction"></item> <item href="/v3/user/Historique.html" name="Historique"></item> <item href="/v3/user/Installation.html" name="Installation"></item> <item href="/v3/user/UserInterface.html" name="Interface Utilisateur" collapse="false"> <item href="/v3/user/simulations.html" name="Lanceur de simulations"></item> - <item href="/v3/user/result.html" name="Rendu des résultats"></item> - <item href="/v3/user/inputs.html" name="Saisie de pêcheries"></item> + <item href="/v3/user/result.html" name="Rendu des rï¿œsultats"></item> + <item href="/v3/user/inputs.html" name="Saisie de pï¿œcheries"></item> <item href="/v3/user/scripts.html" name="Editeur de scripts"></item> </item> - <item href="/v3/user/AnalysePlan.html" name="Plan d'expérience"></item> + <item href="/v3/user/AnalysePlan.html" name="Plan d'expï¿œrience"></item> <item href="/v3/user/ExternalScriptEditor.html" name="Editor Java externe"></item> <item href="/v3/user/FAQ.html" name="FAQ"></item> </item> - <item name="Documentation développeur" href="/v3/devel/index.html" collapse="true"> + <item name="Documentation dï¿œveloppeur" href="/v3/devel/index.html" collapse="true"> <item href="/v3/devel/isis-architecture.html" name="Architecture Isis-FISH"></item> <item href="/v3/devel/images/IsisFishModel.png" name="Model UML"></item> <item href="/apidocs/index.html" name="API ISIS-Fish"></item> @@ -76,13 +126,13 @@ <item href="/v2/user/FAQ.html" name="FAQ"></item> <item href="/v2/user/ECMAScript.html" name="Langage ECMAScript"></item> <item href="/v2/user/ECMAScriptEdit.html" name="Editeur ECMAScript"></item> - <item href="/v2/user/Rules.html" name="Règles de gestions"></item> + <item href="/v2/user/Rules.html" name="Rï¿œgles de gestions"></item> <item href="/v2/user/SimulationLauncher.html" name="Lanceur de simulations"></item> <item href="/v2/user/ScriptHilaire.html" name="Documentation d'Hilaire"></item> </item> - <item name="Documentation développeur" href="/v2/devel/index.html" collapse="false"> + <item name="Documentation dï¿œveloppeur" href="/v2/devel/index.html" collapse="false"> <item href="/api/isis-fish/version2/index.html" name="API Isis-fish"></item> - <item href="/api/codelutin/index.html" name="API bibliothèques annexe"></item> + <item href="/api/codelutin/index.html" name="API bibliothï¿œques annexe"></item> <item href="/api/isis-fish/version2/xref/index.html" name="Source XRef Isis-fish"></item> </item> </item> @@ -90,14 +140,14 @@ <menu name="Trackers"> <item href="http://labs.libre-entreprise.org/tracker/?atid=113&group_id=8&func=b..." name="Report de Bug"></item> - <item href="http://labs.libre-entreprise.org/tracker/?atid=116&group_id=8&func=b..." name="Demande d'amélioration"></item> + <item href="http://labs.libre-entreprise.org/tracker/?atid=116&group_id=8&func=b..." name="Demande d'amï¿œlioration"></item> <item href="http://labs.libre-entreprise.org/tracker/?atid=114&group_id=8&func=b..." name="Demande d'aide"></item> <item href="http://labs.libre-entreprise.org/tracker/?atid=115&group_id=8&func=b..." name="En de patch"></item> </menu> <menu name="Liens"> <item href="http://java.sun.com/javase" name="Le site Java de Sun"></item> - </menu> + </menu--> ${reports} Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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; Copied: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/IsisConfigTest.java (from rev 3147, isis-fish/trunk/src/test/java/fr/ifremer/isisfish/IsisConfigTest.java) =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/IsisConfigTest.java (rev 0) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/IsisConfigTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -0,0 +1,52 @@ +/* + * #%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 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; + +import org.junit.Test; +import org.nuiton.util.ApplicationConfig; + +/** + * Test for IsisConfig. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class IsisConfigTest { + + /** + * Test presence of some setXXX option called only + * in instrospection by {@link ApplicationConfig}. + */ + @Test + public void testSetterExistence() { + IsisConfig config = new IsisConfig(); + // --locale fr_FR + config.setLocale("fr_GB"); + } +} Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,29 +1,36 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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; import java.io.File; import java.io.IOException; -import junit.framework.Assert; - import org.apache.commons.io.FileUtils; +import org.h2.engine.Constants; +import org.junit.Assert; import org.junit.Test; /** @@ -46,7 +53,7 @@ */ @Test public void testCRLFOnBat() throws IOException { - File batFile = new File("src" + File.separator + "main" + File.separator + "assembly" + File.separator + "go.bat"); + File batFile = new File("src" + File.separator + "main" + File.separator + "assembly" + File.separator + "isisfish.bat"); String content = FileUtils.readFileToString(batFile); System.out.println(content); @@ -57,4 +64,17 @@ Assert.assertTrue("File is not valide for Windows on line " + index, lines[index].endsWith("\r")); } } + + /** + * Test that h2 version is < 1.2.129. + * + * Upgrading from < 1.1.x to 1.2.129 doesn't work + * Since page store has been changed in 1.2.x release, and removed since 1.2.129. + */ + @Test + public void testH2Version() { + Assert.assertEquals(1, Constants.VERSION_MAJOR); + Assert.assertEquals(2, Constants.VERSION_MINOR); + Assert.assertTrue("Using H2 >= 1.2.129 will not work", Constants.BUILD_ID < 129); + } } Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/actions/VCSActionTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/actions/VCSActionTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/actions/VCSActionTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Ifremer - Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.actions; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/AnalysePlanStorageTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/AnalysePlanStorageTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/AnalysePlanStorageTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.datastore; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/DataStorageTestHelper.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/DataStorageTestHelper.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/DataStorageTestHelper.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.datastore; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/ExportStorageTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/ExportStorageTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/ExportStorageTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.datastore; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/FormuleStorageTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/FormuleStorageTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/FormuleStorageTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.datastore; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/RuleStorageTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/RuleStorageTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/RuleStorageTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.datastore; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/ScriptStorageTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/ScriptStorageTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/ScriptStorageTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.datastore; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/SensitivityExportStorageTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/SensitivityExportStorageTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/SensitivityExportStorageTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.datastore; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/SensitivityStorageTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/SensitivityStorageTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/SensitivityStorageTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.datastore; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/SimulationInformationTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/SimulationInformationTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/SimulationInformationTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.datastore; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/SimulatorStorageTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/SimulatorStorageTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/SimulatorStorageTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.datastore; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/TestIsisH2Config.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/TestIsisH2Config.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/TestIsisH2Config.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.datastore; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/migration/TestMigrationCallbackHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/migration/TestMigrationCallbackHandler.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/datastore/migration/TestMigrationCallbackHandler.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2007 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.datastore.migration; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/PersistenceConventionTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/PersistenceConventionTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/PersistenceConventionTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2010 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 License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.entity; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/PersistenceTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/PersistenceTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/PersistenceTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% -* Copyright (C) 2002, 2009 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, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*##%*/ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2010 Ifremer, CodeLutin, 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.entity; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.entity; Copied: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java (from rev 3147, isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java) =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java (rev 0) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -0,0 +1,101 @@ +/* + * #%L + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 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 + * 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.entity; + +import java.io.IOException; +import java.util.List; + +import org.junit.Assert; +import org.junit.Test; +import org.junit.matchers.JUnitMatchers; +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.datastore.StorageException; +import fr.ifremer.isisfish.entities.Population; +import fr.ifremer.isisfish.entities.PopulationDAO; +import fr.ifremer.isisfish.simulator.SimulationParameter; +import fr.ifremer.isisfish.simulator.SimulationParameterImpl; + +/** + * Copie d'un test important de topia concernant le flush mode. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class TopiaDAOTest extends AbstractIsisFishTest { + + /** + * Test de creer une entité et de verifier qu'elle est + * présente dans la persistence au sein de la transaction. + * + * @throws TopiaException + * @throws IOException + * @throws StorageException + */ + @Test + public void testCreateAndFindInTransaction() throws TopiaException, IOException, StorageException { + + SimulationParameter parameters = new SimulationParameterImpl(); + SimulationStorage simulation = SimulationStorage.create("testdao", parameters); + TopiaContext rootContext = simulation.getStorage(); + + TopiaContext context = rootContext.beginTransaction(); + context.createSchema(); + + PopulationDAO populationDAO = IsisFishDAOHelper.getPopulationDAO(context); + + // appel 1 find all + Population population = populationDAO.create(); + population.setName("langoustine"); + List<Population> allPopulation = populationDAO.findAll(); + Assert.assertEquals(1, allPopulation.size()); + context.commitTransaction(); + + // recherce la personne créée dans la même transaction + Population population2 = populationDAO.create(); + population2.setName("thon"); + allPopulation = populationDAO.findAll(); + Assert.assertEquals(2, allPopulation.size()); + Assert.assertThat(allPopulation, JUnitMatchers.hasItem(population2)); + + context.rollbackTransaction(); + + // meme test apres roolback + Population population3 = populationDAO.create(); + population3.setName("requin"); + allPopulation = populationDAO.findAll(); + Assert.assertEquals(2, allPopulation.size()); + Assert.assertThat(allPopulation, JUnitMatchers.hasItem(population3)); + + context.commitTransaction(); + simulation.closeStorage(); + } +} Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/logging/LoggerHelper.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/logging/LoggerHelper.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/logging/LoggerHelper.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Ifremer - Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.logging; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Ifremer - Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.logging; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/logging/io/LineReaderTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/logging/io/LineReaderTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/logging/io/LineReaderTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.logging.io; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/logging/io/LineReaderUtilTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/logging/io/LineReaderUtilTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/logging/io/LineReaderUtilTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.logging.io; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 - 2010 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 License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.mexico; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/export/RegionExplorerTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/export/RegionExplorerTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/export/RegionExplorerTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 - 2010 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 License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 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 + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.mexico.export; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.simulator; @@ -51,7 +58,7 @@ */ @Test public void testDefaultProperties() { - SimulationParameter params = new SimulationParameter(); + SimulationParameter params = new SimulationParameterImpl(); Assert.assertEquals(IsisConfig.getVersion(), params.getIsisFishVersion()); Assert.assertEquals("", params.getDescription()); @@ -91,14 +98,14 @@ @Test public void testToPropertiesFromProperties() { - SimulationParameter params = new SimulationParameter(); + SimulationParameter params = new SimulationParameterImpl(); params.setIsisFishVersion("3.2.0.4"); params.setDescription("desc"); params.setResultEnabled(Collections.singleton("bakh")); // make transform Properties props = params.toProperties(); - SimulationParameter params2 = new SimulationParameter(); + SimulationParameter params2 = new SimulationParameterImpl(); params2.fromProperties(props); Assert.assertEquals("3.2.0.4", params2.getIsisFishVersion()); @@ -122,7 +129,7 @@ Properties props = new SortedProperties(); props.load(basicFileStream); - SimulationParameter param = new SimulationParameter(); + SimulationParameterImpl param = new SimulationParameterImpl(); param.fromProperties(props); Assert.assertEquals("3.2.0.6", param.getIsisFishVersion()); @@ -154,11 +161,11 @@ Properties props = new SortedProperties(); props.load(basicFileStream); - SimulationParameter param = new SimulationParameter(); + SimulationParameterImpl param = new SimulationParameterImpl(); param.fromProperties(props); Properties props2 = param.toProperties(); - SimulationParameter param2 = new SimulationParameter(); + SimulationParameter param2 = new SimulationParameterImpl(); param2.fromProperties(props2); // test rules @@ -187,11 +194,11 @@ Properties props = new SortedProperties(); props.load(basicFileStream); - SimulationParameter param = new SimulationParameter(); + SimulationParameterImpl param = new SimulationParameterImpl(); param.fromProperties(props); Properties props2 = param.toProperties(); - SimulationParameter param2 = new SimulationParameter(); + SimulationParameterImpl param2 = new SimulationParameterImpl(); param2.fromProperties(props2); // test analyse plans @@ -212,7 +219,7 @@ Properties props = new SortedProperties(); props.load(basicFileStream); - SimulationParameter param = new SimulationParameter(); + SimulationParameter param = new SimulationParameterImpl(); param.fromProperties(props); // force some properties instantiation @@ -242,7 +249,7 @@ Properties props = new SortedProperties(); props.load(basicFileStream); - SimulationParameter param = new SimulationParameter(); + SimulationParameter param = new SimulationParameterImpl(); param.fromProperties(props); String toString = param.toString(); @@ -256,7 +263,7 @@ */ @Test public void testCopyWithoutPropertiesLoad() { - SimulationParameter params = new SimulationParameter(); + SimulationParameter params = new SimulationParameterImpl(); params.setIsisFishVersion("3.2.0.4"); params.setDescription("desc"); params.setResultEnabled(Collections.singleton("bakh")); Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.simulator; @@ -116,7 +123,7 @@ // init simulation SimulationContext context = SimulationContext.get(); - SimulationParameter params = new SimulationParameter(); + SimulationParameter params = new SimulationParameterImpl(); SimulationStorage simulation = SimulationStorage.create("test_1_int", params); TopiaContext storageContext = simulation.getStorage(); storageContext.createSchema(); @@ -216,7 +223,7 @@ // init simulation SimulationContext context = SimulationContext.get(); - SimulationParameter params = new SimulationParameter(); + SimulationParameter params = new SimulationParameterImpl(); SimulationStorage simulation = SimulationStorage.create("test_2_matrix", params); TopiaContext storageContext = simulation.getStorage(); storageContext.createSchema(); Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitorTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitorTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitorTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,35 +1,42 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.simulator.launcher; +import java.util.AbstractMap.SimpleEntry; import java.util.Comparator; import java.util.Date; import java.util.SortedSet; import java.util.TreeSet; -import java.util.AbstractMap.SimpleEntry; import org.junit.Assert; import org.junit.Test; import fr.ifremer.isisfish.AbstractIsisFishTest; import fr.ifremer.isisfish.simulator.SimulationControl; -import fr.ifremer.isisfish.simulator.SimulationParameter; +import fr.ifremer.isisfish.simulator.SimulationParameterImpl; /** * Test de la class SimulationMonitor. @@ -61,11 +68,11 @@ SimulationService service = SimulationService.getService(); SimulationControl control1 = new SimulationControl("test1"); - SimulationItem item1 = new SimulationItem(control1, new SimulationParameter()); + SimulationItem item1 = new SimulationItem(control1, new SimulationParameterImpl()); SimulationJob job1 = new SimulationJob(service, item1, 0); SimulationControl control2 = new SimulationControl("test2"); - SimulationItem item2 = new SimulationItem(control2, new SimulationParameter()); + SimulationItem item2 = new SimulationItem(control2, new SimulationParameterImpl()); SimulationJob job2 = new SimulationJob(service, item2, 0); Date d = new Date(); Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceIT.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceIT.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceIT.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.simulator.launcher; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.simulator.launcher; @@ -36,6 +43,7 @@ import fr.ifremer.isisfish.entities.StrategyImpl; import fr.ifremer.isisfish.entities.Zone; import fr.ifremer.isisfish.simulator.SimulationParameter; +import fr.ifremer.isisfish.simulator.SimulationParameterImpl; import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; import fr.ifremer.isisfish.simulator.sensitivity.Factor; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator; @@ -156,7 +164,7 @@ @Test(timeout=120 * 1000) public void testRunSensivitySimulation() { - SimulationParameter params = new SimulationParameter(); + SimulationParameter params = new SimulationParameterImpl(); // set params region params.setRegionName("DemoRegion"); // set population Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008 - 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 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.simulator.launcher; @@ -78,6 +85,7 @@ Assert.assertTrue("String \"" + simulationResultZip + "\" not found in template", content.indexOf(simulationResultZip) > 0); Assert.assertTrue("String \"" + simulationPreScript + "\" not found in template", content.indexOf(simulationPreScript) > 0); Assert.assertTrue("Action --simulateRemotellyWithPreScript not on script", content.indexOf(" --simulateRemotellyWithPreScript ") > 0); + Assert.assertTrue("Remote Java path not found in template", content.indexOf("/home3/caparmor/poussin/jdk/bin/java") > 0); // isis location Assert.assertTrue("String \"" + isisHome + "\" not found in template", content.indexOf(isisHome) > 0); @@ -136,6 +144,8 @@ * * Le script contient plusieurs variables qui doivent être remplacées. * + * Also test configuration off remote Java path. + * * @throws IOException when freemarker throws it * @throws TemplateException when freemarker throws it */ @@ -143,6 +153,7 @@ public void testFreemarkerTemplateMultiJobs() throws IOException, TemplateException { + // some things to test ! String shortSimulationId = "sim_test1_2009-11-10-18-08"; String simulationId = shortSimulationId + "_122"; String simulationZip = "simulation-" + simulationId + "-preparation.zip"; @@ -150,6 +161,8 @@ String simulationPreScript = null; String isisHome = IsisFish.config.getSimulatorSshIsisHome(); String isisTemp = IsisFish.config.getSimulatorSshTmpPath(); + String javaPath = "/home1/noumea/cluster"; + IsisFish.config.setSimulatorSshJavaPath(javaPath); SSHSimulatorLauncher launcher = new SSHSimulatorLauncher(); String content = launcher.getSimulationScriptLaunchContent( @@ -166,6 +179,7 @@ Assert.assertTrue(content.indexOf("/tmp/simulation-" + shortSimulationId + "_$PBS_ARRAY_INDEX-result.zip") > 0); Assert.assertTrue("String " + isisTemp + "/simulation-" + shortSimulationId + "_$PBS_ARRAY_INDEX-output.txt\" not found in template", content.indexOf(isisTemp + "/simulation-" + shortSimulationId + "_$PBS_ARRAY_INDEX-output.txt\"") > 0); Assert.assertTrue("Action --simulateRemotelly not on script", content.indexOf(" --simulateRemotelly ") > 0); + Assert.assertTrue("Remote Java path not found in template", content.indexOf(javaPath) > 0); // isis location Assert.assertTrue("String \"" + isisHome + "\" not found in template", content.indexOf(isisHome) > 0); @@ -232,4 +246,42 @@ Assert.assertTrue(remoteTemp.startsWith("/")); Assert.assertTrue(remoteTemp.endsWith("/")); } + + /** + * Test simulation names with special char. + * + * as_ICES2010_M+_10%_152Param_2010-11-08-17-18. + * + * Script now contains \\Q and \\E for thta case. + * + * @throws IOException when freemarker throws it + * @throws TemplateException when freemarker throws it + */ + @Test + public void testFreemarkerTemplateScriptSpecialchar() throws IOException, TemplateException { + + // some things to test ! + String shortSimulationId = "as_ICES2010_M+_10%_152Param_2010-11-08-17-18"; + String simulationId = shortSimulationId + "_122"; + String simulationZip = "simulation-" + simulationId + "-preparation.zip"; + String simulationResultZip = "/tmp/simulation-" + simulationId + "-result.zip"; + String simulationPreScript = null; + String isisTemp = IsisFish.config.getSimulatorSshTmpPath(); + + SSHSimulatorLauncher launcher = new SSHSimulatorLauncher(); + String content = launcher.getSimulationScriptLaunchContent( + SSHSimulatorLauncher.QSUB_SCRIPT_TEMPLATE, shortSimulationId, + simulationZip, true, simulationResultZip, simulationPreScript, true); + + if (log.isInfoEnabled()) { + log.info("Script content = " + content); + } + + // simulation parameters + Assert.assertTrue("String \"" + shortSimulationId + "\" not found in template", content.indexOf(shortSimulationId) > 0); + Assert.assertTrue(content.indexOf("simulation-" + shortSimulationId + "_$PBS_ARRAY_INDEX-preparation.zip") > 0); + Assert.assertTrue(content.indexOf("/tmp/simulation-" + shortSimulationId + "_$PBS_ARRAY_INDEX-result.zip") > 0); + Assert.assertTrue("String " + isisTemp + "/simulation-" + shortSimulationId + "_$PBS_ARRAY_INDEX-output.txt\" not found in template", content.indexOf(isisTemp + "/simulation-" + shortSimulationId + "_$PBS_ARRAY_INDEX-output.txt\"") > 0); + Assert.assertTrue("Action --simulateRemotelly not on script", content.indexOf(" --simulateRemotelly ") > 0); + } } \ No newline at end of file Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,26 +1,32 @@ -/* *##% +/* + * #%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 2 - * of the License, or (at your option) any later version. - * + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.simulator.sensitivity; import java.util.ArrayList; import java.util.Collection; -import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculatorRandomMock.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,25 +1,31 @@ -/* *##% +/* + * #%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 2 - * of the License, or (at your option) any later version. - * + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.simulator.sensitivity; import java.io.File; -import java.io.Serializable; import java.util.List; import org.apache.commons.logging.Log; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/types/MonthTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/types/MonthTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/types/MonthTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% +/* + * #%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 2 - * of the License, or (at your option) any later version. - * + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.types; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelperTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelperTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelperTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 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 License, or (at your option) any later version. - * + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.sensitivity; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% +/* + * #%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 2 - * of the License, or (at your option) any later version. - * + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.sensitivity; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUtilsTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUtilsTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUtilsTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% * Copyright (C) 2009 - 2010 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 License, or (at your option) any later version. - * + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.sensitivity; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/util/ErrorHelperTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/util/ErrorHelperTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/util/ErrorHelperTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.util; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogModelMock.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogModelMock.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogModelMock.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2007 - 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.ui.widget.filter; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,19 +1,27 @@ -/* *##% - * Copyright (C) 2009 Ifremer, CodeLutin - * +/* + * #%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 Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * 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/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.util; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.util; @@ -22,7 +29,6 @@ import java.util.Map; import org.junit.Assert; -import org.junit.Ignore; import org.junit.Test; import fr.ifremer.isisfish.AbstractIsisFishTest; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/util/JavadocHelperTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/util/JavadocHelperTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/util/JavadocHelperTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,19 +1,27 @@ -/* *##% - * Copyright (C) 2009 Ifremer, CodeLutin - * +/* + * #%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 Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * 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/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.util; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/util/ssh/SSHAgentTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/util/ssh/SSHAgentTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/util/ssh/SSHAgentTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2009 Ifremer, Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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.util.ssh; Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,19 +1,27 @@ -/* *##% IsisFish - * Copyright (C) 2008 - 2009 Ifremer, CodeLutin - * +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2010 Ifremer, Code Lutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * 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/lgpl-3.0.html>. ##%*/ + * <http://www.gnu.org/licenses/gpl-2.0.html>. + * #L% + */ package fr.ifremer.isisfish.vcs; Modified: isis-fish/branches/3.3.1/src/test/resources/VCSConfig-junit_CVS.properties =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/VCSConfig-junit_CVS.properties 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/VCSConfig-junit_CVS.properties 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +### +# #%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 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% +### vcs.username=anonymous vcs.hostname=cvs.labs.libre-entreprise.org vcs.remote.path=/cvsroot/isis-fish Modified: isis-fish/branches/3.3.1/src/test/resources/VCSConfig-junit_SVN.properties =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/VCSConfig-junit_SVN.properties 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/VCSConfig-junit_SVN.properties 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +### +# #%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 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% +### vcs.username=anonymous vcs.typeRepo=TAG vcs.hostname=labs.libre-entreprise.org Modified: isis-fish/branches/3.3.1/src/test/resources/fr/ifremer/isisfish/simulator/parameters_basic.properties =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/fr/ifremer/isisfish/simulator/parameters_basic.properties 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/fr/ifremer/isisfish/simulator/parameters_basic.properties 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +### +# #%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 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% +### #Parameters #Wed Sep 16 12:01:08 CEST 2009 libLogLevel=error Modified: isis-fish/branches/3.3.1/src/test/resources/fr/ifremer/isisfish/simulator/parameters_plan.properties =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/fr/ifremer/isisfish/simulator/parameters_plan.properties 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/fr/ifremer/isisfish/simulator/parameters_plan.properties 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +### +# #%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 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% +### #Parameters #Wed Sep 16 12:01:08 CEST 2009 libLogLevel=error Modified: isis-fish/branches/3.3.1/src/test/resources/mexico/mexicohelper_designplan.xml =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/mexico/mexicohelper_designplan.xml 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/mexico/mexicohelper_designplan.xml 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%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 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% + --> + <experimentalDesign> <factors> <factor name="factor 1 (double continuous)" property="continuous" type="real"> Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/analyseplans/CalibrationSimplexePasVariable2Capturabilite.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/analyseplans/CalibrationSimplexePasVariable2Capturabilite.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/analyseplans/CalibrationSimplexePasVariable2Capturabilite.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 analyseplans; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/analyseplans/SimulationNumberRestriction.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/analyseplans/SimulationNumberRestriction.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/analyseplans/SimulationNumberRestriction.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 analyseplans; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/Abundances.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/Abundances.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/Abundances.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 exports; import org.apache.commons.logging.Log; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/Biomasses.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/Biomasses.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/Biomasses.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 exports; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CapturesNombre.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CapturesNombre.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CapturesNombre.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 exports; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CapturesPoids.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CapturesPoids.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CapturesPoids.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 exports; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CellsDefinition.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CellsDefinition.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CellsDefinition.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 exports; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/EffortsMetier.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/EffortsMetier.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/EffortsMetier.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 exports; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/MetierZone.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/MetierZone.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/MetierZone.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 exports; import org.apache.commons.logging.Log; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/NonActivite.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/NonActivite.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/NonActivite.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 exports; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/OwnerMargin.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/OwnerMargin.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/OwnerMargin.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 exports; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RegionDefinition.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RegionDefinition.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RegionDefinition.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 exports; import org.apache.commons.logging.Log; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RejetsNombre.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RejetsNombre.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RejetsNombre.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 exports; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RejetsPoids.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RejetsPoids.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RejetsPoids.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 exports; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/VesselMargin.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/VesselMargin.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/VesselMargin.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 exports; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/ZonesDefinition.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/ZonesDefinition.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/ZonesDefinition.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 exports; import org.apache.commons.logging.Log; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/rules/Cantonnement.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/rules/Cantonnement.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/rules/Cantonnement.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 rules; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/rules/CantonnementPreSimu.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/rules/CantonnementPreSimu.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/rules/CantonnementPreSimu.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 rules; import static org.codelutin.i18n.I18n.n_; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/rules/ChangementParamControlablePresimu.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/rules/ChangementParamControlablePresimu.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/rules/ChangementParamControlablePresimu.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 rules; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/rules/EffortReduction.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/rules/EffortReduction.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/rules/EffortReduction.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 rules; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/rules/GraviteVPUE1.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/rules/GraviteVPUE1.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/rules/GraviteVPUE1.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 rules; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/rules/InterdictionEngin.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/rules/InterdictionEngin.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/rules/InterdictionEngin.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 rules; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/rules/InterdictionEnginPreSimu.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/rules/InterdictionEnginPreSimu.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/rules/InterdictionEnginPreSimu.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 rules; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TACpoids.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TACpoids.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TACpoids.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 rules; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TailleMin.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TailleMin.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TailleMin.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 rules; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TotalClosure.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TotalClosure.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TotalClosure.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 rules; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/GravityModel.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/GravityModel.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/GravityModel.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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 scripts; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/ResultName.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/ResultName.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/ResultName.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - * Code Lutin, Cedric 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. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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% + */ /* * * ResultName.java Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/RuleUtil.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/RuleUtil.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/RuleUtil.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 scripts; import java.util.List; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/SiMatrix.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/SiMatrix.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/SiMatrix.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * Ifremer, Code Lutin, 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. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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 scripts; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorJavaExpandGrid.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorJavaExpandGrid.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorJavaExpandGrid.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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 sensitivity; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRFast.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRFast.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRFast.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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 sensitivity; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRFrF2.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRFrF2.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRFrF2.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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 sensitivity; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRMorris.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRMorris.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRMorris.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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 sensitivity; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorROptimumLHS.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorROptimumLHS.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorROptimumLHS.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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 sensitivity; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRRandomLHS.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRRandomLHS.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRRandomLHS.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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 sensitivity; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRSobol.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRSobol.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRSobol.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 Code Lutin - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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 sensitivity; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRegularFractions.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRegularFractions.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRegularFractions.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 sensitivity; import java.io.File; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassReferenceY9.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassReferenceY9.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassReferenceY9.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 sensitivityexports; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassRelativeReferenceY12.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassRelativeReferenceY12.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassRelativeReferenceY12.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 sensitivityexports; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassRelativeY6.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassRelativeY6.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassRelativeY6.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 sensitivityexports; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassY3.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassY3.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassY3.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 sensitivityexports; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightReferenceY7.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightReferenceY7.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightReferenceY7.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 sensitivityexports; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightRelativeReferenceY10.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightRelativeReferenceY10.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightRelativeReferenceY10.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 sensitivityexports; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightRelativeY4.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightRelativeY4.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightRelativeY4.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 sensitivityexports; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightY1.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightY1.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightY1.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 sensitivityexports; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassReferenceY8.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassReferenceY8.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassReferenceY8.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 sensitivityexports; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassRelativeReferenceY11.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassRelativeReferenceY11.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassRelativeReferenceY11.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 sensitivityexports; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassRelativeY5.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassRelativeY5.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassRelativeY5.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 sensitivityexports; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassY2.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassY2.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassY2.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,3 +1,27 @@ +/* + * #%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 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 sensitivityexports; import static org.codelutin.i18n.I18n._; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/simulators/DefaultSimulator.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/simulators/DefaultSimulator.java 2011-02-21 08:44:07 UTC (rev 3147) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/simulators/DefaultSimulator.java 2011-03-02 16:57:16 UTC (rev 3148) @@ -1,21 +1,27 @@ -/* *##% - * Copyright (C) 2006 - 2009 - * 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. - * +/* + * #%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 2 of the + * License, or (at your option) any later version. + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - *##%*/ + * + * You should have received 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% + */ /* * * DefaultSimulator.java