February 2016 - Isis-fish-commits - mailman.cloud.codelutin.com

r4327 - trunk
by echatellier＠users.forge.codelutin.com Feb. 12, 2016

Feb. 12, 2016

Author: echatellier Date: 2016-02-12 11:23:52 +0100 (Fri, 12 Feb 2016) New Revision: 4327 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4327 Log: Fix build Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2016-02-12 10:23:43 UTC (rev 4326) +++ trunk/pom.xml 2016-02-12 10:23:52 UTC (rev 4327) @@ -571,6 +571,9 @@  <javadocPluginVersion>2.10.3</javadocPluginVersion> + <animalSnifferPluginVersion>1.14</animalSnifferPluginVersion> + <redmine.url>https://forge.${platform}</redmine.url> + <!-- jnlp (disabled until retested) <keystorepath>${codelutin.keystorepath}</keystorepath> <keystorealias>CodeLutin</keystorealias>

1 0

r4326 - trunk/src/main/java/fr/ifremer/isisfish
by echatellier＠users.forge.codelutin.com Feb. 12, 2016

Feb. 12, 2016

Author: echatellier Date: 2016-02-12 11:23:43 +0100 (Fri, 12 Feb 2016) New Revision: 4326 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4326 Log: Fix repo name for release Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java Modified: trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2016-02-11 09:35:32 UTC (rev 4325) +++ trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2016-02-12 10:23:43 UTC (rev 4326) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2014 Ifremer, Code Lutin, Benjamin Poussin, Chatellier Eric + * Copyright (C) 2002 - 2016 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 @@ -1112,7 +1112,7 @@ public static enum Option implements ConfigOptionDef { CONFIG_FILE(CONFIG_FILE_NAME, n("isisfish.config.main.configFileName.description"), "isis-config-" + ISIS_FISH_MAJOR_VERSION), - ISIS_HOME_DIRECTORY("isis.home.directory", n("isisfish.config.main.compileDirectory.description"), getUserHome() + File.separator + "isis-fish-" + ISIS_FISH_MAJOR_VERSION + "-rc"), + ISIS_HOME_DIRECTORY("isis.home.directory", n("isisfish.config.main.compileDirectory.description"), getUserHome() + File.separator + "isis-fish-" + ISIS_FISH_MAJOR_VERSION), COMPILATION_DIRECTORY("compilation.directory", n("isisfish.config.main.compileDirectory.description"), "${isis.home.directory}" + File.separator + "isis-build"), MONITORING_DIRECTORY("monitoring.directory", n("isisfish.config.main.monitoringDirectory.description"), "${isis.home.directory}" + File.separator + "isis-monitoring"), JAVADOC_DIRECTORY("javadoc.directory", n("isisfish.config.main.javadocDirectory.description"), "${isis.home.directory}" + File.separator + "isis-docs"),

1 0

r4325 - trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by echatellier＠users.forge.codelutin.com Feb. 11, 2016

Feb. 11, 2016

Author: echatellier Date: 2016-02-11 10:35:32 +0100 (Thu, 11 Feb 2016) New Revision: 4325 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4325 Log: fixes #7990: le gliss?\195?\169-depos?\195?\169 pour d?\195?\169finir l'ordre des r?\195?\168gles de gestion Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooserHandler.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooserHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooserHandler.java 2016-02-05 17:01:40 UTC (rev 4324) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooserHandler.java 2016-02-11 09:35:32 UTC (rev 4325) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 - 2012 Ifremer, Codelutin, Chatellier Eric + * Copyright (C) 2011 - 2016 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 @@ -143,6 +143,11 @@ int index = Integer.parseInt(indexString); JList.DropLocation dl = (JList.DropLocation) support.getDropLocation(); int dropTargetIndex = dl.getIndex(); + + // must adjust removed index + if (index < dropTargetIndex) { + dropTargetIndex -= 1; + } // perform real move List<Rule> rules = ruleChooser.getRulesList(); @@ -153,6 +158,9 @@ result = true; } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("Cant't import data", e); + } result = false; } }

1 0

r4324 - in trunk/src/main/java/fr/ifremer/isisfish/ui: input/cell simulator
by echatellier＠users.forge.codelutin.com Feb. 5, 2016

Feb. 5, 2016

Author: echatellier Date: 2016-02-05 18:01:40 +0100 (Fri, 05 Feb 2016) New Revision: 4324 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4324 Log: Fix generics Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/cell/CellUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsHandler.java trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/cell/CellUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/cell/CellUI.jaxx 2016-02-05 15:46:33 UTC (rev 4323) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/cell/CellUI.jaxx 2016-02-05 17:01:40 UTC (rev 4324) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2015 Ifremer, Code Lutin, Chatellier Eric + Copyright (C) 2009 - 2016 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 @@ -48,7 +48,7 @@ <cell fill='horizontal' columns='2' weightx='1.0'> <JComboBox id="fieldCell" onItemStateChanged='handler.fieldCellChanged(event)' genericType="fr.ifremer.isisfish.entities.Cell" - model='{new javax.swing.DefaultComboBoxModel()}' enabled='{getBean() != null}'/> + model='{new javax.swing.DefaultComboBoxModel<Cell>()}' enabled='{getBean() != null}'/> </cell> </row> <row> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsHandler.java 2016-02-05 15:46:33 UTC (rev 4323) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsHandler.java 2016-02-05 17:01:40 UTC (rev 4324) @@ -170,7 +170,7 @@ IsisFish.config.setSimulatorClassfile(simulatorName); } - public List<String> getSimulatorNames() { - return SimulatorStorage.getSimulatorNames(); + public String[] getSimulatorNames() { + return SimulatorStorage.getSimulatorNames().toArray(new String[0]); } } Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2016-02-05 15:46:33 UTC (rev 4323) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2016-02-05 17:01:40 UTC (rev 4324) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2015 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2016 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 @@ -48,7 +48,7 @@ <cell columns="4" fill="horizontal"> <JComboBox id="fieldSimulAdvParamsSimulatorSelect" genericType="String" - model='{new DefaultComboBoxModel(handler.getSimulatorNames().toArray())}' + model='{new DefaultComboBoxModel<String>(handler.getSimulatorNames())}' onActionPerformed='handler.setSimulatorName()'/> </cell> </row> Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsHandler.java 2016-02-05 15:46:33 UTC (rev 4323) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsHandler.java 2016-02-05 17:01:40 UTC (rev 4324) @@ -242,8 +242,8 @@ } } - public List<SimulatorLauncher> getSimulationLauncher() { - return SimulationService.getService().getSimulationLaunchers(); + public SimulatorLauncher[] getSimulationLauncher() { + return SimulationService.getService().getSimulationLaunchers().toArray(new SimulatorLauncher[0]); } /** Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2016-02-05 15:46:33 UTC (rev 4323) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2016-02-05 17:01:40 UTC (rev 4324) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2005 - 2015 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2005 - 2016 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 @@ -266,7 +266,7 @@ <cell fill="horizontal" weightx="0.4"> <JComboBox id="comboSelLauncher" genericType="fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher" - model='{new DefaultComboBoxModel(handler.getSimulationLauncher().toArray())}' /> + model='{new DefaultComboBoxModel<fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher>(handler.getSimulationLauncher())}' /> </cell> <cell fill="horizontal" weightx="0.4"> <JButton id="buttonSimulParamsSimulate"

1 0

r4323 - in trunk/src/main: java/fr/ifremer/isisfish/export java/fr/ifremer/isisfish/simulator java/fr/ifremer/isisfish/simulator/launcher resources/templates/script
by echatellier＠users.forge.codelutin.com Feb. 5, 2016

Feb. 5, 2016

Author: echatellier Date: 2016-02-05 16:46:33 +0100 (Fri, 05 Feb 2016) New Revision: 4323 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4323 Log: fixes #7934: Ajouter une m?\195?\169thode "exportBegin" dans les exports par pas de temps Modified: trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java trunk/src/main/java/fr/ifremer/isisfish/export/ExportStep.java trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java trunk/src/main/resources/templates/script/exportStep.ftl Modified: trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java 2016-02-05 15:42:40 UTC (rev 4322) +++ trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java 2016-02-05 15:46:33 UTC (rev 4323) @@ -193,6 +193,7 @@ if (exportInfo instanceof ExportStep) { ExportStep exportStep = (ExportStep)exportInfo; + exportStep.exportBegin(simulationStorage, out); TimeStep lastStep = simulationStorage.getResultStorage().getLastStep(); for (TimeStep step = new TimeStep(0); !step.after(lastStep); step = step.next()) { exportStep.export(simulationStorage, step, out); Modified: trunk/src/main/java/fr/ifremer/isisfish/export/ExportStep.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/export/ExportStep.java 2016-02-05 15:42:40 UTC (rev 4322) +++ trunk/src/main/java/fr/ifremer/isisfish/export/ExportStep.java 2016-02-05 15:46:33 UTC (rev 4323) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2014 Ifremer, Code Lutin, Benjamin Poussin + * Copyright (C) 2006 - 2016 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 @@ -47,6 +47,16 @@ public interface ExportStep extends ExportInfo { /** + * Appelée au début de la simulation. + * + * @param simulation la simulation dont on souhaite exporter les resultats + * @param out la sortie sur lequel il faut ecrire l'export + * @throws Exception if export fail + */ + public void exportBegin(SimulationStorage simulation, Writer out) + throws Exception; + + /** * Exporte les resultats, cette methode est appellee a la fin de chaque pas * de temps. Elle peut ecrire dans le fichier via le parametre out, * ou collecter les informations et les ecrires a la fin de la simulation Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java 2016-02-05 15:42:40 UTC (rev 4322) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java 2016-02-05 15:46:33 UTC (rev 4323) @@ -130,6 +130,7 @@ out = new PrintWriter(new BufferedWriter( new OutputStreamWriter(os, IsisConfig.charset))); + } return out; } @@ -138,6 +139,14 @@ this.time += time; } + public void exportBegin(SimulationStorage simulation) throws Exception { + if (export instanceof ExportStep) { + long timeStart = System.nanoTime(); + ((ExportStep)export).exportBegin(simulation, getOut()); + addTime(System.nanoTime() - timeStart); + } + } + public void export(SimulationStorage simulation, TimeStep step) throws Exception { if (export instanceof ExportStep) { long timeStart = System.nanoTime(); @@ -219,7 +228,19 @@ allExports.put(export, new ExportContext(export, exportDir)); } } - + + // call exportBegin for exportStep + for (ExportContext e : allExports.values()) { + try { + // pour les ExportStep + e.exportBegin(simulation); + } catch (Exception eee) { + if (log.isErrorEnabled()) { + log.error("Can't export results", eee); + } + e.setException(eee); + } + } } @Override Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2016-02-05 15:42:40 UTC (rev 4322) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2016-02-05 15:46:33 UTC (rev 4323) @@ -814,7 +814,7 @@ for (String name : param.getExportNames()) { // new instance ExportStorage exportStorage = ExportStorage.getExport(name); - Export export = exportStorage.getNewInstance(); + ExportInfo export = exportStorage.getNewInstance(); // copy name = name.endsWith(".java") ? name : name + ".java"; Modified: trunk/src/main/resources/templates/script/exportStep.ftl =================================================================== --- trunk/src/main/resources/templates/script/exportStep.ftl 2016-02-05 15:42:40 UTC (rev 4322) +++ trunk/src/main/resources/templates/script/exportStep.ftl 2016-02-05 15:46:33 UTC (rev 4323) @@ -5,7 +5,7 @@ $Id: export.ftl 4156 2014-12-09 11:27:18Z echatellier $ $HeadURL: http://svn.forge.codelutin.com/svn/isis-fish/trunk/src/main/resources/templ… $ %% - Copyright (C) 2014 - 2015 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2014 - 2016 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 @@ -120,6 +120,18 @@ } /** + * Appeler au début de l'export + * + * @param simulation la simulation dont on souhaite exporter les resultats + * @param out la sortie sur lequel il faut ecrire l'export + * @throws Exception if export fail + */ + public void exportBegin(SimulationStorage simulation, Writer out) + throws Exception { + // if you need to do something at the begin of export, put your code here + } + + /** * Exporte les resultats, cette methode est appellee a la fin de chaque pas * de temps. Elle peut ecrire dans le fichier via le parametre out, * ou collecter les informations et les ecrires a la fin de la simulation @@ -168,5 +180,4 @@ // if you need to do something at the end of export, put your code here } - }

1 0

r4322 - trunk
by echatellier＠users.forge.codelutin.com Feb. 5, 2016

Feb. 5, 2016

Author: echatellier Date: 2016-02-05 16:42:40 +0100 (Fri, 05 Feb 2016) New Revision: 4322 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4322 Log: Update libs Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2016-01-22 16:28:29 UTC (rev 4321) +++ trunk/pom.xml 2016-02-05 15:42:40 UTC (rev 4322) @@ -237,7 +237,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.7.13</version> + <version>1.7.14</version> <scope>runtime</scope> </dependency> @@ -298,7 +298,7 @@ <dependency> <groupId>com.bbn</groupId> <artifactId>openmap</artifactId> - <version>5.1.10</version> + <version>5.1.13</version> <scope>compile</scope> </dependency> @@ -333,7 +333,7 @@ <dependency> <groupId>net.sourceforge</groupId> <artifactId>jdistlib</artifactId> - <version>0.3.9</version> + <version>0.4.1</version> </dependency>  @@ -557,7 +557,7 @@ <redmine.statusIds>3,10,11,18,19</redmine.statusIds>  - <jaxxVersion>2.28.1</jaxxVersion> + <jaxxVersion>2.28.2</jaxxVersion> <eugeneVersion>2.14</eugeneVersion> <topiaVersion>2.11</topiaVersion> <hibernateVersion>4.3.11.Final</hibernateVersion>

1 0