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

r2286 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org May 27, 2009

May 27, 2009

Author: chatellier Date: 2009-05-27 14:26:59 +0000 (Wed, 27 May 2009) New Revision: 2286 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx Log: Set a matrix copy for modification detected by fire event Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-05-27 14:26:27 UTC (rev 2285) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-05-27 14:26:59 UTC (rev 2286) @@ -39,7 +39,7 @@ import org.codelutin.math.matrix.gui.MatrixPanelEvent; import org.codelutin.math.matrix.gui.MatrixPanelListener; -protected MatrixPanelListener matrixSeasonReproductionDistributionPanelListener; +protected MatrixPanelListener matrixPanelListener; protected Interval seasonInterval; protected boolean init = false;

1 0

r2285 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org May 27, 2009

May 27, 2009

Author: chatellier Date: 2009-05-27 14:26:27 +0000 (Wed, 27 May 2009) New Revision: 2285 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx Log: Set a matrix copy for modification detected by fire event Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-05-27 09:11:47 UTC (rev 2284) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-05-27 14:26:27 UTC (rev 2285) @@ -39,8 +39,8 @@ import org.codelutin.math.matrix.gui.MatrixPanelEvent; import org.codelutin.math.matrix.gui.MatrixPanelListener; -protected MatrixPanelListener matrixPanelListener = null; -protected Interval seasonInterval = null; +protected MatrixPanelListener matrixSeasonReproductionDistributionPanelListener; +protected Interval seasonInterval; protected boolean init = false; /* @@ -207,13 +207,14 @@ setPopSeasonInfoNotNull(getPopulationSeasonInfo() != null); setSeasonInterval(); setReproductionDistributionMatrix(); - //getVerifier().addCurrentEntity(getPopulationSeasonInfo()); + getVerifier().addCurrentEntity(getPopulationSeasonInfo()); init = false; } protected void setReproductionDistributionMatrix() { MatrixND reproductionDistribution = getPopulationSeasonInfo().getReproductionDistribution(); - fieldPopulationSeasonReproductionDistribution.setMatrix(reproductionDistribution); + // must be a copy (otherwise, modify current entity matrix) + fieldPopulationSeasonReproductionDistribution.setMatrix(reproductionDistribution.copy()); } // TODO une methode isXXX ne prend pas de parametre

1 0

r2284 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org May 27, 2009

May 27, 2009

Author: chatellier Date: 2009-05-27 09:11:47 +0000 (Wed, 27 May 2009) New Revision: 2284 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Log: Ajout de l'appel ?\195?\160 la m?\195?\169thode init() des plans d'analyse Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-05-26 15:52:43 UTC (rev 2283) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-05-27 09:11:47 UTC (rev 2284) @@ -691,6 +691,15 @@ control = job.getItem().getControl(); param = job.getItem().getParameter(); this.planContext = new AnalysePlanContext(control.getId(), param); + + try { + // appel de init sur chaque plan + for (AnalysePlan plan : param.getAnalysePlans()) { + plan.init(planContext); + } + } catch (Exception eee) { + throw new IsisFishRuntimeException(_("isisfish.error.evaluate.preplan.script"), eee); + } } /**

1 0

r2283 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org May 26, 2009

May 26, 2009

Author: chatellier Date: 2009-05-26 15:52:43 +0000 (Tue, 26 May 2009) New Revision: 2283 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx Log: Display correct distributionReproduction matrix (cut&paste ?). Refactor all UI (beautiful variables names, etc...) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-05-26 13:58:39 UTC (rev 2282) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-05-26 15:52:43 UTC (rev 2283) @@ -28,16 +28,19 @@ <Boolean id='popSeasonInfoNotNull' javaBean='false'/> <script><![CDATA[ +import fr.ifremer.isisfish.entities.PopulationSeasonInfo; import fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl; import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationImpl; +import fr.ifremer.isisfish.ui.widget.Interval; +import fr.ifremer.isisfish.ui.widget.IntervalPanel; +import org.codelutin.math.matrix.MatrixND; import org.codelutin.math.matrix.gui.MatrixPanelEvent; import org.codelutin.math.matrix.gui.MatrixPanelListener; -import fr.ifremer.isisfish.ui.widget.Interval; -protected MatrixPanelListener listener = null; -protected Interval interval = null; +protected MatrixPanelListener matrixPanelListener = null; +protected Interval seasonInterval = null; protected boolean init = false; /* @@ -45,19 +48,19 @@ * When first is set, last value from getPopulationSeasonInfo() * is erased by interval.getLast() default value. */ -ip.addPropertyChangeListener("first", new PropertyChangeListener() { +seasonIntervalPanel.addPropertyChangeListener("first", new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { if (getPopulationSeasonInfo() != null) { - getPopulationSeasonInfo().setFirstMonth(new Month(interval.getFirst())); + getPopulationSeasonInfo().setFirstMonth(new Month(seasonInterval.getFirst())); } } }); -ip.addPropertyChangeListener("last", new PropertyChangeListener() { +seasonIntervalPanel.addPropertyChangeListener("last", new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { if (getPopulationSeasonInfo() != null) { - getPopulationSeasonInfo().setLastMonth(new Month(interval.getLast())); + getPopulationSeasonInfo().setLastMonth(new Month(seasonInterval.getLast())); } } }); @@ -65,56 +68,54 @@ addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { - // remove previous binding on getBean() - //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); fieldPopulationSeasonComment.setText(""); fieldPopulationSeasonReproductionDistribution.setMatrix(null); } if (evt.getNewValue() != null) { - // add binding on getBean() - //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); + } } }); create.addActionListener(new ActionListener() { - @Override public void actionPerformed(ActionEvent e) { getContextValue(InputAction.class).createPopulationSeasonInfo(getBean()); - setCombo(); + setPopulationSeasonInfoCombo(); } }); remove.addActionListener(new ActionListener() { - @Override public void actionPerformed(ActionEvent e) { getContextValue(InputAction.class).removePopulationSeasonInfo(getBean(), getPopulationSeasonInfo()); - setCombo(); + setPopulationSeasonInfoCombo(); } }); save.addActionListener(new ActionListener() { - @Override public void actionPerformed(ActionEvent e) { getVerifier().topiaSave(); - setCombo(); + setPopulationSeasonInfoCombo(); } }); -listener = new MatrixPanelListener() { - +matrixPanelListener = new MatrixPanelListener() { @Override - public void matrixChanged(MatrixPanelEvent arg0) { - if (getPopulationSeasonInfo() != null && fieldPopulationSeasonReproductionDistribution.getMatrix() != null){ - getPopulationSeasonInfo().setLengthChangeMatrix(fieldPopulationSeasonReproductionDistribution.getMatrix().copy()); + public void matrixChanged(MatrixPanelEvent event) { + if (getPopulationSeasonInfo() != null && fieldPopulationSeasonReproductionDistribution.getMatrix() != null) { + MatrixND reproductionDistribution = fieldPopulationSeasonReproductionDistribution.getMatrix().copy(); + if (log.isDebugEnabled()) { + log.debug("Matrix ReproductionDistribution modified : " + reproductionDistribution); + } + getPopulationSeasonInfo().setReproductionDistribution(reproductionDistribution); } } }; -public void refresh(){ - if (!isActif()){ + +public void refresh() { + if (!isActif()) { setPopSeasonInfoNotNull(false); } getVerifier().setSaveButton(save, false); @@ -125,28 +126,30 @@ setBean((PopulationImpl) population); // Model instanciation - interval = new Interval(); - interval.setMin(0); - interval.setMax(11); - interval.setFirst(0); - interval.setLast(2); + seasonInterval = new Interval(); + seasonInterval.setMin(0); + seasonInterval.setMax(11); + seasonInterval.setFirst(0); + seasonInterval.setLast(2); - setCombo(); - setInterval(); + setPopulationSeasonInfoCombo(); + setSeasonInterval(); - ip.setLabelRenderer(Month.MONTH); - ip.setModel(interval); + seasonIntervalPanel.setLabelRenderer(Month.MONTH); + seasonIntervalPanel.setModel(seasonInterval); + fieldPopulationSeasonReproductionDistribution.addMatrixListener(matrixPanelListener); + if(getPopulationSeasonInfo() != null) { PopulationSeasonInfoImpl popInfo = getPopulationSeasonInfo(); setPopulationSeasonInfo(null); setPopulationSeasonInfo(popInfo); getVerifier().addCurrentEntity(getPopulationSeasonInfo()); } - fieldPopulationSeasonReproductionDistribution.addMatrixListener(listener); getVerifier().addCurrentPanel(populationSeasonSpecializedUI); } -protected void setInterval() { + +protected void setSeasonInterval() { if(getPopulationSeasonInfo() != null) { try { if (log.isDebugEnabled()) { @@ -155,23 +158,23 @@ Month firstMonth = getPopulationSeasonInfo().getFirstMonth(); if (firstMonth != null) { - interval.setFirst(firstMonth.getMonthNumber()); + seasonInterval.setFirst(firstMonth.getMonthNumber()); if (log.isDebugEnabled()) { - log.debug(" first : " + interval.getFirst()); + log.debug(" first : " + seasonInterval.getFirst()); } } else { - interval.setFirst(0); + seasonInterval.setFirst(0); } Month lastMonth = getPopulationSeasonInfo().getLastMonth(); if (lastMonth != null) { - interval.setLast(lastMonth.getMonthNumber()); + seasonInterval.setLast(lastMonth.getMonthNumber()); if (log.isDebugEnabled()) { - log.debug(" last : " + interval.getLast()); + log.debug(" last : " + seasonInterval.getLast()); } } else { - interval.setLast(3); + seasonInterval.setLast(3); } } catch (Exception e) { if (log.isErrorEnabled()) { @@ -180,29 +183,42 @@ } } } -protected void setCombo(){ - if (getBean() != null){ - jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationSeasonInfoChooser,getBean().getPopulationSeasonInfo(), getPopulationSeasonInfo(), true); + +protected void setPopulationSeasonInfoCombo() { + if (getBean() != null) { + jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationSeasonInfoChooser, + getBean().getPopulationSeasonInfo(), getPopulationSeasonInfo(), true); } } -protected void seasonGroupChanged(){ - if (getPopulationSeasonInfo() != null){ + +protected void seasonGroupChanged() { + if (getPopulationSeasonInfo() != null) { getPopulationSeasonInfo().setGroupChange(fieldPopulationSeasonGroupChange.isSelected()); } } + protected void seasonChanged(ActionEvent event) { init = true; - setPopulationSeasonInfo((PopulationSeasonInfoImpl)fieldPopulationSeasonInfoChooser.getSelectedItem()); - getVerifier().addCurrentEntity(getPopulationSeasonInfo()); + PopulationSeasonInfo seasonInfoSelected = (PopulationSeasonInfo)fieldPopulationSeasonInfoChooser.getSelectedItem(); + if (log.isDebugEnabled()) { + log.debug("Season changed : " + seasonInfoSelected); + } + setPopulationSeasonInfo((PopulationSeasonInfoImpl)seasonInfoSelected); setPopSeasonInfoNotNull(getPopulationSeasonInfo() != null); - setInterval(); - setMatrix(); + setSeasonInterval(); + setReproductionDistributionMatrix(); + //getVerifier().addCurrentEntity(getPopulationSeasonInfo()); init = false; } -protected void setMatrix(){ - fieldPopulationSeasonReproductionDistribution.setMatrix(getPopulationSeasonInfo().getLengthChangeMatrix()); + +protected void setReproductionDistributionMatrix() { + MatrixND reproductionDistribution = getPopulationSeasonInfo().getReproductionDistribution(); + fieldPopulationSeasonReproductionDistribution.setMatrix(reproductionDistribution); } -protected boolean isAgeGroupType(boolean result){ + +// TODO une methode isXXX ne prend pas de parametre +// et ne fait rien +protected boolean isAgeGroupType(boolean result) { populationSeasonSpecializedUI.setVisible(result); return result; } @@ -227,7 +243,7 @@ <JLabel text="isisfish.common.season" enabled='{isPopSeasonInfoNotNull()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <IntervalPanel id='ip' enabled='{isPopSeasonInfoNotNull()}' decorator='boxed'/> + <IntervalPanel id='seasonIntervalPanel' enabled='{isPopSeasonInfoNotNull()}' decorator='boxed'/> </cell> </row> <row> @@ -259,13 +275,15 @@ </row> <row> <cell anchor='east'> - <JLabel text="isisfish.populationSeasons.distributionSpawning" enabled='{isPopSeasonInfoNotNull()}' visible='{getPopulationSeasonInfo().getReproduction()}'/> + <JLabel text="isisfish.populationSeasons.distributionSpawning" enabled='{isPopSeasonInfoNotNull()}' + visible='{getPopulationSeasonInfo().getReproduction()}'/> </cell> <cell fill='both' weightx='1.0' weighty='0.2'> <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationSeasonReproductionDistribution' - matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getLengthChangeMatrix()}' enabled='{isPopSeasonInfoNotNull()}' + matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getReproductionDistribution()}' + enabled='{isPopSeasonInfoNotNull()}' visible='{getPopulationSeasonInfo().getReproduction()}' - decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"LengthChangeMatrix"'/> + decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"ReproductionDistribution"'/> </cell> </row> <row>

1 0

r2282 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org May 26, 2009

May 26, 2009

Author: chatellier Date: 2009-05-26 13:58:39 +0000 (Tue, 26 May 2009) New Revision: 2282 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx Log: Fix doc/imports Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-05-26 12:48:19 UTC (rev 2281) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-05-26 13:58:39 UTC (rev 2282) @@ -1,7 +1,6 @@  <fr.ifremer.isisfish.ui.input.InputContentUI> @@ -41,8 +28,6 @@ <Boolean id='popSeasonInfoNotNull' javaBean='false'/> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Season; -import fr.ifremer.isisfish.entities.PopulationSeasonInfo; import fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl; import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.entities.Population; @@ -50,7 +35,6 @@ import org.codelutin.math.matrix.gui.MatrixPanelEvent; import org.codelutin.math.matrix.gui.MatrixPanelListener; import fr.ifremer.isisfish.ui.widget.Interval; -import fr.ifremer.isisfish.ui.widget.IntervalPanel; protected MatrixPanelListener listener = null; protected Interval interval = null; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-05-26 12:48:19 UTC (rev 2281) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-05-26 13:58:39 UTC (rev 2282) @@ -1,7 +1,6 @@  - -  <fr.ifremer.isisfish.ui.input.InputContentUI>  <fr.ifremer.isisfish.entities.PopulationImpl id='bean' javaBean='null'/> <script><![CDATA[ - -import fr.ifremer.isisfish.entities.Gear; -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.PopulationImpl; import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; getVerifier().addCurrentPanel(this);

1 0

r2281 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org May 26, 2009

May 26, 2009

Author: chatellier Date: 2009-05-26 12:48:19 +0000 (Tue, 26 May 2009) New Revision: 2281 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Traduction des "spacialized" Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-05-26 11:48:34 UTC (rev 2280) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-05-26 12:48:19 UTC (rev 2281) @@ -749,10 +749,10 @@ isisfish.populationSeasons.comments=Commentaires isisfish.populationSeasons.computeCoefficient=Calculer le coefficient isisfish.populationSeasons.distributionSpawning=Distribution de la reproduction -isisfish.populationSeasons.noSpacialized=Non spacialized +isisfish.populationSeasons.noSpacialized=Non spatialis\u00E9 isisfish.populationSeasons.selectSeason=S\u00E9lectionnez une saison -isisfish.populationSeasons.showSpacialized=Voir les spacialized -isisfish.populationSeasons.spacialized=Spacialized +isisfish.populationSeasons.showSpacialized=Voir les coefficients spatialis\u00E9s +isisfish.populationSeasons.spacialized=spatialis\u00E9 isisfish.populationSeasons.title=Saisons isisfish.populationZones.betweenSpawningRecruitmentAreas=Correspondance entre les zones de reproduction et de recrutement isisfish.populationZones.selectPopulationAreas=S\u00E9lectionnez les zones des populations

1 0

r2280 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org May 26, 2009

May 26, 2009

Author: chatellier Date: 2009-05-26 11:48:34 +0000 (Tue, 26 May 2009) New Revision: 2280 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx Log: Fix equation refresh problem Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2009-05-26 11:48:09 UTC (rev 2279) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2009-05-26 11:48:34 UTC (rev 2280) @@ -69,7 +69,10 @@ if (evt.getNewValue() != null) { // add binding on getBean() //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); - setComboModel(); + //setComboModel(); + + // chatellier 20090526 : force refresh in bean change ? + refresh(); } } }); @@ -132,10 +135,11 @@ } } if (nameEquation != null){ + // chatellier 20090526 (change to get combo selected on this equation) + selectedEquation = getEquation(); setComboModel(); setFormule((Formule)formuleComboBox.getSelectedItem()); setEditorText(); - selectedEquation = getEquation(); } editor.getCurrentEditor().addDocumentListener(listener); } @@ -150,6 +154,13 @@ java.util.List<Item> items = new ArrayList<Item>(); items.add(new Item("null", " ", null, false)); for (Formule f : formules) { + // chatellier 20090526 equals seams to not work + //boolean selected = f.equals(selectedEquation); + /*if (log.isDebugEnabled()) { + log.debug("Compare formula"); + log.debug(" first : name=" + f.getName() + ", category=" + f.getCategory()); + log.debug(" second : name=" + selectedEquation.getName() + ", category=" + selectedEquation.getCategory()); + }*/ boolean selected = f.equals(selectedEquation); items.add(new Item(f.getName(), f.getName(), f, selected)); }

1 0

r2279 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org May 26, 2009

May 26, 2009

Author: chatellier Date: 2009-05-26 11:48:09 +0000 (Tue, 26 May 2009) New Revision: 2279 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java Log: Reduce timeout Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-05-26 08:25:16 UTC (rev 2278) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-05-26 11:48:09 UTC (rev 2279) @@ -550,7 +550,7 @@ } } session.setUserInfo(ui); - session.connect(60000); // timeout + session.connect(20000); // timeout // test here, if password has been asked to user if (session.isConnected() && sshKeyUsed && ui.getPassword() != null) {

1 0

r2278 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org May 26, 2009

May 26, 2009

Author: chatellier Date: 2009-05-26 08:25:16 +0000 (Tue, 26 May 2009) New Revision: 2278 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java Log: Augmentation de la valeur par defaut du check Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-05-26 08:18:00 UTC (rev 2277) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-05-26 08:25:16 UTC (rev 2278) @@ -881,7 +881,7 @@ /** Serveur accessible par SSH : emplacement des executables pbs */ SIMULATOR_SSH_PBSBINPATH("simulation.ssh.pbsbinpath", _("isisfish.config.main.simulation.ssh.pbsbinpath.description"), "/usr/pbs/bin"), /** Serveur accessible par SSH : interval de check du fichier de control */ - SIMULATOR_SSH_CONTROLCHECKINTERVAL("simulation.ssh.control.check.interval", _("isisfish.config.main.simulation.ssh.control.check.interval.description"), "30"), + SIMULATOR_SSH_CONTROLCHECKINTERVAL("simulation.ssh.control.check.interval", _("isisfish.config.main.simulation.ssh.control.check.interval.description"), "120"), /** Serveur accessible par SSH : nombre de simulations simultanées sur caparmor */ SIMULATOR_SSH_MAX_SIMULTANEOUS_SIMULATION("simulation.ssh.max.simultaneous.simulation", _("isisfish.config.main.simulation.max.simultaneous.simulation.description"), "20"),

1 0

r2277 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish java/fr/ifremer/isisfish/simulator/launcher java/fr/ifremer/isisfish/ui/simulator/launcher resources/i18n
by chatellier＠users.labs.libre-entreprise.org May 26, 2009

May 26, 2009

Author: chatellier Date: 2009-05-26 08:18:00 +0000 (Tue, 26 May 2009) New Revision: 2277 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SSHLauncherConfigUI.jaxx isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Le home distant de l'utilisateur est necessaire :(. Le temp doit ?\195?\170tre absolu. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-05-26 08:16:31 UTC (rev 2276) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-05-26 08:18:00 UTC (rev 2277) @@ -383,6 +383,25 @@ } /** + * Get remote user home directory. + * + * @return remote user home + */ + public String getSimulatorSshUserHome() { + String result = getOption(Option.SIMULATOR_SSH_USER_HOME.key); + return result; + } + + /** + * Change isis remote home directory. + * + * @param userhome new remote home + */ + public void setSimulatorSshUserHome(String userhome) { + setOption(Option.SIMULATOR_SSH_USER_HOME.key, userhome); + } + + /** * Retourne le chemin distant ou est installé isis. * * @return remote isis home @@ -852,7 +871,7 @@ /** Serveur accessible par ssh : login */ SIMULATOR_SSH_USER_NAME("simulation.ssh.username", _("isisfish.config.main.simulation.ssh.username.description"), ""), /** Serveur accessible par ssh : user home directory */ - //SIMULATOR_SSH_USER_HOME("simulation.ssh.userhome", _("isisfish.config.main.simulation.ssh.userhome.description"), ""), + SIMULATOR_SSH_USER_HOME("simulation.ssh.userhome", _("isisfish.config.main.simulation.ssh.userhome.description"), ""), /** Serveur accessible par ssh : remote data path */ SIMULATOR_SSH_DATAPATH("simulation.ssh.datapath", _("isisfish.config.main.simulation.ssh.datapath.description"), "isis-database-3"), /** Serveur accessible par ssh : remote isis home install */ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-05-26 08:16:31 UTC (rev 2276) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-05-26 08:18:00 UTC (rev 2277) @@ -1003,7 +1003,7 @@ + "/qdel `cat \"" + getRemoteTempDirectory() + "/" + simulationId + ".id\"`"; // and delete simulation - command += " && rm -rf \"" + IsisFish.config.getSimulatorSshDataPath() + "/simulations/" + simulationId + "\""; + //command += " && rm -rf \"" + IsisFish.config.getSimulatorSshDataPath() + "/simulations/" + simulationId + "\""; if (log.isDebugEnabled()) { log.debug("Send stop request : " + command); @@ -1025,9 +1025,9 @@ protected String getRemoteTempDirectory() { String remotePath = IsisFish.config.getSimulatorSshTmpPath(); - /*if (!remotePath.startsWith("/")) { + if (!remotePath.startsWith("/")) { remotePath = IsisFish.config.getSimulatorSshUserHome() + "/" + remotePath; - }*/ + } // upload directory in that dir if (!remotePath.endsWith("/")) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SSHLauncherConfigUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SSHLauncherConfigUI.jaxx 2009-05-26 08:16:31 UTC (rev 2276) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SSHLauncherConfigUI.jaxx 2009-05-26 08:18:00 UTC (rev 2277) @@ -54,7 +54,7 @@ sshKeyField.setText(IsisFish.config.getSSHPrivateKeyFilePath().getAbsolutePath()); // caparmor config - //sshUserhomeField.setText(IsisFish.config.getSimulatorSshUserHome()); + sshUserhomeField.setText(IsisFish.config.getSimulatorSshUserHome()); sshDatapathField.setText(IsisFish.config.getSimulatorSshDataPath()); sshIsisHomeField.setText(IsisFish.config.getSimulatorSshIsisHome()); sshTemppathField.setText(IsisFish.config.getSimulatorSshTmpPath()); @@ -155,7 +155,7 @@ IsisFish.config.setSimulatorSshUsername(currentSSHUsername); IsisFish.config.setSSHPrivateKeyFilePath(currentSSHKey); - //IsisFish.config.setSimulatorSshUserHome(currentSSHUserhome); + IsisFish.config.setSimulatorSshUserHome(currentSSHUserhome); IsisFish.config.setSimulatorSshDataPath(currentSSHDatapath); IsisFish.config.setSimulatorSshIsisHome(currentSSHIsisHome); IsisFish.config.setSimulatorSshTmpPath(currentSSHTempPath); @@ -226,8 +226,8 @@ setTestMessage(_("isisfish.simulator.ssh.configuration.connectionok"), false); // get user home - //currentSSHUserhome = getUserHomeDirectory(session); - //sshUserhomeField.setText(currentSSHUserhome); + currentSSHUserhome = getUserHomeDirectory(session); + sshUserhomeField.setText(currentSSHUserhome); session.disconnect(); validButton.setEnabled(true); @@ -241,6 +241,11 @@ log.error("Can't connect", e); } setTestMessage(_("isisfish.simulator.ssh.configuration.connectionerror", e.getMessage()), true); + } catch (SSHException e) { + if (log.isErrorEnabled()) { + log.error("Can't connect", e); + } + setTestMessage(_("isisfish.simulator.ssh.configuration.connectionerror", e.getMessage()), true); } catch (InvalidPassphraseException e) { if (log.isErrorEnabled()) { log.error("Can't connect", e); @@ -251,8 +256,6 @@ /** * Get user home directory with an opened session. - * - * @deprecated not used anymore */ protected String getUserHomeDirectory(Session session) throws SSHException { @@ -352,7 +355,6 @@ </row> </Table> <Table border='{BorderFactory.createTitledBorder(_("isisfish.simulator.ssh.configuration.environment"))}'> -  + </row> <row fill='horizontal'> <cell> <JLabel id='sshDatapathLabel' text='isisfish.config.main.simulation.ssh.datapath' Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-05-26 08:16:31 UTC (rev 2276) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-05-26 08:18:00 UTC (rev 2277) @@ -185,6 +185,7 @@ isisfish.config.main.simulation.ssh.server.description=Server adress isisfish.config.main.simulation.ssh.tmppath=Server temp directory isisfish.config.main.simulation.ssh.tmppath.description=Server temp directory +isisfish.config.main.simulation.ssh.userhome=User home directory isisfish.config.main.simulation.ssh.userhome.description=User home directory isisfish.config.main.simulation.ssh.username=SSH identifier isisfish.config.main.simulation.ssh.username.description=SSH identifier Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-05-26 08:16:31 UTC (rev 2276) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-05-26 08:18:00 UTC (rev 2277) @@ -185,7 +185,8 @@ isisfish.config.main.simulation.ssh.server.description=Adresse du serveur isisfish.config.main.simulation.ssh.tmppath=Dossier temporaire isisfish.config.main.simulation.ssh.tmppath.description=Emplacement du dossier temporaire -isisfish.config.main.simulation.ssh.userhome.description=R\u00E9pertoire d'accueil de l'utilsateur +isisfish.config.main.simulation.ssh.userhome=R\u00E9pertoire d'accueil +isisfish.config.main.simulation.ssh.userhome.description=R\u00E9pertoire d'accueil de l'utilisateur isisfish.config.main.simulation.ssh.username=Identifiant isisfish.config.main.simulation.ssh.username.description=Identifiant SSH pour se connecter au serveur isisfish.config.main.simulationServer.description=l'url du serveur de simulations distant

1 0