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

r3691 - in tags: . isis-fish-4.1.0.0
by maven-release＠users.forge.codelutin.com April 26, 2012

April 26, 2012

Author: maven-release Date: 2012-04-26 18:18:24 +0200 (Thu, 26 Apr 2012) New Revision: 3691 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3691 Log: [maven-release-plugin] copy for tag isis-fish-4.1.0.0 Added: tags/isis-fish-4.1.0.0/ Property changes on: tags/isis-fish-4.1.0.0 ___________________________________________________________________ Added: svn:ignore + maven.log target velocity.log .classpath .project isis-fish.ipr isis-fish.iws isis-fish.iml .settings bin nbproject Inputs_Langoustine Added: svn:mergeinfo + /branches/4.1:3601-3670

1 0

r3690 - trunk
by maven-release＠users.forge.codelutin.com April 26, 2012

April 26, 2012

Author: maven-release Date: 2012-04-26 18:18:16 +0200 (Thu, 26 Apr 2012) New Revision: 3690 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3690 Log: [maven-release-plugin] prepare release isis-fish-4.1.0.0 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-26 16:10:57 UTC (rev 3689) +++ trunk/pom.xml 2012-04-26 16:18:16 UTC (rev 3690) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.1.0.0-SNAPSHOT</version> + <version>4.1.0.0</version>  <dependencies> @@ -731,9 +731,9 @@   <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</developerConnection> - <url>http://svn.forge.codelutin.com/svn/isis-fish/trunk</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.1.0.0</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.1.0.0</developerConnection> + <url>http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.1.0.0</url> </scm> <repositories>

1 0

r3689 - trunk/src/main/xmi
by echatellier＠users.forge.codelutin.com April 26, 2012

April 26, 2012

Author: echatellier Date: 2012-04-26 18:10:57 +0200 (Thu, 26 Apr 2012) New Revision: 3689 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3689 Log: Fix lazy excepction during sensitivity export Modified: trunk/src/main/xmi/isis-fish.properties Modified: trunk/src/main/xmi/isis-fish.properties =================================================================== --- trunk/src/main/xmi/isis-fish.properties 2012-04-26 14:48:24 UTC (rev 3688) +++ trunk/src/main/xmi/isis-fish.properties 2012-04-26 16:10:57 UTC (rev 3689) @@ -57,3 +57,6 @@ fr.ifremer.isisfish.entities.Variable.attribute.entityId.tagvalue.notNull=true fr.ifremer.isisfish.entities.VesselType.class.tagvalue.contextable=true fr.ifremer.isisfish.entities.Zone.class.tagvalue.contextable=true + +#�fix lazy exception on sensitivity export +fr.ifremer.isisfish.entities.Population.attribute.maturityOgiveEquation.tagvalue.lazy=false

1 0

r3688 - in trunk/src: license site/rst/documentation/devel
by echatellier＠users.forge.codelutin.com April 26, 2012

April 26, 2012

Author: echatellier Date: 2012-04-26 16:48:24 +0200 (Thu, 26 Apr 2012) New Revision: 3688 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3688 Log: Fix header and third party Modified: trunk/src/license/THIRD-PARTY.properties trunk/src/site/rst/documentation/devel/rcaparmor.rst Modified: trunk/src/license/THIRD-PARTY.properties =================================================================== --- trunk/src/license/THIRD-PARTY.properties 2012-04-26 14:33:33 UTC (rev 3687) +++ trunk/src/license/THIRD-PARTY.properties 2012-04-26 14:48:24 UTC (rev 3688) @@ -7,11 +7,11 @@ # - Apache Software License Version 2.0 # - Apache Software License, Version 1.1 # - Apache Software License, Version 2.0 -# - BBN Technologies # - BSD License # - BSD licence # - BSD style # - BSD-style license +# - Bouncy Castle License # - CDDL # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 @@ -30,11 +30,13 @@ # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - MPL 1.1 +# - Mozilla Public License +# - OpenMap Software License Agreement # - Revised BSD # - Sun's Binary Code License # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 -# - http://asm.ow2.org/license.html # - http://sqljet.com/ # - http://svnkit.com/license.html # - http://www.trilead.com/Products/Trilead_SSH_for_Java/License/ @@ -43,10 +45,8 @@ # Please fill the missing licenses for dependencies : # # -#Fri Nov 18 15:56:18 CET 2011 +#Thu Apr 26 16:37:35 CEST 2012 antlr--antlr--2.7.6=BSD License -asm--asm-commons--3.1=http\://asm.ow2.org/license.html -asm--asm-tree--3.1=http\://asm.ow2.org/license.html aspectwerkz--aspectwerkz--2.0=GNU Lesser General Public License aspectwerkz--aspectwerkz-core--2.0=GNU Lesser General Public License aspectwerkz--aspectwerkz-jdk5--2.0=GNU Lesser General Public License @@ -55,7 +55,6 @@ commons-jxpath--commons-jxpath--1.3=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License -javassist--javassist--3.8.0.GA=GNU Lesser General Public License javax.activation--activation--1.1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1=Java Transaction API (JTA) License jaxen--jaxen--1.1.1=Jaxen license Modified: trunk/src/site/rst/documentation/devel/rcaparmor.rst =================================================================== --- trunk/src/site/rst/documentation/devel/rcaparmor.rst 2012-04-26 14:33:33 UTC (rev 3687) +++ trunk/src/site/rst/documentation/devel/rcaparmor.rst 2012-04-26 14:48:24 UTC (rev 3688) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * IsisFish +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2012 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% +.. - Utilisation de R sur caparmor =============================

1 0

r3687 - trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by echatellier＠users.forge.codelutin.com April 26, 2012

April 26, 2012

Author: echatellier Date: 2012-04-26 16:33:33 +0200 (Thu, 26 Apr 2012) New Revision: 3687 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3687 Log: add hack ArrayIndexOutOfBoundException for unknown reason Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java 2012-04-26 13:25:20 UTC (rev 3686) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java 2012-04-26 14:33:33 UTC (rev 3687) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Benjamin Poussin + * Copyright (C) 2002 - 2012 Ifremer, Code Lutin, Benjamin Poussin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -209,68 +209,76 @@ */ public Object getValueAt(int rowIndex, int columnIndex) { + // FIXME echatellier : hack ArrayIndexOutOfBoundException for unknown + // reason (very hard to fix properly) + if (rowIndex >= jobs.size()) { + if (columnIndex == 4) { + return new JProgressBar(); // NPE + } else { + return null; + } + } + Object result = ""; - synchronized (jobs) { - SimulationJob job = jobs.get(rowIndex); - SimulationControl control = job.getItem().getControl(); - String id = control.getId(); - SimulationParameter param = job.getItem().getParameter(); + SimulationJob job = jobs.get(rowIndex); + SimulationControl control = job.getItem().getControl(); + String id = control.getId(); + SimulationParameter param = job.getItem().getParameter(); - if (log.isTraceEnabled()) { - log.trace("Update table model : " + "id = " + control.getId() - + ", " + "control.getProgress() = " + control.getProgress() - + ", " + "control.getProgressMax() = " - + control.getProgressMax() + ", " + "control.getDate() = " - + control.getStep()); + if (log.isTraceEnabled()) { + log.trace("Update table model : " + "id = " + control.getId() + + ", " + "control.getProgress() = " + control.getProgress() + + ", " + "control.getProgressMax() = " + + control.getProgressMax() + ", " + "control.getDate() = " + + control.getStep()); + } + + switch (columnIndex) { + case 0: + result = id; + break; + case 1: + if (param.getUseSimulationPlan()) { + int number = param.getSimulationPlanNumber(); + if (number >= 0) { + result = number; + } } - - switch (columnIndex) { - case 0: - result = id; - break; - case 1: + break; + case 2: + if (job.getLauncher() == null) { if (param.getUseSimulationPlan()) { - int number = param.getSimulationPlanNumber(); - if (number >= 0) { - result = number; - } - } - break; - case 2: - if (job.getLauncher() == null) { - if (param.getUseSimulationPlan()) { - result = _("isisfish.queue.masterplan"); - } else { - result = _("isisfish.queue.notstarted"); - } + result = _("isisfish.queue.masterplan"); } else { - result = job.getLauncher().toString(); + result = _("isisfish.queue.notstarted"); } - break; - case 3: - if (control.isStopSimulationRequest()) { - result = _("isisfish.launch.stop"); - } else { - result = control.getText(); - } - break; - case 4: - JProgressBar pb = getProgressBar(job); - pb.setMaximum((int) control.getProgressMax()); - pb.setValue((int) control.getProgress()); - - // progress can be used for other things - TimeStep step = control.getStep(); - if (step != null) { - pb.setString(step.getMonth() + "/" + step.getYear()); - } - else { - pb.setString(""); - } - result = pb; - break; + } else { + result = job.getLauncher().toString(); } + break; + case 3: + if (control.isStopSimulationRequest()) { + result = _("isisfish.launch.stop"); + } else { + result = control.getText(); + } + break; + case 4: + JProgressBar pb = getProgressBar(job); + pb.setMaximum((int) control.getProgressMax()); + pb.setValue((int) control.getProgress()); + + // progress can be used for other things + TimeStep step = control.getStep(); + if (step != null) { + pb.setString(step.getMonth() + "/" + step.getYear()); + } + else { + pb.setString(""); + } + result = pb; + break; } return result; }

1 0

r3686 - trunk/src/main/java/fr/ifremer/isisfish/datastore
by echatellier＠users.forge.codelutin.com April 26, 2012

April 26, 2012

Author: echatellier Date: 2012-04-26 15:25:20 +0200 (Thu, 26 Apr 2012) New Revision: 3686 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3686 Log: Add new method to get result with existing transaction Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java 2012-04-25 07:46:48 UTC (rev 3685) +++ trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java 2012-04-26 13:25:20 UTC (rev 3686) @@ -535,8 +535,20 @@ /** * Retourne une matrice contenant tous les pas de temps. + * @param pop la population pour lequel on souhaite la matrice * @param name le nom des resultats dont on veut une matrice globale. + * @param tx la transaction a utiliser + * @since 4.1.0.0 */ + public MatrixND getMatrix(Population pop, String name, TopiaContext tx) { + String newName = name + " " + pop; + return getMatrix(newName, tx); + } + + /** + * Retourne une matrice contenant tous les pas de temps. + * @param name le nom des resultats dont on veut une matrice globale. + */ public MatrixND getMatrix(String name) { MatrixND resultMat = null; try {

1 0

r3685 - trunk
by echatellier＠users.forge.codelutin.com April 25, 2012

April 25, 2012

Author: echatellier Date: 2012-04-25 09:46:48 +0200 (Wed, 25 Apr 2012) New Revision: 3685 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3685 Log: refs #825 : Update to jsch 0.1.48 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-24 16:27:53 UTC (rev 3684) +++ trunk/pom.xml 2012-04-25 07:46:48 UTC (rev 3685) @@ -259,7 +259,7 @@ <dependency> <groupId>com.jcraft</groupId> <artifactId>jsch</artifactId> - <version>0.1.47</version> + <version>0.1.48</version> <scope>compile</scope> </dependency>

1 0

r3684 - trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by echatellier＠users.forge.codelutin.com April 24, 2012

April 24, 2012

Author: echatellier Date: 2012-04-24 18:27:53 +0200 (Tue, 24 Apr 2012) New Revision: 3684 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3684 Log: Fix synchronized code on jobs Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java 2012-04-24 11:50:00 UTC (rev 3683) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java 2012-04-24 16:27:53 UTC (rev 3684) @@ -122,14 +122,9 @@ synchronized (jobs) { int index = jobs.indexOf(job); if (index >= 0) { - - // fire before, because of multithreaded update, - // get value at will get arrayindexoutofboundexception - // because fire and remove are not atomic - fireTableRowsDeleted(index, index); - jobs.remove(index); jobIds.remove(id); + fireTableRowsDeleted(index, index); } } } @@ -214,66 +209,68 @@ */ public Object getValueAt(int rowIndex, int columnIndex) { - SimulationJob job = jobs.get(rowIndex); - SimulationControl control = job.getItem().getControl(); - String id = control.getId(); - SimulationParameter param = job.getItem().getParameter(); - Object result = ""; - if (log.isTraceEnabled()) { - log.trace("Update table model : " + "id = " + control.getId() - + ", " + "control.getProgress() = " + control.getProgress() - + ", " + "control.getProgressMax() = " - + control.getProgressMax() + ", " + "control.getDate() = " - + control.getStep()); - } + synchronized (jobs) { + SimulationJob job = jobs.get(rowIndex); + SimulationControl control = job.getItem().getControl(); + String id = control.getId(); + SimulationParameter param = job.getItem().getParameter(); - switch (columnIndex) { - case 0: - result = id; - break; - case 1: - if (param.getUseSimulationPlan()) { - int number = param.getSimulationPlanNumber(); - if (number >= 0) { - result = number; - } + if (log.isTraceEnabled()) { + log.trace("Update table model : " + "id = " + control.getId() + + ", " + "control.getProgress() = " + control.getProgress() + + ", " + "control.getProgressMax() = " + + control.getProgressMax() + ", " + "control.getDate() = " + + control.getStep()); } - break; - case 2: - if (job.getLauncher() == null) { + + switch (columnIndex) { + case 0: + result = id; + break; + case 1: if (param.getUseSimulationPlan()) { - result = _("isisfish.queue.masterplan"); + int number = param.getSimulationPlanNumber(); + if (number >= 0) { + result = number; + } + } + break; + case 2: + if (job.getLauncher() == null) { + if (param.getUseSimulationPlan()) { + result = _("isisfish.queue.masterplan"); + } else { + result = _("isisfish.queue.notstarted"); + } } else { - result = _("isisfish.queue.notstarted"); + result = job.getLauncher().toString(); } - } else { - result = job.getLauncher().toString(); + break; + case 3: + if (control.isStopSimulationRequest()) { + result = _("isisfish.launch.stop"); + } else { + result = control.getText(); + } + break; + case 4: + JProgressBar pb = getProgressBar(job); + pb.setMaximum((int) control.getProgressMax()); + pb.setValue((int) control.getProgress()); + + // progress can be used for other things + TimeStep step = control.getStep(); + if (step != null) { + pb.setString(step.getMonth() + "/" + step.getYear()); + } + else { + pb.setString(""); + } + result = pb; + break; } - break; - case 3: - if (control.isStopSimulationRequest()) { - result = _("isisfish.launch.stop"); - } else { - result = control.getText(); - } - break; - case 4: - JProgressBar pb = getProgressBar(job); - pb.setMaximum((int) control.getProgressMax()); - pb.setValue((int) control.getProgress()); - - // progress can be used for other things - TimeStep step = control.getStep(); - if (step != null) { - pb.setString(step.getMonth() + "/" + step.getYear()); - } - else { - pb.setString(""); - } - result = pb; - break; } return result; }

1 0

r3683 - trunk
by echatellier＠users.forge.codelutin.com April 24, 2012

April 24, 2012

Author: echatellier Date: 2012-04-24 13:50:00 +0200 (Tue, 24 Apr 2012) New Revision: 3683 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3683 Log: closes #1167 : Update to rsyntaxtextarea 2.0.2 Update nuiton-utils and commons-io Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-24 11:48:07 UTC (rev 3682) +++ trunk/pom.xml 2012-04-24 11:50:00 UTC (rev 3683) @@ -89,7 +89,7 @@ <dependency> <groupId>com.fifesoft</groupId> <artifactId>rsyntaxtextarea</artifactId> - <version>1.5.0</version> + <version>2.0.2</version> <scope>runtime</scope> </dependency> @@ -173,7 +173,7 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.2</version> + <version>2.3</version> </dependency> <dependency> @@ -540,7 +540,7 @@ <eugeneVersion>2.4.2</eugeneVersion> <topiaVersion>2.6.9</topiaVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> - <nuitonUtilsVersion>2.4.6</nuitonUtilsVersion> + <nuitonUtilsVersion>2.4.7</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion> <aspectwerkzVersion>2.0</aspectwerkzVersion>

1 0

r3682 - trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by echatellier＠users.forge.codelutin.com April 24, 2012

April 24, 2012

Author: echatellier Date: 2012-04-24 13:48:07 +0200 (Tue, 24 Apr 2012) New Revision: 3682 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3682 Log: closes #1166 : NPE when updating jobs list table Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java 2012-04-24 10:15:56 UTC (rev 3681) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java 2012-04-24 11:48:07 UTC (rev 3682) @@ -97,11 +97,11 @@ boolean forDoToJobs) { this.simulationService = simulationService; if (forDoToJobs) { - jobListener = new JobToDoListener(simulationService, this); + jobListener = new JobToDoListener(this); } else { - jobListener = new JobDoneListener(simulationService, this); + jobListener = new JobDoneListener(this); } - controlListener = new ControlListener(simulationService, this); + controlListener = new ControlListener(this); simulationService.addSimulationServiceListener(jobListener); jobListener.setData(); } @@ -122,9 +122,14 @@ synchronized (jobs) { int index = jobs.indexOf(job); if (index >= 0) { + + // fire before, because of multithreaded update, + // get value at will get arrayindexoutofboundexception + // because fire and remove are not atomic + fireTableRowsDeleted(index, index); + jobs.remove(index); jobIds.remove(id); - fireTableRowsDeleted(index, index); } } } @@ -209,12 +214,6 @@ */ public Object getValueAt(int rowIndex, int columnIndex) { - // TODO IndexOutOfBoundException here - // Concurrent problem ? - if (rowIndex >= jobs.size()) { - return null; - } - SimulationJob job = jobs.get(rowIndex); SimulationControl control = job.getItem().getControl(); String id = control.getId(); @@ -286,12 +285,9 @@ class JobDoneListener implements AbstractJobListener, SimulationServiceListener { - protected SimulationService simulationService; protected SimulationServiceTableModel model; - public JobDoneListener(SimulationService simulationService, - SimulationServiceTableModel model) { - this.simulationService = simulationService; + public JobDoneListener(SimulationServiceTableModel model) { this.model = model; setData(); } @@ -321,12 +317,9 @@ class JobToDoListener implements AbstractJobListener, SimulationServiceListener { - protected SimulationService simulationService; protected SimulationServiceTableModel model; - public JobToDoListener(SimulationService simulationService, - SimulationServiceTableModel model) { - this.simulationService = simulationService; + public JobToDoListener(SimulationServiceTableModel model) { this.model = model; setData(); } @@ -362,12 +355,9 @@ protected class ControlListener implements PropertyChangeListener { - protected SimulationService simulationService; protected SimulationServiceTableModel model; - public ControlListener(SimulationService simulationService, - SimulationServiceTableModel model) { - this.simulationService = simulationService; + public ControlListener(SimulationServiceTableModel model) { this.model = model; }

1 0