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

r4120 - in branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish: aspect datastore entities mexico mexico/export simulator simulator/sensitivity ui/config ui/input ui/input/tree/loadors ui/result ui/script ui/vcs util
by echatellier＠users.forge.codelutin.com Sept. 26, 2014

Sept. 26, 2014

Author: echatellier Date: 2014-09-26 17:27:17 +0200 (Fri, 26 Sep 2014) New Revision: 4120 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4120 Log: Misc fixes Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/aspect/AspectJUrlClassLoader.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorHelper.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/ObservationsNodeLoador.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/result/MatrixMapRenderer.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnReferenceMap.java Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/aspect/AspectJUrlClassLoader.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/aspect/AspectJUrlClassLoader.java 2014-09-26 14:50:24 UTC (rev 4119) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/aspect/AspectJUrlClassLoader.java 2014-09-26 15:27:17 UTC (rev 4120) @@ -71,13 +71,13 @@ adaptor = new AspectJWeavingAdaptor(getParent(), this); } - private static String getAspectPath() { + /*private static String getAspectPath() { return System.getProperty(WEAVING_ASPECT_PATH, ""); } private static String getClassPath() { return System.getProperty(WEAVING_CLASS_PATH, ""); - } + }*/ protected void addURL(URL url) { adaptor.addURL(url); Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java 2014-09-26 14:50:24 UTC (rev 4119) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java 2014-09-26 15:27:17 UTC (rev 4120) @@ -32,7 +32,6 @@ import org.apache.commons.collections4.map.ReferenceMap; import fr.ifremer.isisfish.IsisFish; -import fr.ifremer.isisfish.IsisFishException; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.vcs.VCSException; Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java 2014-09-26 14:50:24 UTC (rev 4119) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java 2014-09-26 15:27:17 UTC (rev 4120) @@ -36,7 +36,6 @@ import org.apache.commons.logging.LogFactory; import fr.ifremer.isisfish.IsisFish; -import fr.ifremer.isisfish.IsisFishException; import fr.ifremer.isisfish.simulator.SimulationPlan; import fr.ifremer.isisfish.util.Doc; import fr.ifremer.isisfish.vcs.VCSException; Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java 2014-09-26 14:50:24 UTC (rev 4119) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java 2014-09-26 15:27:17 UTC (rev 4120) @@ -25,8 +25,6 @@ package fr.ifremer.isisfish.entities; -import static org.nuiton.i18n.I18n.t; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2014-09-26 14:50:24 UTC (rev 4119) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2014-09-26 15:27:17 UTC (rev 4120) @@ -415,7 +415,7 @@ ruleAsString.append("<param key=\""); ruleAsString.append(propName); ruleAsString.append("\">"); - ruleAsString.append(StringEscapeUtils.escapeXml(props.getProperty(propName))); + ruleAsString.append(StringEscapeUtils.escapeXml11(props.getProperty(propName))); ruleAsString.append("</param>"); } ruleAsString.append("</rule>"); Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java 2014-09-26 14:50:24 UTC (rev 4119) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java 2014-09-26 15:27:17 UTC (rev 4120) @@ -272,7 +272,7 @@ // not initialized equation can be null :( if (value != null) { result = String.valueOf(((Equation)value).getContent()); - result = StringEscapeUtils.escapeXml(result); + result = StringEscapeUtils.escapeXml11(result); } } // default case, just toString() on value Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2014-09-26 14:50:24 UTC (rev 4119) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2014-09-26 15:27:17 UTC (rev 4120) @@ -43,7 +43,6 @@ 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; Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorHelper.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorHelper.java 2014-09-26 14:50:24 UTC (rev 4119) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorHelper.java 2014-09-26 15:27:17 UTC (rev 4120) @@ -36,7 +36,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixND; -import org.nuiton.topia.persistence.TopiaEntity; import fr.ifremer.isisfish.rule.Rule; import fr.ifremer.isisfish.rule.RuleHelper; Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java 2014-09-26 14:50:24 UTC (rev 4119) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java 2014-09-26 15:27:17 UTC (rev 4120) @@ -352,6 +352,7 @@ * * @param session opened session * @return 'pwd' result + * @throws SSHException */ protected String getUserHomeDirectory(Session session) throws SSHException { @@ -372,7 +373,9 @@ * Get user home directory with an opened session. * * @param session opened session - * @return 'pwd' result + * @param path path to get size + * @return dir size + * @throws SSHException */ protected String getFolderSize(Session session, String path) throws SSHException { Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2014-09-26 14:50:24 UTC (rev 4119) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2014-09-26 15:27:17 UTC (rev 4120) @@ -33,7 +33,6 @@ import java.io.IOException; import java.lang.reflect.Constructor; import java.util.HashMap; -import java.util.List; import java.util.Map; import javax.swing.JComponent; @@ -59,7 +58,6 @@ import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.datastore.RegionStorage; -import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.datastore.StorageException; import fr.ifremer.isisfish.entities.Cell; import fr.ifremer.isisfish.entities.FisheryRegion; Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/ObservationsNodeLoador.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/ObservationsNodeLoador.java 2014-09-26 14:50:24 UTC (rev 4119) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/ObservationsNodeLoador.java 2014-09-26 15:27:17 UTC (rev 4120) @@ -26,7 +26,6 @@ import jaxx.runtime.swing.nav.NavDataProvider; import fr.ifremer.isisfish.entities.FisheryRegion; -import fr.ifremer.isisfish.entities.Gear; import fr.ifremer.isisfish.entities.Observation; import fr.ifremer.isisfish.ui.input.tree.FisheryDataProvider; import fr.ifremer.isisfish.ui.input.tree.FisheryTreeNode; Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/result/MatrixMapRenderer.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/result/MatrixMapRenderer.java 2014-09-26 14:50:24 UTC (rev 4119) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/result/MatrixMapRenderer.java 2014-09-26 15:27:17 UTC (rev 4120) @@ -32,9 +32,6 @@ import org.nuiton.math.matrix.MatrixND; import org.nuiton.math.matrix.viewer.MatrixRenderer; -import com.bbn.openmap.gui.OMToolSet; -import com.bbn.openmap.gui.Tool; - import fr.ifremer.isisfish.entities.FisheryRegion; import fr.ifremer.isisfish.map.ResultatLayer; Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2014-09-26 14:50:24 UTC (rev 4119) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2014-09-26 15:27:17 UTC (rev 4120) @@ -37,13 +37,11 @@ import java.io.Writer; import java.util.List; -import javax.swing.JFrame; import javax.swing.JMenuItem; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea; import org.nuiton.math.matrix.MatrixND; import org.nuiton.math.matrix.viewer.MatrixViewerPanel; import org.nuiton.math.matrix.viewer.renderer.MatrixChartRenderer; @@ -95,7 +93,7 @@ } @Override public void simulationStop(SimulationService simService, SimulationJob job) { - GenericComboModel<String> model = (GenericComboModel)resultUI.getSimulationComboBox().getModel(); + GenericComboModel<String> model = (GenericComboModel<String>)resultUI.getSimulationComboBox().getModel(); model.addElement(job.getId()); } @Override @@ -203,7 +201,7 @@ matrixViewerPanel.addMatrixFilter(new SumByYearMatrixFilter()); // init available results list - GenericComboModel model = new GenericComboModel(resultStorage.getResultName()); + GenericComboModel<String> model = new GenericComboModel<String>(resultStorage.getResultName()); resultSimulationFrame.getResultsComboBox().setModel(model); resultSimulationFrame.getResultsComboBox().addItemListener(new ItemListener() { @Override Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2014-09-26 14:50:24 UTC (rev 4119) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2014-09-26 15:27:17 UTC (rev 4120) @@ -68,7 +68,6 @@ import org.nuiton.util.FileUtil; import org.nuiton.util.ZipUtil; import org.nuiton.widget.SwingUtil; -import org.nuiton.widget.editor.RSyntaxEditor; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishRuntimeException; Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx 2014-09-26 14:50:24 UTC (rev 4119) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx 2014-09-26 15:27:17 UTC (rev 4120) @@ -89,9 +89,12 @@ JSch jsch=new JSch(); KeyPair kpair=KeyPair.genKeyPair(jsch, KeyPair.RSA, 2048); if (password.length > 0) { - kpair.setPassphrase(Arrays.toString(password)); + String strPassphase = Arrays.toString(password); + byte[] bytPassphrase = strPassphase.getBytes(StandardCharsets.UTF_8); + kpair.writePrivateKey(privateKeyFile.getAbsolutePath(), bytPassphrase); + } else { + kpair.writePrivateKey(privateKeyFile.getAbsolutePath()); } - kpair.writePrivateKey(privateKeyFile.getAbsolutePath()); kpair.writePublicKey(publicKeyFile.getAbsolutePath(), vcsLogin + "@forIsisFish"); if (log.isInfoEnabled()) { log.info("Finger print: "+kpair.getFingerPrint()); Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnReferenceMap.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnReferenceMap.java 2014-09-26 14:50:24 UTC (rev 4119) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnReferenceMap.java 2014-09-26 15:27:17 UTC (rev 4120) @@ -32,7 +32,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.types.TimeStep; /**

1 0

r4119 - in branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish: logging/console ui/logging/console
by echatellier＠users.forge.codelutin.com Sept. 26, 2014

Sept. 26, 2014

Author: echatellier Date: 2014-09-26 16:50:24 +0200 (Fri, 26 Sep 2014) New Revision: 4119 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4119 Log: Remove deprecated StatusBar Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/logging/console/LogConsoleUI.jaxx Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java 2014-09-26 14:49:54 UTC (rev 4118) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java 2014-09-26 14:50:24 UTC (rev 4119) @@ -45,7 +45,6 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.widget.IconFactory; -import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.ui.logging.console.LogConsoleUI; /** @@ -165,8 +164,6 @@ uiUpdater = new UpdateUI(this); - handler.setStatusBar(getStatusBar()); - log.info(this); } Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java 2014-09-26 14:49:54 UTC (rev 4118) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java 2014-09-26 14:50:24 UTC (rev 4119) @@ -47,7 +47,6 @@ 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; @@ -85,9 +84,6 @@ /** a flag to block scroll bar adjustement events */ protected boolean dontAdjust = true; - /** the console status bar where to notify user events */ - protected StatusBar statusBar; - /** the dialog to send mail */ protected LogMail logMail; @@ -328,8 +324,7 @@ int levels = model.getLevels(); log.info("levels:" + model.levels + ", searchText:" + searchText); - long t0; - t0 = System.currentTimeMillis(); + LineReader parent; // we have a levels filter try { @@ -363,7 +358,6 @@ read(0); dontAdjust = true; model.fireStateChanged(); - getStatusBar().setStatus(t("filter loaded in %1$s ms : found %2$s lines.", (System.currentTimeMillis() - t0), reader.getNbLines())); } catch (IOException e) { log.warn("could not open reader [" + this.reader + "] for reason " + e.getMessage()); } @@ -435,18 +429,9 @@ propertyListeners.removePropertyChangeListener(propertyName, listener); } - public StatusBar getStatusBar() { - return statusBar; - } - - public void setStatusBar(StatusBar statusBar) { - this.statusBar = statusBar; - } - public void openLogMail() { if (logMail==null) { - logMail = new LogMail( - statusBar, + logMail = new LogMail( model.getFrom(), model.getLogFile(), model.getLogFile().getParentFile(), Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java 2014-09-26 14:49:54 UTC (rev 4118) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java 2014-09-26 14:50:24 UTC (rev 4119) @@ -62,7 +62,6 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.util.FileUtil; import org.nuiton.util.ZipUtil; -import org.nuiton.widget.StatusBar; import fr.ifremer.isisfish.ui.logging.console.LogMailUI; @@ -93,24 +92,21 @@ /** default from from mail send */ protected String from; - /** the console status bar where to notify user events */ - protected StatusBar statusBar; - - public LogMail(final StatusBar statusBar, String from, File logFile, File simulationFile, final String smtpServer) { + public LogMail(String from, File logFile, File simulationFile, final String smtpServer) { setTitle(t("isisfish.log.mail.send.title", simulationFile.getName())); this.from = from; this.logFile = logFile; this.simulationFile = simulationFile; this.smtpServer = smtpServer; - this.statusBar = statusBar; sendMail.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { try { sendMail(mailTo.getText(), content.getText(), sendAll.isSelected()); - statusBar.setStatus(t("isisfish.log.mail.send" , to)); } catch (Exception eee) { - statusBar.setStatus(t("isisfish.log.mail.failed", smtpServer)); + if (log.isErrorEnabled()) { + log.error("Can't send email", eee); + } } finally { dispose(); } Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/logging/console/LogConsoleUI.jaxx =================================================================== (Binary files differ)

1 0

r4118 - in branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish: simulator ui/sensitivity
by echatellier＠users.forge.codelutin.com Sept. 26, 2014

Sept. 26, 2014

Author: echatellier Date: 2014-09-26 16:49:54 +0200 (Fri, 26 Sep 2014) New Revision: 4118 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4118 Log: Use generics Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java 2014-09-26 14:17:10 UTC (rev 4117) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java 2014-09-26 14:49:54 UTC (rev 4118) @@ -73,7 +73,7 @@ private static Log log = LogFactory.getLog(MetierMonitor.class); protected Set<Metier> forbiddenMetier = new HashSet<Metier>(); - protected Set<MultiKey> forbiddenMetierMonth = new HashSet<MultiKey>(); + protected Set<MultiKey<Object>> forbiddenMetierMonth = new HashSet<>(); protected Map<TimeStep, MatrixND> noActivity = new HashMap<TimeStep, MatrixND>(); /** @@ -102,11 +102,11 @@ * @param month */ public void addforbiddenMetier(Metier metier, Month month) { - forbiddenMetierMonth.add(new MultiKey(metier, month)); + forbiddenMetierMonth.add(new MultiKey<Object>(metier, month)); } public void removeforbiddenMetier(Metier metier, Month month) { - forbiddenMetierMonth.remove(new MultiKey(metier, month)); + forbiddenMetierMonth.remove(new MultiKey<Object>(metier, month)); } public void addforbiddenMetier(Collection<Metier> metiers) { @@ -131,7 +131,7 @@ public boolean isForbidden(Metier metier, Month month) { boolean result = forbiddenMetier.contains(metier); if (!result) { - result = forbiddenMetierMonth.contains(new MultiKey(metier, month)); + result = forbiddenMetierMonth.contains(new MultiKey<Object>(metier, month)); } return result; } @@ -180,25 +180,25 @@ ////////////////////////////////////////////////////////////////////////// /** key <Metier, Month, Month> value: <Licence> */ - protected MultiKeyMap list = new MultiKeyMap(); + protected MultiKeyMap<Object, Licence> list = new MultiKeyMap<>(); - class Licence { + static class Licence { int nbLicences = 0; double proportionMaxTotal = 0; - Map<Month, Double> proportionsMonth = new HashMap<Month, Double>(); + Map<Month, Double> proportionsMonth = new HashMap<>(); } public Licence getLicence(Metier metier, Month month) { Licence result = null; - for (MapIterator i=list.mapIterator(); i.hasNext();) { - MultiKey keys = (MultiKey)i.next(); + for (MapIterator<MultiKey<? extends Object>, Licence> i = list.mapIterator(); i.hasNext();) { + MultiKey<? extends Object> keys = i.next(); Metier metierKey = (Metier)keys.getKey(0); Month firstMonth = (Month)keys.getKey(1); Month lastMonth = (Month)keys.getKey(2); if (metier.equals(metierKey) && firstMonth.compareTo(month) <= 0 && month.compareTo(lastMonth) <= 0) { - result = (Licence)i.getValue(); + result = i.getValue(); break; } } @@ -211,15 +211,13 @@ o.nbLicences = nbLicences; o.proportionMaxTotal = this.computeProportionMaxTotal(metier, nbLicences); - for (Month i=firstMonth; i.compareTo(lastMonth) <= 0; i=i.next()) { + for (Month i = firstMonth; i.compareTo(lastMonth) <= 0; i = i.next()) { o.proportionsMonth.put(i, computeProportionMonth(metier, i)); - } this.list.put(metier, firstMonth, lastMonth, o); - } - else{ + } else { log.warn("il existe deja une licence touchant le metier: " + metier + " sur la periode:"+ firstMonth + "-" + lastMonth); } @@ -293,7 +291,7 @@ try { // FIXME: Cette methode n'existe pas dans L'ECMAScript :( -// strategies = Regle_libUtil.getStrategiesMetier(metier); + // strategies = Regle_libUtil.getStrategiesMetier(metier); // Je l'ai traduit avec ce qui suit TopiaContext tx = metier.getTopiaContext(); List<SetOfVessels> res = null; @@ -301,7 +299,7 @@ res = tx.findAll("select setOfVessels from fr.ifremer.isisfish.entities.EffortDescription where possibleMetiers=?", metier); - for(SetOfVessels sov : res){ + for(SetOfVessels sov : res) { nbBoat = nbBoat + sov.getNumberOfVessels(); } } catch (TopiaException eee) { Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java 2014-09-26 14:17:10 UTC (rev 4117) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java 2014-09-26 14:49:54 UTC (rev 4118) @@ -74,14 +74,14 @@ private static Log log = LogFactory.getLog(TableBlockingLayerUI.class); /** Parent UI. */ - protected InputContentUI parent; + protected InputContentUI<?> parent; /** * Init layer with parent. * * @param parent parent */ - public TableBlockingLayerUI(InputContentUI parent) { + public TableBlockingLayerUI(InputContentUI<?> parent) { this.parent = parent; }

1 0

r4117 - in branches/4.3.0-log4j2/src/main: java/fr/ifremer/isisfish/simulator java/fr/ifremer/isisfish/ui/input java/fr/ifremer/isisfish/ui/simulator java/fr/ifremer/isisfish/ui/widget resources/i18n
by echatellier＠users.forge.codelutin.com Sept. 26, 2014

Sept. 26, 2014

Author: echatellier Date: 2014-09-26 16:17:10 +0200 (Fri, 26 Sep 2014) New Revision: 4117 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4117 Log: Remove unused filter UI Removed: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/SimulationMeta.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/widget/DummyLayerUI.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/widget/filter/ Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx branches/4.3.0-log4j2/src/main/resources/i18n/isis-fish_fr_FR.properties Deleted: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/SimulationMeta.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/SimulationMeta.java 2014-09-26 13:57:59 UTC (rev 4116) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/SimulationMeta.java 2014-09-26 14:17:10 UTC (rev 4117) @@ -1,125 +0,0 @@ -/* - * #%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 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ifremer.isisfish.simulator; - -import fr.ifremer.isisfish.ui.widget.filter.DateInterval; -import fr.ifremer.isisfish.ui.widget.filter.FilterAcceptor; -import fr.ifremer.isisfish.ui.widget.filter.FilterParamModel; -import fr.ifremer.isisfish.ui.widget.filter.ValueGetter; - -import static org.nuiton.i18n.I18n.t; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; - -/** - * This enum represents all properties on which we can perform search. - * - * Each constant is also used as acceptor for the property it represents (using {@link FilterAcceptor#accept(Object, Object)} - * and permit to access SimulationProperties values with methods - * {@link #getValue(SimulationProperties)} - * and {@link #getDateValue(SimulationProperties)} - */ -public enum SimulationMeta implements ValueGetter<SimulationProperties, Object> { - // text - isisFishVersion(String.class), - description(String.class), - simulationName(String.class), - simulatorName(String.class), - simulationPlanName(String.class), - regionName(String.class), - otherInfo(String.class), - - // int - numberOfYear(Integer.class), - simulationPlanNumber(Integer.class), - - // date interval - simulationInterval(DateInterval.class) { - @Override - public DateInterval getValue(SimulationProperties sim) { - return new DateInterval(simulationStart.getDateValue(sim), simulationEnd.getDateValue(sim)); - } - }, - - // date - simulationStart(Long.class), - simulationEnd(Long.class), - exportTime(Long.class), - - // boolean - useOptimization(Boolean.class), - useSimulationPlan(Boolean.class), - useStatistic(Boolean.class), - usePreScript(Boolean.class), - onlyExport(Boolean.class), - local(Boolean.class); - - // others - //statistic(klazz), - //optimizationUsage(klazz), - //exception(klazz); - - private static final Log log = LogFactory.getLog(SimulationMeta.class); - - private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss"); - private final Class<?> klazz; - - SimulationMeta(Class<?> klazz) { - this.klazz = klazz; - } - - @SuppressWarnings({"unchecked"}) - public FilterParamModel<SimulationProperties, ?> createParamModel() { - return new FilterParamModel<SimulationProperties, Object>(name(), (Class<Object>) getKlazz(), this); - } - - public Class<?> getKlazz() { - return klazz; - } - - public Object getValue(SimulationProperties sim) { - return sim.getData().getProperty(name()); - } - - public long getDateValue(SimulationProperties sim) { - String d = (String) getValue(sim); - Date result = null; - if (d != null) { - try { - result = dateFormat.parse(d); - } catch (ParseException eee) { - if (log.isWarnEnabled()) { - log.warn(t("isisfish.error.parse.date", d), eee); - } - } - } - return result == null ? -1 : result.getTime(); - } -} Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java 2014-09-26 13:57:59 UTC (rev 4116) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java 2014-09-26 14:17:10 UTC (rev 4117) @@ -49,9 +49,6 @@ * <p> * The class is only a properties container, no method to access a data directly * (except to obtain name of underlying simulation). - * <p> - * For this purpose use {@link SimulationMeta#getValue(SimulationProperties)} - * and {@link SimulationMeta#getDateValue(SimulationProperties)} */ public class SimulationProperties { @@ -64,7 +61,7 @@ File simulationDirectory = SimulationStorage.getSimulationDirectory(name); this.name = simulationDirectory.getName(); this.data = new Properties(); - data.put(SimulationMeta.simulationName.name(), this.name); + data.put("simulationName", this.name); loadProperties(SimulationStorage.getSimulationParametersFile(simulationDirectory)); loadProperties(SimulationStorage.getSimulationInformationFile(simulationDirectory)); } Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2014-09-26 13:57:59 UTC (rev 4116) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2014-09-26 14:17:10 UTC (rev 4117) @@ -89,7 +89,6 @@ import fr.ifremer.isisfish.ui.models.common.GenericComboModel; import fr.ifremer.isisfish.ui.sensitivity.wizard.FactorWizardUI; import fr.ifremer.isisfish.ui.sensitivity.wizard.SensitivityWizardHandler; -import fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil; import fr.ifremer.isisfish.vcs.VCSException; /** @@ -320,11 +319,10 @@ */ public void importRegionFromSimulation(InputUI inputUI) { - setStatusMessage(inputUI, t("isisfish.message.import"), true); + /*setStatusMessage(inputUI, t("isisfish.message.import"), true); // first step select a simulation and new region name try { - //TODO Should use a shared model ? List<String> simulationNames = SimulationStorage.getSimulationNames(); String simulationName = SimulationFilterUtil.selectSimulation(simulationNames); if (simulationName != null) { @@ -352,7 +350,7 @@ throw new IsisFishRuntimeException(t("isisfish.error.no.select.simulation"), eee); } - setStatusMessage(inputUI, t("isisfish.message.export.done")); + setStatusMessage(inputUI, t("isisfish.message.export.done"));*/ } /** Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2014-09-26 13:57:59 UTC (rev 4116) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2014-09-26 14:17:10 UTC (rev 4117) @@ -32,7 +32,7 @@ <JMenu text="isisfish.common.region"> <JMenuItem text="isisfish.input.menu.importRegion" onActionPerformed="getHandler().importRegion(this)" /> <JMenuItem text="isisfish.input.menu.importRenameRegion" onActionPerformed="getHandler().importRegionAndRename(this)" /> - <JMenuItem text="isisfish.input.menu.importRegionSimulation" onActionPerformed="getHandler().importRegionFromSimulation(this)" /> + <JMenuItem text="isisfish.input.menu.importRegionSimulation" onActionPerformed="getHandler().importRegionFromSimulation(this)" enabled="false"/> <JMenuItem text="isisfish.input.menu.exportRegion" enabled='{isRegionLoaded()}' onActionPerformed="getHandler().exportRegion(this)" /> <JMenuItem text="isisfish.input.menu.copyRegion" enabled='{isRegionLoaded()}' onActionPerformed="getHandler().copyRegion(this)" /> <JSeparator/> Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2014-09-26 13:57:59 UTC (rev 4116) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2014-09-26 14:17:10 UTC (rev 4117) @@ -288,24 +288,6 @@ simulAction.setStrategies(listSimulParamsStrategies.getSelectedValues()); } -protected void selectFilter() { - try { - java.util.List<String> simulationsNames = fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil.filterSimulation(simulAction.getOldSimulationItem()); - // TODO add " " to not triger event (need to be fixed) - simulationsNames.add(0, " "); - simulAction.setOldSimulatorNames(simulationsNames); - fieldSimulParamsSelect.setModel(getSimulParamsSelectModel(false)); - } catch (ParseException ex) { - if (log.isErrorEnabled()) { - log.error("Can't select simulation filter", ex); - } - } catch (IOException ex) { - if (log.isErrorEnabled()) { - log.error("Can't select simulation filter", ex); - } - } -} - protected ComboBoxModel<String> getSimulParamsSelectModel() { return getSimulParamsSelectModel(false); } Deleted: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/widget/DummyLayerUI.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/widget/DummyLayerUI.java 2014-09-26 13:57:59 UTC (rev 4116) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/widget/DummyLayerUI.java 2014-09-26 14:17:10 UTC (rev 4117) @@ -1,64 +0,0 @@ -/* - * #%L - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2013 Ifremer, Codelutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ifremer.isisfish.ui.widget; - -import java.awt.Color; -import java.awt.Font; -import java.awt.Graphics2D; - -import javax.swing.JComponent; - -import org.jdesktop.jxlayer.JXLayer; -import org.jdesktop.jxlayer.plaf.AbstractLayerUI; - -public class DummyLayerUI extends AbstractLayerUI<JComponent> { - - /** serialVersionUID. */ - private static final long serialVersionUID = 309245880711380974L; - - @Override - protected void paintLayer(Graphics2D g2, JXLayer<? extends JComponent> l) { - super.paintLayer(g2, l); - - // position - //g2.translate(-35, 90); // top left - g2.translate(l.getBounds().getMaxX() - 160, l.getBounds().getMaxY()); // bottom right - - // yellow backgroung - g2.rotate(Math.PI * -42 / 180); - g2.setColor(Color.YELLOW); - g2.fillRect(10, 10, 200, 30); - - // text - g2.translate(70, 15); - g2.setFont(new Font("Dialog", Font.BOLD, 16)); - g2.setColor(Color.BLACK); - g2.drawString("Maquette",10,10); - - // for test only - g2.translate(-3, 10); - g2.setFont(new Font("Dialog", Font.ITALIC, 10)); - g2.setColor(Color.BLACK); - g2.drawString("(non fonctionnelle)",10,10); - } -} Modified: branches/4.3.0-log4j2/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- branches/4.3.0-log4j2/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-09-26 13:57:59 UTC (rev 4116) +++ branches/4.3.0-log4j2/src/main/resources/i18n/isis-fish_fr_FR.properties 2014-09-26 14:17:10 UTC (rev 4117) @@ -598,7 +598,7 @@ isisfish.message.import=Importer %1$s isisfish.message.import.equation.convert=Conversion manuelle de l'équation isisfish.message.import.finished=Import terminé -isisfish.message.import.region.name=Entre le nom de la réegion à importer +isisfish.message.import.region.name=Entrer le nom de la région à importer isisfish.message.import.region.xml=Région XML (ISIS-Fish V2.x) isisfish.message.import.region.zipped=Zipped Region isisfish.message.import.scripts.file=Importer des scripts depuis une archive zip

1 0

r4116 - in branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish: datastore ui/sensitivity ui/sensitivity/model ui/simulator util
by echatellier＠users.forge.codelutin.com Sept. 26, 2014

Sept. 26, 2014

Author: echatellier Date: 2014-09-26 15:57:59 +0200 (Fri, 26 Sep 2014) New Revision: 4116 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4116 Log: Fix deprecated Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListModel.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnGuava.java Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java 2014-09-26 13:57:09 UTC (rev 4115) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java 2014-09-26 13:57:59 UTC (rev 4116) @@ -53,7 +53,7 @@ * Mise a jour: $Date$ * par : $Author$ * - * @deprecated ResultStorageCSV now support no storage and in memory usage + * @deprecated ResultStorageCSV now support no storage and in memory usage, will be removed in version 4.4 */ public class ResultStorageInMemory extends ResultStorageAbstract { Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2014-09-26 13:57:09 UTC (rev 4115) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2014-09-26 13:57:59 UTC (rev 4116) @@ -41,12 +41,11 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.logging.log4j.ThreadContext; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.util.FileUtil; -import org.nuiton.util.Version; import org.nuiton.util.ZipUtil; +import org.nuiton.util.version.Versions; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishDAOHelper; @@ -525,11 +524,9 @@ // mais il faut pouvoir relire les anciennes simulations SimulationParameter param = getParameter(); String isisFishVersion = param.getIsisFishVersion(); - Version simuVersion = new Version(isisFishVersion); - Version version4200 = new Version(4, 2, 0, 0); // instancier un ResultStorage ou un ResultMappedStorage - if (simuVersion.before(version4200)) { + if (Versions.smallerThan(isisFishVersion, "4.2.0.0")) { resultStorage = new ResultDatabaseStorage(this); } else { // if user ask for ResultStorageInMemory, used it Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2014-09-26 13:57:09 UTC (rev 4115) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2014-09-26 13:57:59 UTC (rev 4116) @@ -77,7 +77,7 @@ return getContextValue(SimulAction.class); } - public ComboBoxModel getSensitivityAnalysisModel() { + public ComboBoxModel<String> getSensitivityAnalysisModel() { List<String> sensitivityNames = getSimulAction().getSensitivityAnalysisNames(); SensitivityAnalysisComboModel model = new SensitivityAnalysisComboModel(sensitivityNames); return model; Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListModel.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListModel.java 2014-09-26 13:57:09 UTC (rev 4115) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorListModel.java 2014-09-26 13:57:59 UTC (rev 4116) @@ -42,7 +42,7 @@ * Last update : $Date$ * By : $Author$ */ -public class FactorListModel extends DefaultListModel { +public class FactorListModel extends DefaultListModel<Factor> { /** serialVersionUID. */ private static final long serialVersionUID = 2281927104735245489L; @@ -73,7 +73,7 @@ * @see javax.swing.ListModel#getElementAt(int) */ @Override - public Object getElementAt(int index) { + public Factor getElementAt(int index) { return factors.get(index); } Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2014-09-26 13:57:09 UTC (rev 4115) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2014-09-26 13:57:59 UTC (rev 4116) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2014 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 Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2014-09-26 13:57:09 UTC (rev 4115) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2014-09-26 13:57:59 UTC (rev 4116) @@ -306,7 +306,7 @@ } } -protected ComboBoxModel getSimulParamsSelectModel() { +protected ComboBoxModel<String> getSimulParamsSelectModel() { return getSimulParamsSelectModel(false); } Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnGuava.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnGuava.java 2014-09-26 13:57:09 UTC (rev 4115) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/IsisCacheBackendOnGuava.java 2014-09-26 13:57:59 UTC (rev 4116) @@ -94,7 +94,7 @@ // elle meme qu'elle soit dans le backend ou non est // certainement utilisee ailleur, donc seul la taille // des pointeurs dans la collection est prise ici - result += ((Collection)value).size() * POINTER_SIZE; + result += ((Collection<?>)value).size() * POINTER_SIZE; } else if (value instanceof Number) { // int| double // seulement une valeur, on ajoute 1 @@ -228,7 +228,7 @@ // to keep more memory for JVM sizeCache = Math.min(this.maxCache, amount); - CacheBuilder builder = CacheBuilder.newBuilder(); + CacheBuilder<Object, Object> builder = CacheBuilder.newBuilder(); builder.maximumWeight(sizeCache); builder.weigher(isisWeigher); if (initialCapacity > 0) {

1 0

r4115 - branches/4.3.0-log4j2
by echatellier＠users.forge.codelutin.com Sept. 26, 2014

Sept. 26, 2014

Author: echatellier Date: 2014-09-26 15:57:09 +0200 (Fri, 26 Sep 2014) New Revision: 4115 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4115 Log: Update libs Modified: branches/4.3.0-log4j2/pom.xml Modified: branches/4.3.0-log4j2/pom.xml =================================================================== --- branches/4.3.0-log4j2/pom.xml 2014-09-26 13:46:18 UTC (rev 4114) +++ branches/4.3.0-log4j2/pom.xml 2014-09-26 13:57:09 UTC (rev 4115) @@ -513,7 +513,7 @@ <signatureVersion>1.0</signatureVersion>  - <jaxxVersion>2.12</jaxxVersion> + <jaxxVersion>2.13</jaxxVersion> <eugeneVersion>2.13</eugeneVersion> <topiaVersion>2.9.2</topiaVersion> <hibernateVersion>4.3.6.Final</hibernateVersion>

1 0

r4114 - branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate
by echatellier＠users.forge.codelutin.com Sept. 26, 2014

Sept. 26, 2014

Author: echatellier Date: 2014-09-26 15:46:18 +0200 (Fri, 26 Sep 2014) New Revision: 4114 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4114 Log: Replace ImmutableType by non deprecated UserType Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/MonthType.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/RangeOfValuesType.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeStepType.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeUnitType.java Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java 2014-09-26 13:45:20 UTC (rev 4113) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java 2014-09-26 13:46:18 UTC (rev 4114) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, Code Lutin + * Copyright (C) 2002 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -320,10 +320,12 @@ return cub; } + @Override public Class returnedClass() { return MatrixND.class; } + @Override public boolean equals(Object x, Object y) throws HibernateException { if (x == y) { return true; @@ -334,10 +336,12 @@ } } + @Override public int hashCode(Object x) throws HibernateException { return x.hashCode(); } + @Override public Object deepCopy(Object value) throws HibernateException { if (value == null) { return null; @@ -345,14 +349,17 @@ return MatrixFactory.getInstance().create((MatrixND)value); } + @Override public String[] getPropertyNames() { return propertyNames; } + @Override public Type[] getPropertyTypes() { return hibernateTypes; } + @Override public Object getPropertyValue(Object component, int property) throws HibernateException { MatrixND matrix = (MatrixND)component; switch (property) { @@ -365,6 +372,7 @@ } } + @Override public void setPropertyValue(Object component, int property, Object value) throws HibernateException { MatrixND matrix = (MatrixND)component; switch (property) { @@ -383,6 +391,7 @@ } } + @Override public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor session, Object owner) throws HibernateException, SQLException { MatrixND matrix = null; @@ -413,6 +422,7 @@ return matrix; } + @Override public void nullSafeSet(PreparedStatement st, Object value, int index, SessionImplementor session) throws HibernateException, SQLException { if (value == null) { st.setString(index, null); @@ -431,6 +441,7 @@ } } + @Override public Serializable disassemble(Object value, SessionImplementor session) throws HibernateException { MatrixND matrix = (MatrixND)value; return new Serializable[] { @@ -442,6 +453,7 @@ }; } + @Override public Object assemble(Serializable cached, SessionImplementor session, Object owner) throws HibernateException { Serializable[] o = (Serializable[])cached; String name = (String)o[0]; @@ -458,6 +470,7 @@ return matrix; } + @Override public Object replace(Object original, Object target, SessionImplementor session, Object owner) throws HibernateException { return assemble( disassemble(original, session), session, owner); } Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/MonthType.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/MonthType.java 2014-09-26 13:45:20 UTC (rev 4113) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/MonthType.java 2014-09-26 13:46:18 UTC (rev 4114) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, Code Lutin + * Copyright (C) 2002 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -25,13 +25,15 @@ package fr.ifremer.isisfish.types.hibernate; +import java.io.Serializable; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; import org.hibernate.HibernateException; -import org.hibernate.type.ImmutableType; +import org.hibernate.engine.spi.SessionImplementor; +import org.hibernate.usertype.UserType; import fr.ifremer.isisfish.types.Month; @@ -46,65 +48,74 @@ * Mise a jour: $Date$ * par : $Author$ */ -public class MonthType extends ImmutableType { +public class MonthType implements UserType { - /** serialVersionUID. */ - private static final long serialVersionUID = 6151047526309798890L; + @Override + public int[] sqlTypes() { + return new int[] {Types.INTEGER}; + } - /* (non-Javadoc) - * @see org.hibernate.type.NullableType#get(java.sql.ResultSet, java.lang.String) - */ @Override - public Object get(ResultSet rs, String name) throws HibernateException, - SQLException { - return Month.MONTH[rs.getInt(name)]; + public Class returnedClass() { + return Month.class; } - /* (non-Javadoc) - * @see org.hibernate.type.NullableType#set(java.sql.PreparedStatement, java.lang.Object, int) - */ @Override - public void set(PreparedStatement st, Object value, int index) - throws HibernateException, SQLException { - st.setInt(index, ((Month) value).getMonthNumber()); + public boolean equals(Object x, Object y) throws HibernateException { + if (x == y) { + return true; + } + if (null == x || null == y) { + return false; + } + return x.equals(y); } - /* (non-Javadoc) - * @see org.hibernate.type.NullableType#sqlType() - */ @Override - public int sqlType() { - return Types.INTEGER; + public int hashCode(Object x) throws HibernateException { + return x.hashCode(); } - /* (non-Javadoc) - * @see org.hibernate.type.NullableType#toString(java.lang.Object) - */ @Override - public String toString(Object value) throws HibernateException { - return ((Month)value).toString(); + public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor session, Object owner) throws HibernateException, SQLException { + Object result = null; + if (!rs.wasNull()) { + result = Month.MONTH[rs.getInt(names[0])]; + } + return result; } - /* (non-Javadoc) - * @see org.hibernate.type.NullableType#fromStringValue(java.lang.String) - */ @Override - public Object fromStringValue(String xml) throws HibernateException { - return Month.MONTH[Integer.parseInt(xml)]; + public void nullSafeSet(PreparedStatement st, Object value, int index, SessionImplementor session) throws HibernateException, SQLException { + if (value == null) { + st.setNull(index, sqlTypes()[0]); + } else { + st.setInt(index, ((Month) value).getMonthNumber()); + } } - /* (non-Javadoc) - * @see org.hibernate.type.Type#getReturnedClass() - */ - public Class getReturnedClass() { - return Month.class; + @Override + public Object deepCopy(Object value) throws HibernateException { + return value; } - /* (non-Javadoc) - * @see org.hibernate.type.Type#getName() - */ - public String getName() { - return MonthType.class.getName(); + @Override + public boolean isMutable() { + return false; } + @Override + public Serializable disassemble(Object value) throws HibernateException { + return (Month)value; + } + + @Override + public Object assemble(Serializable cached, Object owner) throws HibernateException { + return cached; + } + + @Override + public Object replace(Object original, Object target, Object owner) throws HibernateException { + return original; + } } Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/RangeOfValuesType.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/RangeOfValuesType.java 2014-09-26 13:45:20 UTC (rev 4113) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/RangeOfValuesType.java 2014-09-26 13:46:18 UTC (rev 4114) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, Code Lutin + * Copyright (C) 2002 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -25,13 +25,15 @@ package fr.ifremer.isisfish.types.hibernate; +import java.io.Serializable; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; import org.hibernate.HibernateException; -import org.hibernate.type.ImmutableType; +import org.hibernate.engine.spi.SessionImplementor; +import org.hibernate.usertype.UserType; import fr.ifremer.isisfish.types.RangeOfValues; @@ -46,65 +48,74 @@ * Mise a jour: $Date$ * par : $Author$ */ -public class RangeOfValuesType extends ImmutableType { +public class RangeOfValuesType implements UserType { - /** serialVersionUID. */ - private static final long serialVersionUID = -5295147041590169149L; + @Override + public int[] sqlTypes() { + return new int[] {Types.VARCHAR}; + } - /* (non-Javadoc) - * @see org.hibernate.type.NullableType#get(java.sql.ResultSet, java.lang.String) - */ @Override - public Object get(ResultSet rs, String name) throws HibernateException, - SQLException { - return new RangeOfValues(rs.getString(name)); + public Class returnedClass() { + return RangeOfValues.class; } - /* (non-Javadoc) - * @see org.hibernate.type.NullableType#set(java.sql.PreparedStatement, java.lang.Object, int) - */ @Override - public void set(PreparedStatement st, Object value, int index) - throws HibernateException, SQLException { - st.setString(index, ((RangeOfValues) value).getAsString()); + public boolean equals(Object x, Object y) throws HibernateException { + if (x == y) { + return true; + } + if (null == x || null == y) { + return false; + } + return x.equals(y); } - /* (non-Javadoc) - * @see org.hibernate.type.NullableType#sqlType() - */ @Override - public int sqlType() { - return Types.VARCHAR; + public int hashCode(Object x) throws HibernateException { + return x.hashCode(); } - /* (non-Javadoc) - * @see org.hibernate.type.NullableType#toString(java.lang.Object) - */ @Override - public String toString(Object value) throws HibernateException { - return ((RangeOfValues)value).getAsString(); + public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor session, Object owner) throws HibernateException, SQLException { + Object result = null; + if (!rs.wasNull()) { + result = new RangeOfValues(rs.getString(names[0])); + } + return result; } - /* (non-Javadoc) - * @see org.hibernate.type.NullableType#fromStringValue(java.lang.String) - */ @Override - public Object fromStringValue(String xml) throws HibernateException { - return new RangeOfValues(xml); + public void nullSafeSet(PreparedStatement st, Object value, int index, SessionImplementor session) throws HibernateException, SQLException { + if (value == null) { + st.setNull(index, sqlTypes()[0]); + } else { + st.setString(index, ((RangeOfValues) value).getAsString()); + } } - /* (non-Javadoc) - * @see org.hibernate.type.Type#getReturnedClass() - */ - public Class getReturnedClass() { - return RangeOfValues.class; + @Override + public Object deepCopy(Object value) throws HibernateException { + return value; } - /* (non-Javadoc) - * @see org.hibernate.type.Type#getName() - */ - public String getName() { - return RangeOfValuesType.class.getName(); + @Override + public boolean isMutable() { + return false; } + @Override + public Serializable disassemble(Object value) throws HibernateException { + return (RangeOfValues)value; + } + + @Override + public Object assemble(Serializable cached, Object owner) throws HibernateException { + return cached; + } + + @Override + public Object replace(Object original, Object target, Object owner) throws HibernateException { + return original; + } } Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeStepType.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeStepType.java 2014-09-26 13:45:20 UTC (rev 4113) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeStepType.java 2014-09-26 13:46:18 UTC (rev 4114) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2011 Ifremer, Code Lutin, Chatellier Eric + * Copyright (C) 2002 - 2014 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 @@ -25,13 +25,15 @@ package fr.ifremer.isisfish.types.hibernate; +import java.io.Serializable; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; import org.hibernate.HibernateException; -import org.hibernate.type.ImmutableType; +import org.hibernate.engine.spi.SessionImplementor; +import org.hibernate.usertype.UserType; import fr.ifremer.isisfish.types.TimeStep; @@ -46,65 +48,74 @@ * Mise a jour: $Date$ * par : $Author$ */ -public class TimeStepType extends ImmutableType { +public class TimeStepType implements UserType { - /** serialVersionUID. */ - private static final long serialVersionUID = -5295147041590169149L; + @Override + public int[] sqlTypes() { + return new int[] {Types.INTEGER}; + } - /* - * @see org.hibernate.type.NullableType#get(java.sql.ResultSet, java.lang.String) - */ @Override - public Object get(ResultSet rs, String name) throws HibernateException, - SQLException { - return new TimeStep(rs.getInt(name)); + public Class returnedClass() { + return TimeStep.class; } - /* - * @see org.hibernate.type.NullableType#set(java.sql.PreparedStatement, java.lang.Object, int) - */ @Override - public void set(PreparedStatement st, Object value, int index) - throws HibernateException, SQLException { - st.setInt(index, ((TimeStep) value).getStep()); + public boolean equals(Object x, Object y) throws HibernateException { + if (x == y) { + return true; + } + if (null == x || null == y) { + return false; + } + return x.equals(y); } - /* - * @see org.hibernate.type.NullableType#sqlType() - */ @Override - public int sqlType() { - return Types.INTEGER; + public int hashCode(Object x) throws HibernateException { + return x.hashCode(); } - /* - * @see org.hibernate.type.NullableType#toString(java.lang.Object) - */ @Override - public String toString(Object value) throws HibernateException { - return ((TimeStep)value).toString(); + public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor session, Object owner) throws HibernateException, SQLException { + Object result = null; + if (!rs.wasNull()) { + result = new TimeStep(rs.getInt(names[0])); + } + return result; } - /* - * @see org.hibernate.type.NullableType#fromStringValue(java.lang.String) - */ @Override - public Object fromStringValue(String xml) throws HibernateException { - return new TimeStep(Integer.parseInt(xml)); + public void nullSafeSet(PreparedStatement st, Object value, int index, SessionImplementor session) throws HibernateException, SQLException { + if (value == null) { + st.setNull(index, sqlTypes()[0]); + } else { + st.setInt(index, ((TimeStep) value).getStep()); + } } - /* - * @see org.hibernate.type.Type#getReturnedClass() - */ - public Class getReturnedClass() { - return TimeStep.class; + @Override + public Object deepCopy(Object value) throws HibernateException { + return value; } - /* - * @see org.hibernate.type.Type#getName() - */ - public String getName() { - return TimeStepType.class.getName(); + @Override + public boolean isMutable() { + return false; } + @Override + public Serializable disassemble(Object value) throws HibernateException { + return (TimeStep)value; + } + + @Override + public Object assemble(Serializable cached, Object owner) throws HibernateException { + return cached; + } + + @Override + public Object replace(Object original, Object target, Object owner) throws HibernateException { + return original; + } } Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeUnitType.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeUnitType.java 2014-09-26 13:45:20 UTC (rev 4113) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeUnitType.java 2014-09-26 13:46:18 UTC (rev 4114) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, Code Lutin + * Copyright (C) 2002 - 2014 Ifremer, Code Lutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -25,13 +25,15 @@ package fr.ifremer.isisfish.types.hibernate; +import java.io.Serializable; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; import org.hibernate.HibernateException; -import org.hibernate.type.ImmutableType; +import org.hibernate.engine.spi.SessionImplementor; +import org.hibernate.usertype.UserType; import fr.ifremer.isisfish.types.TimeUnit; @@ -46,65 +48,74 @@ * Mise a jour: $Date$ * par : $Author$ */ -public class TimeUnitType extends ImmutableType { +public class TimeUnitType implements UserType { - /** serialVersionUID. */ - private static final long serialVersionUID = -5295147041590169149L; + @Override + public int[] sqlTypes() { + return new int[] {Types.DOUBLE}; + } - /* (non-Javadoc) - * @see org.hibernate.type.NullableType#get(java.sql.ResultSet, java.lang.String) - */ @Override - public Object get(ResultSet rs, String name) throws HibernateException, - SQLException { - return new TimeUnit(rs.getDouble(name)); + public Class returnedClass() { + return TimeUnit.class; } - /* (non-Javadoc) - * @see org.hibernate.type.NullableType#set(java.sql.PreparedStatement, java.lang.Object, int) - */ @Override - public void set(PreparedStatement st, Object value, int index) - throws HibernateException, SQLException { - st.setDouble(index, ((TimeUnit) value).getTime()); + public boolean equals(Object x, Object y) throws HibernateException { + if (x == y) { + return true; + } + if (null == x || null == y) { + return false; + } + return x.equals(y); } - /* (non-Javadoc) - * @see org.hibernate.type.NullableType#sqlType() - */ @Override - public int sqlType() { - return Types.DOUBLE; + public int hashCode(Object x) throws HibernateException { + return x.hashCode(); } - /* (non-Javadoc) - * @see org.hibernate.type.NullableType#toString(java.lang.Object) - */ @Override - public String toString(Object value) throws HibernateException { - return ((TimeUnit)value).toString(); + public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor session, Object owner) throws HibernateException, SQLException { + Object result = null; + if (!rs.wasNull()) { + result = new TimeUnit(rs.getDouble(names[0])); + } + return result; } - /* (non-Javadoc) - * @see org.hibernate.type.NullableType#fromStringValue(java.lang.String) - */ @Override - public Object fromStringValue(String xml) throws HibernateException { - return new TimeUnit(Double.parseDouble(xml)); + public void nullSafeSet(PreparedStatement st, Object value, int index, SessionImplementor session) throws HibernateException, SQLException { + if (value == null) { + st.setNull(index, sqlTypes()[0]); + } else { + st.setDouble(index, ((TimeUnit) value).getTime()); + } } - /* (non-Javadoc) - * @see org.hibernate.type.Type#getReturnedClass() - */ - public Class getReturnedClass() { - return TimeUnit.class; + @Override + public Object deepCopy(Object value) throws HibernateException { + return value; } - /* (non-Javadoc) - * @see org.hibernate.type.Type#getName() - */ - public String getName() { - return TimeUnitType.class.getName(); + @Override + public boolean isMutable() { + return false; } + @Override + public Serializable disassemble(Object value) throws HibernateException { + return (TimeUnit)value; + } + + @Override + public Object assemble(Serializable cached, Object owner) throws HibernateException { + return cached; + } + + @Override + public Object replace(Object original, Object target, Object owner) throws HibernateException { + return original; + } }

1 0

r4113 - branches/4.3.0-log4j2/src/test/java/fr/ifremer/isisfish/ui/widget
by echatellier＠users.forge.codelutin.com Sept. 26, 2014

Sept. 26, 2014

Author: echatellier Date: 2014-09-26 15:45:20 +0200 (Fri, 26 Sep 2014) New Revision: 4113 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4113 Log: Remove unused mock Removed: branches/4.3.0-log4j2/src/test/java/fr/ifremer/isisfish/ui/widget/filter/

1 0

r4112 - branches/4.3.0-log4j2
by echatellier＠users.forge.codelutin.com Sept. 26, 2014

Sept. 26, 2014

Author: echatellier Date: 2014-09-26 15:43:42 +0200 (Fri, 26 Sep 2014) New Revision: 4112 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4112 Log: Update libs Modified: branches/4.3.0-log4j2/pom.xml Modified: branches/4.3.0-log4j2/pom.xml =================================================================== --- branches/4.3.0-log4j2/pom.xml 2014-09-09 14:14:28 UTC (rev 4111) +++ branches/4.3.0-log4j2/pom.xml 2014-09-26 13:43:42 UTC (rev 4112) @@ -27,7 +27,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>3.0-rc-1</version> + <version>3.0-rc-2</version> <scope>compile</scope> </dependency> @@ -513,7 +513,7 @@ <signatureVersion>1.0</signatureVersion>  - <jaxxVersion>2.11</jaxxVersion> + <jaxxVersion>2.12</jaxxVersion> <eugeneVersion>2.13</eugeneVersion> <topiaVersion>2.9.2</topiaVersion> <hibernateVersion>4.3.6.Final</hibernateVersion>

1 0

r4111 - branches/4.3.0-log4j2
by echatellier＠users.forge.codelutin.com Sept. 9, 2014

Sept. 9, 2014

Author: echatellier Date: 2014-09-09 16:14:28 +0200 (Tue, 09 Sep 2014) New Revision: 4111 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4111 Log: Update to openmap 5.1.3 Modified: branches/4.3.0-log4j2/pom.xml Modified: branches/4.3.0-log4j2/pom.xml =================================================================== --- branches/4.3.0-log4j2/pom.xml 2014-09-09 13:50:45 UTC (rev 4110) +++ branches/4.3.0-log4j2/pom.xml 2014-09-09 14:14:28 UTC (rev 4111) @@ -279,7 +279,7 @@ <dependency> <groupId>com.bbn</groupId> <artifactId>openmap</artifactId> - <version>5.0.4</version> + <version>5.1.3</version> <scope>compile</scope> </dependency>

1 0

r4110 - in branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish: logging util
by echatellier＠users.forge.codelutin.com Sept. 9, 2014

Sept. 9, 2014

Author: echatellier Date: 2014-09-09 15:50:45 +0200 (Tue, 09 Sep 2014) New Revision: 4110 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4110 Log: Fix javadoc Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/DependencyUtil.java Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2014-09-09 13:19:26 UTC (rev 4109) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2014-09-09 13:50:45 UTC (rev 4110) @@ -45,17 +45,8 @@ * Usefull class for dealing with hot configuration of log4J. this is temporary * we must find a way to abstract this layer. * - * the class offers three public static methods : - * - * {@link #addSimulationAppender(String, String, String, String, String, String)} - * to add a logger for a given simulation in a given thread, with simulLogLevel, - * scriptLogLvel and libLogLevel given. - * * {@code #removeAppender(String, String)} to remove a appender of a simulation * - * {@link #showSimulationLogConsole(String)} to display the log console of - * a simulation, given his name. - * * @author chemit */ public class SimulationLoggerUtil { Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/DependencyUtil.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/DependencyUtil.java 2014-09-09 13:19:26 UTC (rev 4109) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/DependencyUtil.java 2014-09-09 13:50:45 UTC (rev 4110) @@ -121,7 +121,7 @@ /** * Extrait les dépendences d'une class compilé à partir de son bytecode. * - * @param clazz la classe à analyser + * @param clazzStream la classe à analyser * @return extract class set */ protected static Set<String> extractDependencies(InputStream clazzStream) {

1 0

r4109 - branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/map
by echatellier＠users.forge.codelutin.com Sept. 9, 2014

Sept. 9, 2014

Author: echatellier Date: 2014-09-09 15:19:26 +0200 (Tue, 09 Sep 2014) New Revision: 4109 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4109 Log: Remove sysout Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/map/DefaultScale.java Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/map/DefaultScale.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/map/DefaultScale.java 2014-09-09 13:17:25 UTC (rev 4108) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/map/DefaultScale.java 2014-09-09 13:19:26 UTC (rev 4109) @@ -92,7 +92,6 @@ } public int getValueAsRGB(double value) { - System.out.println(value); return (int) (value / (getMax() / 255.0)); }

1 0

r4108 - in branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish: map simulator
by echatellier＠users.forge.codelutin.com Sept. 9, 2014

Sept. 9, 2014

Author: echatellier Date: 2014-09-09 15:17:25 +0200 (Tue, 09 Sep 2014) New Revision: 4108 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4108 Log: fixes #5646: gestion des resultats n?\195?\169gatifs pour affichage sur la carte Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/map/DefaultScale.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/map/Motif.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/map/Scale.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/map/DefaultScale.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/map/DefaultScale.java 2014-09-09 10:06:34 UTC (rev 4107) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/map/DefaultScale.java 2014-09-09 13:17:25 UTC (rev 4108) @@ -92,15 +92,8 @@ } public int getValueAsRGB(double value) { + System.out.println(value); return (int) (value / (getMax() / 255.0)); } - public double getValueAsSqrtScale(double value) { - double scale = getValueAsScale(value); - if (scale < 0) { - return 0; - } - return Math.sqrt(scale); - } - } // DefaultScale Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/map/Motif.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/map/Motif.java 2014-09-09 10:06:34 UTC (rev 4107) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/map/Motif.java 2014-09-09 13:17:25 UTC (rev 4108) @@ -197,8 +197,14 @@ Scale sc, DataMap datamap) { if (datamap.getValue() != 0) { int rgb = sc.getValueAsRGB(datamap.getValue()); + + // see http://forge.codelutin.com/issues/5646 + // cela peut se produire en cas de résultat incohérents + if (rgb < 0) { + rgb = 0; + } + Color lColor = new Color(255 - rgb, 255 - rgb, 255 - rgb, 255); - Color fColor = new Color(255 - rgb, 255 - rgb, 255 - rgb, 255); OMRect omrect; Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/map/Scale.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/map/Scale.java 2014-09-09 10:06:34 UTC (rev 4107) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/map/Scale.java 2014-09-09 13:17:25 UTC (rev 4108) @@ -48,12 +48,4 @@ public int getValueAsRGB(double value); - /** - * Get the corresponding square root value between 0.0 and 1.0. - * - * @param value value to get sqrt scale - * @return sqrt scale - */ - public double getValueAsSqrtScale(double value); - } // Scale Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2014-09-09 10:06:34 UTC (rev 4107) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2014-09-09 13:17:25 UTC (rev 4108) @@ -541,7 +541,7 @@ * * Default to "info". * - * @return simualtor log level + * @return simulator log level */ public String getSimulLogLevel();

1 0

r4107 - in branches/4.3.0-log4j2: . src/main/java/fr/ifremer/isisfish/simulator/launcher src/main/java/fr/ifremer/isisfish/util src/test/java/fr/ifremer/isisfish/simulator src/test/java/fr/ifremer/isisfish/simulator/launcher src/test/java/fr/ifremer/isisfish/util
by echatellier＠users.forge.codelutin.com Sept. 9, 2014

Sept. 9, 2014

Author: echatellier Date: 2014-09-09 12:06:34 +0200 (Tue, 09 Sep 2014) New Revision: 4107 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4107 Log: fixes #568: D?\195?\169pendances non incluses dans la simulation Modified: branches/4.3.0-log4j2/pom.xml branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/DependencyUtil.java branches/4.3.0-log4j2/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java branches/4.3.0-log4j2/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java branches/4.3.0-log4j2/src/test/java/fr/ifremer/isisfish/util/DependencyUtilTest.java Modified: branches/4.3.0-log4j2/pom.xml =================================================================== --- branches/4.3.0-log4j2/pom.xml 2014-09-01 11:05:03 UTC (rev 4106) +++ branches/4.3.0-log4j2/pom.xml 2014-09-09 10:06:34 UTC (rev 4107) @@ -216,10 +216,10 @@ </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.7.7</version> - <scope>runtime</scope> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.7</version> + <scope>runtime</scope> </dependency> <dependency> @@ -323,6 +323,12 @@ <artifactId>ssj</artifactId> <version>2.5</version> <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>dsol</groupId> + <artifactId>dsol-xml</artifactId> + </exclusion> + </exclusions> </dependency>  @@ -342,10 +348,6 @@ <groupId>com.jcraft</groupId> </exclusion> <exclusion> - <artifactId>sqljet</artifactId> - <groupId>org.tmatesoft.sqljet</groupId> - </exclusion> - <exclusion> <artifactId>platform</artifactId> <groupId>net.java.dev.jna</groupId> </exclusion> Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2014-09-01 11:05:03 UTC (rev 4106) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2014-09-09 10:06:34 UTC (rev 4107) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2012 Ifremer, Code Lutin, Benjamin Poussin, Chatellier Eric + * Copyright (C) 2002 - 2014 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 @@ -47,8 +47,9 @@ import java.util.concurrent.Executors; import org.apache.commons.beanutils.BeanUtils; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; +import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.mutable.MutableInt; import org.apache.commons.lang3.time.DurationFormatUtils; @@ -96,6 +97,7 @@ import fr.ifremer.isisfish.simulator.sensitivity.SensitivityUtils; import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; import fr.ifremer.isisfish.util.CompileHelper; +import fr.ifremer.isisfish.util.DependencyUtil; /** * Cette classe est responsable de conservation de toutes les simulations faites @@ -193,14 +195,6 @@ log.warn(t("Can't instantiate %s", value), eee); } } - - // fait un appel au moniteur - // pour reprendre le monitoring des simulation en cours - // TODO check this, don't restart monitoring on non ui launch - // moved to main() - //if (IsisFish.config.isLaunchUI()) { - // SimulationMonitor.getInstance().reloadConfig(this); - //} } /** @@ -403,7 +397,7 @@ } // on construit le zip de la simulation - File zip = prepareSimulationZipFile(control, localParameters, null, null, true); + File zip = prepareSimulationZipFile(control, localParameters, null, null); item.setSimulationZip(zip); if (localParameters.getUseSimulationPlan() && localParameters.isIndependentPlan()) { @@ -481,7 +475,7 @@ // on construit le zip de la simulation // in zip, there will be param "without" prescript - File zip = prepareSimulationZipFile(controlJustForZip, localParameters, xmlDesignPlan, sensitivityScenarios, true); + File zip = prepareSimulationZipFile(controlJustForZip, localParameters, xmlDesignPlan, sensitivityScenarios); // for each simulation, we neeed to launch a specific simulation // new simulation ids will be id + "_" + x @@ -715,48 +709,35 @@ * @param param les parametre de la simulation * @param xmlDesignPlan contenu xml des design plan * @param sensitivityScenarios used to add some extra files (such as rules) - * @param compile si vrai la version compile des fichiers Java est aussi - * mise dans le fichier zip. Cela peut servir pour les simulations locales - * pour ne pas recompiler pour chaque simulation avec plan de simulation * @return un zip de simulation pour une simulation pret a être faite * @throws SimulationException pour tout problème rencontré (IO,Topia...) */ protected File prepareSimulationZipFile(SimulationControl control, - SimulationParameter param, String xmlDesignPlan, SensitivityScenarios sensitivityScenarios, boolean compile) + SimulationParameter param, String xmlDesignPlan, SensitivityScenarios sensitivityScenarios) throws SimulationException { + try { - File tmpDirectory = FileUtil.createTempDirectory( - "isisfish-simulation-", "-preparation"); - //File regionXML = IsisConfig.getDataBackupFile(tmpDirectory); - File regionXML = new File(tmpDirectory, - SimulationStorage.DATA_BACKUP_FILENAME); + File tmpDirectory = FileUtil.createTempDirectory("isisfish-simulation-", "-preparation"); // sauvegarde des parametres Properties prop = param.toProperties(); - //File f = IsisConfig.getSimulationParametersFile(tmpDirectory); File f = new File(tmpDirectory, SimulationStorage.PARAMETERS_FILENAME); - FileOutputStream out = null; - try { - out = new FileOutputStream(f); + try (FileOutputStream out = new FileOutputStream(f)) { prop.store(out, "Parameters"); - } finally { - IOUtils.closeQuietly(out); } // backup pour toutes les simulations, pour eviter que l'utilisateur // ne puisse le modifier en meme temps control.setText(t("isisfish.message.backup.database.progress")); - RegionStorage region = RegionStorage.getRegion(param - .getRegionName()); + File regionBackup = new File(tmpDirectory, SimulationStorage.DATA_BACKUP_FILENAME); + RegionStorage region = RegionStorage.getRegion(param.getRegionName()); TopiaContext tc = region.getStorage().beginTransaction(); - tc.backup(regionXML, true); + tc.backup(regionBackup, true); tc.closeContext(); control.setText(t("isisfish.message.backup.database.finished")); - // copie de toutes regles a utiliser + // extract Rules defined in factors List<Rule> rules = param.getRules(); - - // FIXME small hack to add rules defined in simulations factors if (sensitivityScenarios != null) { for (Scenario sensitivityScenario : sensitivityScenarios.getScenarios()) { List<Factor> factors = sensitivityScenario.getFactors(); @@ -865,13 +846,6 @@ } } - // copie de tous les scripts a utiliser - // les script officiel prevalent sur les scripts communautés - FileUtil.copyRecursively(ScriptStorage.getCommunityScriptDirectory(), - tmpDirectory, ".*\\.java$"); - FileUtil.copyRecursively(ScriptStorage.getScriptDirectory(), - tmpDirectory, ".*\\.java$"); - // copie de tous les simulateurs a utiliser File simulatorFile = new File(SimulatorStorage.getSimulatorDirectory(), param.getSimulatorName()); if (!simulatorFile.isFile()) { @@ -881,14 +855,10 @@ SimulatorStorage.SIMULATOR_PATH + File.separator + param.getSimulatorName())); - // convert all file to UTF-8 - //convertAllFile(control, tmpDirectory); - - if (compile) { - compileAllFile(control, tmpDirectory); - } + // compile and add dependencies + compileAllFile(control, tmpDirectory); - // Sauvegarde du design plan en XML + // sauvegarde du design plan en XML if (!StringUtils.isEmpty(xmlDesignPlan)) { File simulationDesignPlanFile = SimulationStorage.getMexicoDesignPlan(tmpDirectory); FileUtils.writeStringToFile(simulationDesignPlanFile, xmlDesignPlan, "utf-8"); @@ -915,47 +885,6 @@ } - /* - * Convertit tous les fichiers du répertoire directory en UTF-8, - * pour eviter les erreurs d'encodage du la compilation - * sur un autre systeme ne supportant pas l'encodage courant. - * - * @param control le controleur - * @param directory le répertoire a convertir - * - protected void convertAllFile(SimulationControl control, File directory) { - - control.setText("Converting file to unicode"); - - List<File> fileToConvert = new ArrayList<File>(); - - List<File> tmp = FileUtil.find(new File(directory, - ExportStorage.EXPORT_PATH), ".*\\.java$", true); - fileToConvert.addAll(tmp); - - tmp = FileUtil.find(new File(directory, - SensitivityExportStorage.SENSITIVITY_EXPORT_PATH), ".*\\.java$", true); - fileToConvert.addAll(tmp); - - tmp = FileUtil.find(new File(directory, RuleStorage.RULE_PATH), - ".*\\.java$", true); - fileToConvert.addAll(tmp); - - tmp = FileUtil.find(new File(directory, - SimulationPlanStorage.SIMULATION_PLAN_PATH), ".*\\.java$", true); - fileToConvert.addAll(tmp); - - tmp = FileUtil.find( - new File(directory, SimulatorStorage.SIMULATOR_PATH), - ".*\\.java$", true); - fileToConvert.addAll(tmp); - - // - // Convertion - // - //CompileHelper.convertToUnicode(fileToConvert); - }*/ - /** * Compile les fichiers présent dans le répertoire passé en * parametre, ce répertoire est hiérarchisé en: rules, exports, simulators @@ -967,19 +896,21 @@ * * @param control le controleur * @param directory le répertoire où compiler + * @throws IOException */ - protected void compileAllFile(SimulationControl control, File directory) { + protected void compileAllFile(SimulationControl control, File directory) throws IOException { control.setText(t("isisfish.simulation.message.scriptscompilation")); long currentTime = System.nanoTime(); - // // Recherche des fichiers a compiler // On ne prend pas les scripts, car ils sont tous copiés mais pas // forcément util. Lors de la compilation des autres fichiers, les // script servant réellement seront automatiquement compilé - List<File> fileToCompile = new ArrayList<File>(); + List<File> fileToCompile = new ArrayList<>(); // *.java + List<File> fileToInpect = new ArrayList<>(); // *.class + Set<String> dependencies = new HashSet<String>(); // packages String[] modules = { ExportStorage.EXPORT_PATH, @@ -990,17 +921,46 @@ SimulationPlanStorage.SIMULATION_PLAN_PATH, SimulatorStorage.SIMULATOR_PATH }; - + for (String module : modules) { - List<File> tmp = FileUtil.find(new File(directory, module), ".*\\.java$", true); + File moduleDir = new File(directory, module); + List<File> tmp = FileUtil.find(moduleDir, ".*\\.java$", true); fileToCompile.addAll(tmp); + for (File srcFile : tmp) { + // source + fileToCompile.add(srcFile); + // class + File classFile = new File(srcFile.getAbsolutePath().replaceFirst("\\.java", ".class")); + fileToInpect.add(classFile); + // package + dependencies.add(module + "." + FilenameUtils.getBaseName(srcFile.getName())); + } } // // Compilation // - CompileHelper.compile(directory, fileToCompile, directory, null); + + // + // Check dependencies + // + Set<String> allDeps = DependencyUtil.extractDependencies(directory, fileToInpect); + Collection<String> missingDeps = CollectionUtils.subtract(allDeps, dependencies); + for (String missingDep : missingDeps) { + String relativePath = missingDep.replace('.', File.separatorChar) + ".java"; + // try official first + File srcFile = new File(IsisFish.config.getContextDatabaseDirectory(), relativePath); + if (!srcFile.isFile()) { + // if official file not exists, look for community file + srcFile = new File(IsisFish.config.getCommunityDatabaseDirectory(), missingDep.replace('.', File.separatorChar) + ".java"); + } + File destFile = new File(directory, missingDep.replace('.', File.separatorChar) + ".java"); + FileUtils.copyFile(srcFile, destFile); + } + // there is no need to compile this dependancies, they have been compiled by first compilation + // only add missing java files + long time = System.nanoTime() - currentTime; control.setText(t("isisfish.message.compilation.time", DurationFormatUtils.formatDuration(time / 1000000, "s'.'S"))); Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/DependencyUtil.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/DependencyUtil.java 2014-09-01 11:05:03 UTC (rev 4106) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/DependencyUtil.java 2014-09-09 10:06:34 UTC (rev 4107) @@ -25,8 +25,13 @@ package fr.ifremer.isisfish.util; +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collection; import java.util.HashSet; import java.util.Set; import java.util.regex.Matcher; @@ -70,21 +75,56 @@ * Extrait les dépendences d'une class compilé à partir de son bytecode en ne conservant que * les dependances des scripts utilisateurs. * - * @param clazz la classe à analyser + * @param rootDirectory + * @param files ensemble de fichier à analyzer (fichiers .class) * @return extract class set */ - public static Set<String> extractDependencies(Class<?> clazz) { - return extractDependencies(clazz, true); + public static Set<String> extractDependencies(File rootDirectory, Collection<File> files) { + Set<String> deps = new HashSet<String>(); + Set<File> alreadyDone = new HashSet<File>(); + recursiveExtractDependencies(rootDirectory, files, alreadyDone, deps); + return deps; } + protected static void recursiveExtractDependencies(File rootDirectory, Collection<File> todoClassFiles, Set<File> alreadyDone, Set<String> deps) { + + // extract deps + for (File file : todoClassFiles) { + alreadyDone.add(file); + try (InputStream is = new BufferedInputStream(new FileInputStream(file))) { + Set<String> fileDeps = extractDependencies(is); + deps.addAll(fileDeps); + } catch (IOException ex) { + if (log.isErrorEnabled()) { + log.error("Can't extract dependencies", ex); + } + } + + } + + // convert deps to class filTopiaFlywayServicees + Collection<File> newClassFiles = new ArrayList<>(); + for (String dep : deps) { + String classRelative = dep.replace('.', File.separatorChar) + ".class"; + File classFile = new File(rootDirectory, classRelative); + if (!alreadyDone.contains(classFile)) { + newClassFiles.add(classFile); + } + } + + // make new recursion if necessary + if (!newClassFiles.isEmpty()) { + recursiveExtractDependencies(rootDirectory, newClassFiles, alreadyDone, deps); + } + } + /** * Extrait les dépendences d'une class compilé à partir de son bytecode. * * @param clazz la classe à analyser - * @param onlyUserScript only keep user script types * @return extract class set */ - public static Set<String> extractDependencies(Class<?> clazz, final boolean onlyUserScript) { + protected static Set<String> extractDependencies(InputStream clazzStream) { final Set<String> result = new HashSet<>(); // method body visitor @@ -92,59 +132,59 @@ @Override public AnnotationVisitor visitAnnotation(String desc, boolean visible) { - registerDescriptor(result, desc, onlyUserScript); + registerDescriptor(result, desc); return super.visitAnnotation(desc, visible); } @Override public AnnotationVisitor visitTypeAnnotation(int typeRef, TypePath typePath, String desc, boolean visible) { - registerDescriptor(result, desc, onlyUserScript); + registerDescriptor(result, desc); return super.visitTypeAnnotation(typeRef, typePath, desc, visible); } @Override public AnnotationVisitor visitParameterAnnotation(int parameter, String desc, boolean visible) { - registerDescriptor(result, desc, onlyUserScript); + registerDescriptor(result, desc); return super.visitParameterAnnotation(parameter, desc, visible); } @Override public void visitTypeInsn(int opcode, String type) { - registerType(result, type, onlyUserScript); + registerType(result, type); super.visitTypeInsn(opcode, type); } @Override public void visitFieldInsn(int opcode, String owner, String name, String desc) { - registerType(result, owner, onlyUserScript); - registerDescriptor(result, desc, onlyUserScript); + registerType(result, owner); + registerDescriptor(result, desc); super.visitFieldInsn(opcode, owner, name, desc); } @Override public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf) { - registerType(result, owner, onlyUserScript); - registerDescriptor(result, desc, onlyUserScript); + registerType(result, owner); + registerDescriptor(result, desc); super.visitMethodInsn(opcode, owner, name, desc, itf); } @Override public void visitLdcInsn(Object cst) { if (cst instanceof Type) { - registerType(result, ((Type)cst).getClassName(), onlyUserScript); + registerType(result, ((Type)cst).getClassName()); } super.visitLdcInsn(cst); } @Override public void visitTryCatchBlock(Label start, Label end, Label handler, String type) { - registerType(result, type, onlyUserScript); + registerType(result, type); super.visitTryCatchBlock(start, end, handler, type); } @Override public void visitLocalVariable(String name, String desc, String signature, Label start, Label end, int index) { - registerDescriptor(result, desc, onlyUserScript); + registerDescriptor(result, desc); super.visitLocalVariable(name, desc, signature, start, end, index); } }; @@ -155,35 +195,35 @@ @Override public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) { - registerType(result, superName, onlyUserScript); + registerType(result, superName); super.visit(version, access, name, signature, superName, interfaces); } @Override public AnnotationVisitor visitAnnotation(String desc, boolean visible) { - registerDescriptor(result, desc, onlyUserScript); + registerDescriptor(result, desc); return super.visitAnnotation(desc, visible); } @Override public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) { - registerDescriptor(result, desc, onlyUserScript); + registerDescriptor(result, desc); return super.visitField(access, name, desc, signature, value); } @Override public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { - registerDescriptor(result, desc, onlyUserScript); + registerDescriptor(result, desc); return mv; } }; - // parse inpu class - try (InputStream in = clazz.getResourceAsStream("/" + clazz.getName().replace('.', '/') + ".class")) { - ClassReader classReader = new ClassReader(in); + // parse input class + try { + ClassReader classReader = new ClassReader(clazzStream); classReader.accept(visitor, 0); } catch (IOException ex) { if (log.isErrorEnabled()) { @@ -199,11 +239,10 @@ * * @param types types collection * @param type type to add - * @param onlyUserScript only keep user script types */ - protected static void registerType(Set<String> types, String type, boolean onlyUserScript) { + protected static void registerType(Set<String> types, String type) { //System.out.println("==> " + type); - if (!onlyUserScript || StringUtils.startsWithAny(type, + if (StringUtils.startsWithAny(type, ExportStorage.EXPORT_PATH, FormuleStorage.FORMULE_PATH, ObjectiveStorage.OBJECTIVE_PATH, @@ -227,25 +266,25 @@ * <li>Lfr/ifremer/isisfish/types/Month;</li> * <li>[Ljava/lang/String;</li> * <li>(Ljava/lang/Class;)Lorg/apache/commons/logging/Log;</li> + * </ul> * * @param types types collection * @param descriptor descriptor - * @param onlyUserScript only keep user script types */ - protected static void registerDescriptor(Set<String> types, String descriptor, boolean onlyUserScript) { + protected static void registerDescriptor(Set<String> types, String descriptor) { if (descriptor.startsWith("(")) { int endIndex = descriptor.indexOf(')'); - registerDescriptor(types, descriptor.substring(1, endIndex), onlyUserScript); - registerDescriptor(types, descriptor.substring(endIndex + 1), onlyUserScript); + registerDescriptor(types, descriptor.substring(1, endIndex)); + registerDescriptor(types, descriptor.substring(endIndex + 1)); } else { - Pattern pattern = Pattern.compile("\\[*L([^;]+);|\\[[ZBCSIFDJ]|[ZBCSIFDJ]"); + // full pattern : \\[*L([^;]+);|\\[[ZBCSIFDJ]|[ZBCSIFDJ] + // on exclut la fin (les types primitifs) pour ne conserver que la partie interessante + // du pattern qui nous concerne + Pattern pattern = Pattern.compile("\\[*L([^;]+);"); Matcher matcher = pattern.matcher(descriptor); while (matcher.find()) { String match = matcher.group(1); - // sinon c'est un type primitif - if (match != null) { - registerType(types, match, onlyUserScript); - } + registerType(types, match); } } } Modified: branches/4.3.0-log4j2/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java =================================================================== --- branches/4.3.0-log4j2/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2014-09-01 11:05:03 UTC (rev 4106) +++ branches/4.3.0-log4j2/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2014-09-09 10:06:34 UTC (rev 4107) @@ -31,9 +31,7 @@ import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.ConvertUtilsBean; -import org.junit.After; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import org.nuiton.math.matrix.MatrixFactory; import org.nuiton.math.matrix.MatrixND; @@ -55,21 +53,6 @@ */ public class SimulationPreScriptTest extends AbstractIsisFishTest { - @Before - public void setUp() throws Exception { - // not do it in @BeforeClass - // test will fail ! - init(); - // very important , other test wil fail with that - //System.setProperty("hibernate.hbm2ddl.auto", "create"); - } - - @After - public void tearDown() { - // very important , other test wil fail with that - //System.clearProperty("hibernate.hbm2ddl.auto"); - } - /** * Test que les chaine represantant des matrices sont correctement * transformée en MatrixND. Modified: branches/4.3.0-log4j2/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java =================================================================== --- branches/4.3.0-log4j2/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2014-09-01 11:05:03 UTC (rev 4106) +++ branches/4.3.0-log4j2/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2014-09-09 10:06:34 UTC (rev 4107) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2011 Ifremer, Code Lutin, Chatellier Eric + * Copyright (C) 2006 - 2014 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 @@ -25,6 +25,7 @@ package fr.ifremer.isisfish.simulator.launcher; +import java.io.File; import java.util.ArrayList; import java.util.List; import java.util.Properties; @@ -34,7 +35,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; -import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import org.nuiton.math.matrix.MatrixFactory; @@ -47,6 +47,9 @@ import fr.ifremer.isisfish.IsisFishException; import fr.ifremer.isisfish.datastore.RegionStorage; import fr.ifremer.isisfish.datastore.RuleStorage; +import fr.ifremer.isisfish.datastore.ScriptStorage; +import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.datastore.SimulatorStorage; import fr.ifremer.isisfish.datastore.StorageException; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationGroup; @@ -84,11 +87,61 @@ /** Commons logging log. */ private static Log log = LogFactory.getLog(SimulationServiceTest.class); - @Before - public void setUp() throws Exception { - // not do it in @BeforeClass - // test will fail ! - AbstractIsisFishTest.init(); + /** + * Lance une simulation simple avec le simulateur par cellule. + * + * Test is wrong if it take more than 2 min. + * + * @throws InterruptedException + */ + @Test(timeout=120 * 1000) + public void testSimulationEffortByCell() throws InterruptedException { + + SimulationParameter params = new SimulationParameterImpl(); + // set params region + params.setRegionName("DemoRegion"); + // simulator + params.setSimulatorName("SimulatorEffortByCell.java"); + // set population + List<Population> pops = new ArrayList<Population>(); + Population pop = new PopulationImpl(); + pop.setName("test population"); + pop.setPopulationGroup(new ArrayList<PopulationGroup>()); + pop.setPopulationZone(new ArrayList<Zone>()); + pops.add(pop); + params.setPopulations(pops); + // strat + List<Strategy> strats = new ArrayList<Strategy>(); + Strategy strategy = new StrategyImpl(); + strategy.setName("stratest"); + strats.add(strategy); + params.setStrategies(strats); + // number of year + params.setNumberOfYear(1); + + // run simulation + SimulationService service = SimulationService.getService(); + SimulatorLauncher launcher = new InProcessSimulatorLauncher(); + service.addSimulationLauncher(launcher); + String simulationId = "effort by cell test number 1"; + service.submit("effort by cell test number 1", params, launcher, 0); + + // temporise la fin de test , sinon junit tue tous les process + do { + Thread.sleep(2000); + } while (!service.jobs.isEmpty()); + + // suite au changement de la compilation, on vérifie que certains fichier java + // doivent être automatiquement inclut dans les sources + File simDir = SimulationStorage.getSimulationDirectory(simulationId); + File simulatorDir = new File(simDir, SimulatorStorage.SIMULATOR_PATH); + File scriptDir = new File(simDir, ScriptStorage.SCRIPT_PATH); + Assert.assertTrue(new File(simulatorDir, "DefaultSimulator.java").exists()); + Assert.assertTrue(new File(simulatorDir, "SimulatorEffortByCell.java").exists()); + Assert.assertTrue(new File(scriptDir, "ResultName.java").exists()); + Assert.assertTrue(new File(scriptDir, "SiMatrix.java").exists()); + Assert.assertTrue(new File(scriptDir, "GravityModel.java").exists()); + Assert.assertTrue(new File(scriptDir, "RuleUtil.java").exists()); } /** @@ -180,9 +233,11 @@ * Lance une simulation avec des facteurs de sensibilité. * * Test is wrong if it take more than 2 min. + * + * @throws InterruptedException */ @Test(timeout=120 * 1000) - public void testRunSensivitySimulation() { + public void testRunSensivitySimulation() throws InterruptedException { SimulationParameter params = new SimulationParameterImpl(); // set params region @@ -216,15 +271,10 @@ sensitivityAnalysis, designPlan); // temporise la fin de test , sinon junit tue tous les process - try { - do { - Thread.sleep(2000); - } while (!service.jobs.isEmpty()); - } catch (InterruptedException e) { - if (log.isErrorEnabled()) { - log.error("Can't wait wimulation to end", e); - } - } + do { + Thread.sleep(2000); + } while (!service.jobs.isEmpty()); + } /** Modified: branches/4.3.0-log4j2/src/test/java/fr/ifremer/isisfish/util/DependencyUtilTest.java =================================================================== --- branches/4.3.0-log4j2/src/test/java/fr/ifremer/isisfish/util/DependencyUtilTest.java 2014-09-01 11:05:03 UTC (rev 4106) +++ branches/4.3.0-log4j2/src/test/java/fr/ifremer/isisfish/util/DependencyUtilTest.java 2014-09-09 10:06:34 UTC (rev 4107) @@ -24,13 +24,18 @@ */ package fr.ifremer.isisfish.util; +import java.io.File; +import java.io.IOException; +import java.util.Collections; import java.util.Set; import org.junit.Assert; import org.junit.Test; import fr.ifremer.isisfish.AbstractIsisFishTest; +import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishException; +import fr.ifremer.isisfish.datastore.JavaSourceStorage; import fr.ifremer.isisfish.datastore.RuleStorage; import fr.ifremer.isisfish.datastore.ScriptStorage; import fr.ifremer.isisfish.datastore.SimulatorStorage; @@ -43,18 +48,39 @@ public class DependencyUtilTest extends AbstractIsisFishTest { /** + * Extract dependency for test. + * + * @param storage storage + * @return deps + * @throws IsisFishException + */ + protected static Set<String> extractDependencies(JavaSourceStorage storage) throws IsisFishException { + String clazzName = storage.getCodeClass().getName(); + File classFile = new File(IsisFish.config.getCompileDirectory(), clazzName.replace('.', File.separatorChar) + ".class"); + Set<String> result = DependencyUtil.extractDependencies(IsisFish.config.getCompileDirectory(), Collections.singletonList(classFile)); + return result; + } + + /** * Récupère une classe parmis les scripts de test et vérifie que les dépendances sont bien * extraites. * * @throws IsisFishException + * @throws IOException */ @Test - public void testExtractDependencies1() throws IsisFishException { - SimulatorStorage simulatorByCell = SimulatorStorage.getSimulator("SimulatorEffortByCell"); - Class<?> clazz = simulatorByCell.getCodeClass(); - Set<String> deps = DependencyUtil.extractDependencies(clazz, false); - Assert.assertTrue(deps.size() >= 10); + public void testExtractDependencies1() throws IsisFishException, IOException { + SimulatorStorage script = SimulatorStorage.getSimulator("SimulatorEffortByCell"); + Set<String> deps = extractDependencies(script); + // premier niveau Assert.assertTrue(deps.contains("simulators.DefaultSimulator")); + // deuxieme niveau de dependance + Assert.assertTrue(deps.contains("scripts.SiMatrix")); + Assert.assertTrue(deps.contains("scripts.GravityModel")); + // troisieme niveau + Assert.assertTrue(deps.contains("scripts.MinimisationUtil")); + Assert.assertTrue(deps.contains("scripts.ObjectiveFunction")); + Assert.assertTrue(deps.contains("scripts.ObjectiveFunctionBaranov")); } /** @@ -62,13 +88,12 @@ * extraites. * * @throws IsisFishException + * @throws IOException */ @Test - public void testExtractDependencies2() throws IsisFishException { - SimulatorStorage simulator = SimulatorStorage.getSimulator("DefaultSimulator"); - Class<?> clazz = simulator.getCodeClass(); - Set<String> deps = DependencyUtil.extractDependencies(clazz, false); - Assert.assertTrue(deps.size() >= 35); + public void testExtractDependencies2() throws IsisFishException, IOException { + SimulatorStorage script = SimulatorStorage.getSimulator("DefaultSimulator"); + Set<String> deps = extractDependencies(script); Assert.assertTrue(deps.contains("scripts.GravityModel")); Assert.assertTrue(deps.contains("scripts.ResultName")); Assert.assertTrue(deps.contains("scripts.SiMatrix")); @@ -80,13 +105,12 @@ * extraites. * * @throws IsisFishException + * @throws IOException */ @Test - public void testExtractDependencies3() throws IsisFishException { - RuleStorage cantonnement = RuleStorage.getRule("Cantonnement"); - Class<?> clazz = cantonnement.getCodeClass(); - Set<String> deps = DependencyUtil.extractDependencies(clazz, false); - Assert.assertTrue(deps.size() >= 30); + public void testExtractDependencies3() throws IsisFishException, IOException { + RuleStorage script = RuleStorage.getRule("Cantonnement"); + Set<String> deps = extractDependencies(script); Assert.assertTrue(deps.contains("scripts.ResultName")); } @@ -95,13 +119,12 @@ * extraites. * * @throws IsisFishException + * @throws IOException */ @Test - public void testExtractDependencies4() throws IsisFishException { + public void testExtractDependencies4() throws IsisFishException, IOException { ScriptStorage script = ScriptStorage.getScript("SiMatrix"); - Class<?> clazz = script.getCodeClass(); - Set<String> deps = DependencyUtil.extractDependencies(clazz, false); - Assert.assertTrue(deps.size() >= 51); + Set<String> deps = extractDependencies(script); Assert.assertTrue(deps.contains("scripts.ObjectiveFunctionBaranov")); Assert.assertTrue(deps.contains("scripts.ObjectiveFunction")); Assert.assertTrue(deps.contains("scripts.MinimisationUtil")); @@ -113,13 +136,12 @@ * extraites. * * @throws IsisFishException + * @throws IOException */ @Test - public void testExtractDependencies5() throws IsisFishException { + public void testExtractDependencies5() throws IsisFishException, IOException { ScriptStorage script = ScriptStorage.getScript("GravityModel"); - Class<?> clazz = script.getCodeClass(); - Set<String> deps = DependencyUtil.extractDependencies(clazz, false); - Assert.assertTrue(deps.size() >= 31); + Set<String> deps = extractDependencies(script); Assert.assertTrue(deps.contains("scripts.SiMatrix")); Assert.assertTrue(deps.contains("scripts.ResultName")); } @@ -129,14 +151,12 @@ * extraites. * * @throws IsisFishException + * @throws IOException */ @Test - public void testExtractDependencies6() throws IsisFishException { + public void testExtractDependencies6() throws IsisFishException, IOException { ScriptStorage script = ScriptStorage.getScript("ObjectiveFunctionBaranov"); - Class<?> clazz = script.getCodeClass(); - Set<String> deps = DependencyUtil.extractDependencies(clazz, false); - Assert.assertTrue(deps.size() >= 4); + Set<String> deps = extractDependencies(script); Assert.assertTrue(deps.contains("scripts.ObjectiveFunction")); - Assert.assertTrue(deps.contains("fr.ifremer.isisfish.util.Nocache")); } }

1 0

r4106 - branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/ssh
by echatellier＠users.forge.codelutin.com Sept. 1, 2014

Sept. 1, 2014

Author: echatellier Date: 2014-09-01 13:05:03 +0200 (Mon, 01 Sep 2014) New Revision: 4106 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4106 Log: Simplify code Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/ssh/ProxyCommand.java Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/ssh/ProxyCommand.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/ssh/ProxyCommand.java 2014-09-01 11:04:37 UTC (rev 4105) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/util/ssh/ProxyCommand.java 2014-09-01 11:05:03 UTC (rev 4106) @@ -51,7 +51,7 @@ public void connect(SocketFactory socket_factory, String host, int port, int timeout) throws Exception { String fullCommand = command.replace("%h", host); - fullCommand = fullCommand.replace("%p", new Integer(port).toString()); + fullCommand = fullCommand.replace("%p", String.valueOf(port)); p = Runtime.getRuntime().exec(fullCommand); in = p.getInputStream(); out = p.getOutputStream();

1 0

r4105 - branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/sensitivity
by echatellier＠users.forge.codelutin.com Sept. 1, 2014

Sept. 1, 2014

Author: echatellier Date: 2014-09-01 13:04:37 +0200 (Mon, 01 Sep 2014) New Revision: 4105 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4105 Log: Fix invalid cast Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java Modified: branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java =================================================================== --- branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java 2014-08-29 13:39:04 UTC (rev 4104) +++ branches/4.3.0-log4j2/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java 2014-09-01 11:04:37 UTC (rev 4105) @@ -416,7 +416,7 @@ Distribution distribution = domain.getDistribution(); double result = 0; if (distribution == Distribution.QUNIFPC) { - Object reference = (Double)domain.getDistributionParameter(Distribution.QUNIFPC.getDistibutionParams()[0].getName()); + Object reference = domain.getDistributionParameter(Distribution.QUNIFPC.getDistibutionParams()[0].getName()); if (reference instanceof MatrixND) { result = min ? 0 : 1; } else {

1 0