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

r2019 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by sletellier＠users.labs.libre-entreprise.org 20 Mar '09

20 Mar '09

Author: sletellier Date: 2009-03-20 13:57:26 +0000 (Fri, 20 Mar 2009) New Revision: 2019 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx Log: Bug visible matrix no fixed Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx 2009-03-20 13:44:27 UTC (rev 2018) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx 2009-03-20 13:57:26 UTC (rev 2019) @@ -53,7 +53,7 @@ </cell> <cell fill='both' weightx='1' weighty='1'> <JScrollPane> - <MatrixPanelEditor id='componentPanel' matrix='{getMatrix()}' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + <MatrixPanelEditor id='componentPanel' matrix='{getMatrix()}'/> </JScrollPane> </cell> </row>

1 0

r2018 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by sletellier＠users.labs.libre-entreprise.org 20 Mar '09

20 Mar '09

Author: sletellier Date: 2009-03-20 13:44:27 +0000 (Fri, 20 Mar 2009) New Revision: 2018 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx Log: Bug visible matrix fixed Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx 2009-03-20 10:43:28 UTC (rev 2017) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx 2009-03-20 13:44:27 UTC (rev 2018) @@ -53,7 +53,7 @@ </cell> <cell fill='both' weightx='1' weighty='1'> <JScrollPane> - <MatrixPanelEditor id='componentPanel' matrix='{getMatrix()}'/> + <MatrixPanelEditor id='componentPanel' matrix='{getMatrix()}' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> </JScrollPane> </cell> </row>

1 0

r2017 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by chatellier＠users.labs.libre-entreprise.org 20 Mar '09

20 Mar '09

Author: chatellier Date: 2009-03-20 10:43:28 +0000 (Fri, 20 Mar 2009) New Revision: 2017 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx Log: Multiselection de la liste pour pouvoir arreter plusieurs simulation Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx 2009-03-20 10:36:30 UTC (rev 2016) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx 2009-03-20 10:43:28 UTC (rev 2017) @@ -1,6 +1,6 @@ <!-- /* *##% - * Copyright (C) 2005 + * Copyright (C) 2005 - 2009 * Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or @@ -19,7 +19,7 @@ *##%*/ /* * - * IsisFish.java + * QueueUI.java * * Created: 1 aout 2005 18:37:25 CEST * @@ -45,10 +45,11 @@ import org.jdesktop.beansbinding.Bindings; import org.jdesktop.beansbinding.ELProperty; - refresh(); + initBindings(); - public void refresh(){ + public void initBindings() { SimulationService ss = SimulationService.getService(); + BindingGroup bindingGroup = new BindingGroup(); setContextValue(new SimulationServiceTableModel(ss, true), "new"); @@ -76,28 +77,35 @@ bindingGroup.bind(); } - public QueueUI (SimulAction action){ - + public QueueUI (SimulAction action) { setContextValue(action); } + public class JProgressBarTableCellRenderer implements TableCellRenderer { public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { return (JProgressBar) value; } - }// JProgressBarTableCellRenderer - protected void stopSimulation(){ - if (queueTable.getSelectedRow() >= 0){ - getContextValue(SimulAction.class).stopSimulation(getContextValue(SimulationServiceTableModel.class, "new").getJob(queueTable.getSelectedRow())); + } + + /** + * Stop simulation associated with table selected rows. + */ + protected void stopSimulation() { + int[] selectedRows = queueTable.getSelectedRows(); + for (int selectedRow : selectedRows) { + getContextValue(SimulAction.class).stopSimulation(getContextValue(SimulationServiceTableModel.class, "new").getJob(selectedRow)); } } - protected void viewLog(){ - if (queueTableDone.getSelectedRow() >= 0){ + + protected void viewLog() { + if (queueTableDone.getSelectedRow() >= 0) { getContextValue(SimulAction.class).viewLog(getContextValue(SimulationServiceTableModel.class, "done").getJob(queueTableDone.getSelectedRow())); } } - protected void clearDoneJobs(){ + + protected void clearDoneJobs() { getContextValue(SimulAction.class).clearDoneJobs(); } ]]> @@ -105,14 +113,14 @@ <row> <cell columns="4" fill="both" weightx="1.0" weighty="0.5"> <JScrollPane> - <JTable id="queueTable" model='{getContextValue(SimulationServiceTableModel.class, "new")}'/> + <JTable id="queueTable" model='{getContextValue(SimulationServiceTableModel.class, "new")}' selectionMode="{ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}"/> </JScrollPane> </cell> </row> <row> <cell columns="4" fill="both" weightx="1.0" weighty="0.5"> <JScrollPane> - <JTable id="queueTableDone" rowHeight='24' model='{getContextValue(SimulationServiceTableModel.class, "done")}'/> + <JTable id="queueTableDone" model='{getContextValue(SimulationServiceTableModel.class, "done")}'/> </JScrollPane> </cell> </row>

1 0

r2016 - isis-fish/trunk/doc
by chatellier＠users.labs.libre-entreprise.org 20 Mar '09

20 Mar '09

Author: chatellier Date: 2009-03-20 10:36:30 +0000 (Fri, 20 Mar 2009) New Revision: 2016 Modified: isis-fish/trunk/doc/SimulationSSH.rst Log: Undo previous commit Modified: isis-fish/trunk/doc/SimulationSSH.rst =================================================================== --- isis-fish/trunk/doc/SimulationSSH.rst 2009-03-20 10:33:29 UTC (rev 2015) +++ isis-fish/trunk/doc/SimulationSSH.rst 2009-03-20 10:36:30 UTC (rev 2016) @@ -13,7 +13,6 @@ simulation.ssh.isis.home=/home/chatellier/isis-fish-3.2.0.3 simulation.ssh.tmppath=/tmp simulation.ssh.control.check.interval=5 - simulation.ssh.addscripttoqueuecommand=./qsub Le script qsub ==============

1 0

r2015 - isis-fish/trunk/doc
by chatellier＠users.labs.libre-entreprise.org 20 Mar '09

20 Mar '09

Author: chatellier Date: 2009-03-20 10:33:29 +0000 (Fri, 20 Mar 2009) New Revision: 2015 Modified: isis-fish/trunk/doc/SimulationSSH.rst Log: Update doc Modified: isis-fish/trunk/doc/SimulationSSH.rst =================================================================== --- isis-fish/trunk/doc/SimulationSSH.rst 2009-03-20 10:26:52 UTC (rev 2014) +++ isis-fish/trunk/doc/SimulationSSH.rst 2009-03-20 10:33:29 UTC (rev 2015) @@ -13,6 +13,7 @@ simulation.ssh.isis.home=/home/chatellier/isis-fish-3.2.0.3 simulation.ssh.tmppath=/tmp simulation.ssh.control.check.interval=5 + simulation.ssh.addscripttoqueuecommand=./qsub Le script qsub ==============

1 0

r2014 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 20 Mar '09

20 Mar '09

Author: chatellier Date: 2009-03-20 10:26:52 +0000 (Fri, 20 Mar 2009) New Revision: 2014 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Can't do second pass if simulation has been delete. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-03-19 18:27:47 UTC (rev 2013) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-03-20 10:26:52 UTC (rev 2014) @@ -43,7 +43,6 @@ import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishException; import fr.ifremer.isisfish.datastore.AnalysePlanStorage; -import fr.ifremer.isisfish.datastore.ExportStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.AnalysePlan; import fr.ifremer.isisfish.simulator.SimulationControl; @@ -462,10 +461,14 @@ service, control); // post manage this storage - exportResult(job, simulation); + boolean simulationAvailble = exportResult(job, simulation); // sensitivity calculator analyze result call - analyzeSensitivityResult(job, simulation); + // can't do analyze seond pass if simulation + // has been deleted + if (simulationAvailble) { + analyzeSensitivityResult(job, simulation); + } } } catch (RemoteException e) { if (log.isErrorEnabled()) { @@ -483,9 +486,13 @@ /** * Export result, and delete simulation if "onlyExport" has * been selected. + * + * @return <tt>true</tt> if simulation is styll available (not delete by onlyExport) */ - protected void exportResult(SimulationJob job, SimulationStorage simulation) { + protected boolean exportResult(SimulationJob job, SimulationStorage simulation) { + boolean simulationAvailble = true; + SimulationParameter param = job.getItem().getParameter(); SimulationControl control = job.getItem().getControl(); String id = control.getId(); @@ -535,6 +542,7 @@ } simulation.delete(false); + simulationAvailble = false; } else { // log if (log.isDebugEnabled()) { @@ -562,6 +570,8 @@ } } } + + return simulationAvailble; } /**

1 0

r2013 - isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator
by chatellier＠users.labs.libre-entreprise.org 19 Mar '09

19 Mar '09

Author: chatellier Date: 2009-03-19 18:27:47 +0000 (Thu, 19 Mar 2009) New Revision: 2013 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java Log: Fix tests Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java 2009-03-19 18:14:44 UTC (rev 2012) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java 2009-03-19 18:27:47 UTC (rev 2013) @@ -24,6 +24,7 @@ import org.junit.BeforeClass; import org.junit.Ignore; +import org.junit.Test; import fr.ifremer.TestUtils; @@ -36,6 +37,7 @@ * Last update : $Date: 19 mars 2009 $ * By : $Author: chatellier $ */ + at Ignore public class SimulationParameterTest { @BeforeClass @@ -49,7 +51,7 @@ * Write it on disk, read it from disk. * And test it.s */ - @Ignore + @Test public void testToPropertiesFromPropertties() { SimulationParameter params = new SimulationParameter();

1 0

r2012 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: export simulator
by chatellier＠users.labs.libre-entreprise.org 19 Mar '09

19 Mar '09

Author: chatellier Date: 2009-03-19 18:14:44 +0000 (Thu, 19 Mar 2009) New Revision: 2012 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java Log: Fix lost of parameters values in export (don't do newIntance twice) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java 2009-03-19 16:37:39 UTC (rev 2011) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java 2009-03-19 18:14:44 UTC (rev 2012) @@ -23,7 +23,6 @@ import java.io.File; import java.io.FileWriter; import java.io.Writer; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Properties; @@ -59,36 +58,21 @@ * * @param simulation La simulation pour lequel il faut faire les exports * @param destdir le repertoire dans lequel il faut ecrire les exports - * @param exportNames le nom des exports a faire + * @param exports les instances des exports à faire * @param compileDir le nom du répertoire ou les classes d'export sont compilées */ public static void doExport(SimulationStorage simulation, File destdir, - List<String> exportNames, File compileDir) { - Map<String, Integer> usingFilename = new HashMap<String, Integer>(); + List<Export> exports, File compileDir) { + + // on ne compte plus ici les temps d'instanciations + // deplacer dans SimulationExportResultWrapper#afterSimulation(SimulationContext) + long timeStart = System.currentTimeMillis(); - for (String exportName : exportNames) { + for (Export export : exports) { + String exportName = ExportStorage.getName(export); long time = System.currentTimeMillis(); try { - ExportStorage storage = ExportStorage.getExport(exportName); - Export export = storage.getNewExportInstance(); - - String filename = export.getExportFilename(); - String extension = export.getExtensionFilename(); - - // prevent two export with same name - // name MyExport.csv become MyExport_1.csv - Integer val = usingFilename.get(filename + extension); - if (val != null) { - filename += "_" + val; - usingFilename.put(filename + extension, val + 1); - } else { - usingFilename.put(filename + extension, 1); - } - - File file = new File(destdir, filename + extension); - Writer out = new BufferedWriter(new FileWriter(file)); - export.export(simulation, out); - out.close(); + exportToFile(simulation, destdir, export); } catch (Exception eee) { if (log.isWarnEnabled()) { log.warn("Can't export object: " + exportName, eee); @@ -102,6 +86,33 @@ } /** + * Do single export. + * + * @param simulation La simulation pour lequel il faut faire les exports + * @param destdir le repertoire dans lequel il faut ecrire les exports + * @param export le nom des exports a faire + * @throws Exception si une erreur survient + */ + protected static void exportToFile(SimulationStorage simulation, + File destdir, Export export) throws Exception { + String filename = export.getExportFilename(); + String extension = export.getExtensionFilename(); + + File file = new File(destdir, filename + extension); + // prevent two export with same name + // name MyExport.csv become MyExport_1.csv + int val = 0; + while (file.exists()) { + val++; + file = new File(destdir, filename + extension + "_" + val); + } + + Writer out = new BufferedWriter(new FileWriter(file)); + export.export(simulation, out); + out.close(); + } + + /** * Recupere dans prop les valeurs des champs specifique au export et met a * jour les champs de l'export. * Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java 2009-03-19 16:37:39 UTC (rev 2011) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java 2009-03-19 18:14:44 UTC (rev 2012) @@ -23,6 +23,10 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import fr.ifremer.isisfish.IsisFishException; import fr.ifremer.isisfish.datastore.ExportStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.export.Export; @@ -41,6 +45,10 @@ */ public class SimulationExportResultWrapper implements SimulationListener { + /** Class logger. */ + private static Log log = LogFactory + .getLog(SimulationExportResultWrapper.class); + /* * @see fr.ifremer.isisfish.simulator.SimulationListener#afterSimulation(fr.ifremer.isisfish.simulator.SimulationContext) */ @@ -57,26 +65,31 @@ exportDir.mkdirs(); ExportHelper.doExport(simulation, exportDir, parameters.getExportNames(), rootDirectory); }*/ - + // FIXME changed since sensitivity export adding // Ici on contantene les 2 listes d'exports - // mais on fait du instance>name>instance - // c'est couteux - List<String> allExportNames = new ArrayList<String>(); + List<Export> allExports = new ArrayList<Export>(); if (parameters.getExportNames() != null) { - allExportNames.addAll(parameters.getExportNames()); + for (String exportName : parameters.getExportNames()) { + try { + ExportStorage storage = ExportStorage.getExport(exportName); + Export export = storage.getNewExportInstance(); + allExports.add(export); + } catch (IsisFishException e) { + if (log.isErrorEnabled()) { + log.error("Can't get export instance " + exportName, e); + } + } + } } if (parameters.getSensitivityExport() != null) { - for (Export export : parameters.getSensitivityExport()) { - String name = ExportStorage.getName(export); - allExportNames.add(name); - } + allExports.addAll(parameters.getSensitivityExport()); } - if (!allExportNames.isEmpty()) { + if (!allExports.isEmpty()) { File exportDir = SimulationStorage .getResultExportDirectory(rootDirectory); exportDir.mkdirs(); - ExportHelper.doExport(simulation, exportDir, allExportNames, + ExportHelper.doExport(simulation, exportDir, allExports, rootDirectory); } } @@ -86,5 +99,4 @@ */ public void beforeSimulation(SimulationContext context) { } - }

1 0

r2011 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator
by chatellier＠users.labs.libre-entreprise.org 19 Mar '09

19 Mar '09

Author: chatellier Date: 2009-03-19 16:37:39 +0000 (Thu, 19 Mar 2009) New Revision: 2011 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java Log: Fusion des deux liste d'export avaan l'export Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java 2009-03-19 15:24:55 UTC (rev 2010) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java 2009-03-19 16:37:39 UTC (rev 2011) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2007 + * Copyright (C) 2007 - 2009 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or @@ -17,35 +17,31 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -/* * - * SimulationExportResultWrapper.java - * - * Created: 14 nov. 07 00:22:51 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ - package fr.ifremer.isisfish.simulator; import java.io.File; +import java.util.ArrayList; +import java.util.List; -import fr.ifremer.isisfish.IsisConfig; +import fr.ifremer.isisfish.datastore.ExportStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.export.ExportHelper; - /** + * SimulationExportResultWrapper. + * + * Created: 14 nov. 07 00:22:51 + * * @author poussin + * @version $Revision$ * + * Last update: $Date$ + * by : $Author$ */ - public class SimulationExportResultWrapper implements SimulationListener { - /* (non-Javadoc) + /* * @see fr.ifremer.isisfish.simulator.SimulationListener#afterSimulation(fr.ifremer.isisfish.simulator.SimulationContext) */ public void afterSimulation(SimulationContext context) { @@ -55,20 +51,40 @@ // // Export des résultats // - if (parameters.getExportNames() != null + /*if (parameters.getExportNames() != null && parameters.getExportNames().size() > 0) { File exportDir = SimulationStorage.getResultExportDirectory(rootDirectory); exportDir.mkdirs(); ExportHelper.doExport(simulation, exportDir, parameters.getExportNames(), rootDirectory); - } + }*/ + + // FIXME changed since sensitivity export adding + // Ici on contantene les 2 listes d'exports + // mais on fait du instance>name>instance + // c'est couteux + List<String> allExportNames = new ArrayList<String>(); + if (parameters.getExportNames() != null) { + allExportNames.addAll(parameters.getExportNames()); + } + if (parameters.getSensitivityExport() != null) { + for (Export export : parameters.getSensitivityExport()) { + String name = ExportStorage.getName(export); + allExportNames.add(name); + } + } + if (!allExportNames.isEmpty()) { + File exportDir = SimulationStorage + .getResultExportDirectory(rootDirectory); + exportDir.mkdirs(); + ExportHelper.doExport(simulation, exportDir, allExportNames, + rootDirectory); + } } - /* (non-Javadoc) + /* * @see fr.ifremer.isisfish.simulator.SimulationListener#beforeSimulation(fr.ifremer.isisfish.simulator.SimulationContext) */ public void beforeSimulation(SimulationContext context) { } } - -

1 0

r2010 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities
by chatellier＠users.labs.libre-entreprise.org 19 Mar '09

19 Mar '09

Author: chatellier Date: 2009-03-19 15:24:55 +0000 (Thu, 19 Mar 2009) New Revision: 2010 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java Log: Should be translated Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2009-03-19 15:20:25 UTC (rev 2009) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2009-03-19 15:24:55 UTC (rev 2010) @@ -82,9 +82,9 @@ if ( ! months.equals(oldMonths)) { MatrixND tmp = MatrixFactory.getInstance().create( - n_("isisfish.populationSeasonInfo.distributionSpawing"), + _("isisfish.populationSeasonInfo.distributionSpawing"), new List[]{months}, - new String[]{n_("isisfish.populationSeasonInfo.months")}); + new String[]{_("isisfish.populationSeasonInfo.months")}); tmp.pasteSemantics(result); result = tmp; } @@ -111,14 +111,14 @@ List [] sems = new List[]{ groups, zones, zones }; if (mat == null) { - mat = MatrixFactory.getInstance().create(n_("isisfish.populationSeasonInfo.migration"), sems, - new String[]{n_("isisfish.populationSeasonInfo.group"), n_("isisfish.populationSeasonInfo.departure"), n_("isisfish.populationSeasonInfo.arrival")}); + mat = MatrixFactory.getInstance().create(_("isisfish.populationSeasonInfo.migration"), sems, + new String[]{_("isisfish.populationSeasonInfo.group"), _("isisfish.populationSeasonInfo.departure"), _("isisfish.populationSeasonInfo.arrival")}); // we don't call setCapturability because is better to create a valid // matrix when capturability is null instead check validity and // create new one and paste the old } else if (!Arrays.equals(mat.getSemantics(), sems)){ - MatrixND newmat = MatrixFactory.getInstance().create(n_("isisfish.populationSeasonInfo.migration"), sems, - new String[]{n_("isisfish.populationSeasonInfo.group"), n_("isisfish.populationSeasonInfo.departure"), n_("isisfish.populationSeasonInfo.arrival")}); + MatrixND newmat = MatrixFactory.getInstance().create(_("isisfish.populationSeasonInfo.migration"), sems, + new String[]{_("isisfish.populationSeasonInfo.group"), _("isisfish.populationSeasonInfo.departure"), _("isisfish.populationSeasonInfo.arrival")}); newmat.pasteSemantics(mat); mat = newmat; // perhaps call setCapturability, but if possible wait the user @@ -140,14 +140,14 @@ List [] sems = new List[]{ groups, zones }; if (mat == null) { - mat = MatrixFactory.getInstance().create(n_("isisfish.populationSeasonInfo.emigration"), sems, - new String[]{n_("isisfish.populationSeasonInfo.group"), n_("isisfish.populationSeasonInfo.departure")}); + mat = MatrixFactory.getInstance().create(_("isisfish.populationSeasonInfo.emigration"), sems, + new String[]{_("isisfish.populationSeasonInfo.group"), _("isisfish.populationSeasonInfo.departure")}); // we don't call setCapturability because is better to create a valid // matrix when capturability is null instead check validity and // create new one and paste the old } else if (!Arrays.equals(mat.getSemantics(), sems)){ MatrixND newmat = MatrixFactory.getInstance().create(n_("isisfish.populationSeasonInfo.emigration"), sems, - new String[]{n_("isisfish.populationSeasonInfo.group"), n_("isisfish.populationSeasonInfo.departure")}); + new String[]{_("isisfish.populationSeasonInfo.group"), _("isisfish.populationSeasonInfo.departure")}); newmat.pasteSemantics(mat); mat = newmat; // perhaps call setCapturability, but if possible wait the user @@ -169,14 +169,14 @@ List [] sems = new List[]{ groups, zones }; if (mat == null) { - mat = MatrixFactory.getInstance().create(n_("isisfish.populationSeasonInfo.immigration"), sems, - new String[]{n_("isisfish.populationSeasonInfo.group"), n_("isisfish.populationSeasonInfo.arrival")}); + mat = MatrixFactory.getInstance().create(_("isisfish.populationSeasonInfo.immigration"), sems, + new String[]{_("isisfish.populationSeasonInfo.group"), _("isisfish.populationSeasonInfo.arrival")}); // we don't call setCapturability because is better to create a valid // matrix when capturability is null instead check validity and // create new one and paste the old } else if (!Arrays.equals(mat.getSemantics(), sems)){ MatrixND newmat = MatrixFactory.getInstance().create(n_("isisfish.populationSeasonInfo.immigration"), sems, - new String[]{n_("isisfish.populationSeasonInfo.group"), n_("isisfish.populationSeasonInfo.arrival")}); + new String[]{_("isisfish.populationSeasonInfo.group"), _("isisfish.populationSeasonInfo.arrival")}); newmat.pasteSemantics(mat); mat = newmat; // perhaps call setCapturability, but if possible wait the user

1 0