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

r2162 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/ui/input resources/i18n
by sletellier＠users.labs.libre-entreprise.org 30 Apr '09

30 Apr '09

Author: sletellier Date: 2009-04-30 16:41:43 +0000 (Thu, 30 Apr 2009) New Revision: 2162 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.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: Done : [#1817] manque de zones de saisie dans l'interface Population/Saison_ Bloquant EC Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java 2009-04-30 16:21:03 UTC (rev 2161) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java 2009-04-30 16:41:43 UTC (rev 2162) @@ -107,6 +107,7 @@ } // go back to previous node returnToPreviousNode(getNavigationTree(), event); + log.info("goBackToPreviousNode"); } @@ -121,7 +122,10 @@ try { currentUI = (InputContentUI) newUI; currentUI.setSens(false); - context.getContextValue(InputSaveVerifier.class).addCurrentPanel(currentUI); + InputSaveVerifier verifier = context.getContextValue(InputSaveVerifier.class); + verifier.removeAllPanels(); + verifier.addCurrentPanel(currentUI); + currentUI.refresh(); currentNode = node; } catch (Exception e) { if (log.isErrorEnabled()) { @@ -148,7 +152,7 @@ exit = false; } if (exit) { - verif.removeAllPanels(); + verif.reset(); } return exit; } @@ -164,9 +168,6 @@ if (TopiaEntity.class.isInstance(data)){ verif.addCurrentEntity((TopiaEntity) data); } - else{ - verif.addCurrentEntity(null); - } verif.refreshAll(); verif.setCurrentNode(node); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-04-30 16:21:03 UTC (rev 2161) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-04-30 16:41:43 UTC (rev 2162) @@ -373,6 +373,16 @@ addCurrentEntity(currentEntity, currentEntity.getTopiaId()); } } + public void reset(){ + removeAllEntity(); + removeAllPanels(); + this.currentCancelButton = null; + this.currentDeleteButton = null; + this.currentNewButton = null; + this.currentSaveButton = null; + this.currentOnglet = null; + this.currentNode = null; + } public void removeAllEntity(){ currentEntities.clear(); editable = false; Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2009-04-30 16:41:43 UTC (rev 2162) @@ -0,0 +1,124 @@ + +<fr.ifremer.isisfish.ui.input.InputContentUI> + +  + <fr.ifremer.isisfish.entities.PopulationImpl id='bean' javaBean='null'/> + + <fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl id='populationSeasonInfo' javaBean='null'/> + + <Boolean id='popSeasonInfoNotNull' javaBean='false'/> + + <Boolean id='ageGroupType' javaBean='false'/> + + <script><![CDATA[ +import fr.ifremer.isisfish.entities.PopulationSeasonInfo; +import org.codelutin.math.matrix.gui.JAXXMatrixEditor; +import fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl; +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.ErrorDialogUI; + +protected MatrixPanelListener listener = null; + +listener = new MatrixPanelListener() { + + @Override + public void matrixChanged(MatrixPanelEvent arg0) { + if (getPopulationSeasonInfo() != null && fieldPopulationSeasonReproductionDistribution.getMatrix() != null){ + getPopulationSeasonInfo().setLengthChangeMatrix(fieldPopulationSeasonReproductionDistribution.getMatrix().copy()); + } + } +}; +public void refresh(){ + fieldPopulationSeasonReproductionDistribution.addMatrixListener(listener); +} +public void spacialized(){ + getPopulationSeasonInfo().setSimpleLengthChangeMatrix(labelPopulationSeasonGroupChangeLengthNoSpacialized.isSelected()); + PopulationSeasonInfo popInfo = getPopulationSeasonInfo(); + try { + MatrixND mat = popInfo.getLengthChangeMatrix(); + if (mat != null){ + if (popInfo.getSimpleLengthChangeMatrix()) { + mat = popInfo.unspacializeLengthChangeMatrix(mat); + } else { + mat = popInfo.spacializeLengthChangeMatrix(mat); + popInfo.setLengthChangeMatrix(mat); + } + } + }catch(Exception eee){ + log.error("Can't (un)spacialize Matrix Change Of Group", eee); + ErrorDialogUI.showError(eee); + } +} + +public void computeMatrixChangeOfGroup(){ + PopulationSeasonInfo popInfo = getPopulationSeasonInfo(); + MatrixND mat = popInfo.computeLengthChangeMatrix(); + if(!popInfo.getSimpleLengthChangeMatrix()){ + mat = popInfo.spacializeLengthChangeMatrix(mat); + } + popInfo.setLengthChangeMatrix(mat); +} + +public void showSpacializedMatrixChangeOfGroup(){ + PopulationSeasonInfo popInfo = getPopulationSeasonInfo(); + MatrixND mat = popInfo.getLengthChangeMatrix(); + if(popInfo.getSimpleLengthChangeMatrix()){ + mat = popInfo.spacializeLengthChangeMatrix(mat); + } + JAXXMatrixEditor panel = new JAXXMatrixEditor(false, 800, 300); + panel.setMatrix(mat); + JOptionPane.showMessageDialog(null, panel, _("isisfish.message.spacialized.visualisation"), JOptionPane.INFORMATION_MESSAGE); +} + ]]></script> + + <Table> + <row> + <cell> + <Panel/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JRadioButton id="labelPopulationSeasonGroupChangeLengthNoSpacialized" + buttonGroup="labelPopulationSeasonGroupChangeLengthSpacializedGroup" + selected='{getPopulationSeasonInfo().getSimpleLengthChangeMatrix()}' + text="isisfish.populationSeasons.noSpacialized" decorator='boxed' + enabled='{isPopSeasonInfoNotNull()}' onItemStateChanged='spacialized()' + visible='{isAgeGroupType()}'/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JRadioButton id="labelPopulationSeasonGroupChangeLengthSpacialized" + buttonGroup="labelPopulationSeasonGroupChangeLengthSpacializedGroup" + selected='{!getPopulationSeasonInfo().getSimpleLengthChangeMatrix()}' + text="isisfish.populationSeasons.spacialized" enabled='{isPopSeasonInfoNotNull()}' + visible='{isAgeGroupType()}' decorator='boxed'/> + </cell> + </row> + <row> + <cell> + <JLabel text="isisfish.populationSeasons.changeGroup" visible='{isAgeGroupType()}'/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.populationSeasons.computeCoefficient" decorator='boxed' visible='{isAgeGroupType()}' + enabled='{isPopSeasonInfoNotNull()}' onActionPerformed='computeMatrixChangeOfGroup()'/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton id="labelPopulationSeasonGroupChangeLengthButtonShow" text="isisfish.populationSeasons.showSpacialized" + enabled='{labelPopulationSeasonGroupChangeLengthNoSpacialized.isSelected()}' decorator='boxed' + onActionPerformed='showSpacializedMatrixChangeOfGroup()' + visible='{isAgeGroupType()}'/> + </cell> + </row> + <row> + <cell> + <Panel/> + </cell> + <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> + <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationSeasonReproductionDistribution' + matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getLengthChangeMatrix()}' enabled='{isPopSeasonInfoNotNull()}' + decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"LengthChangeMatrix"' + visible='{isAgeGroupType()}'/> + </cell> + </row> + </Table> +</fr.ifremer.isisfish.ui.input.InputContentUI> 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-04-30 16:21:03 UTC (rev 2161) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-04-30 16:41:43 UTC (rev 2162) @@ -120,6 +120,15 @@ } }); +listener = new MatrixPanelListener() { + + @Override + public void matrixChanged(MatrixPanelEvent arg0) { + if (getPopulationSeasonInfo() != null && fieldPopulationSeasonReproductionDistribution.getMatrix() != null){ + getPopulationSeasonInfo().setLengthChangeMatrix(fieldPopulationSeasonReproductionDistribution.getMatrix().copy()); + } + } +}; public void refresh(){ if (!isActif()){ setPopSeasonInfoNotNull(false); @@ -144,16 +153,14 @@ ip.setLabelRenderer(Month.MONTH); ip.setModel(interval); - listener = new MatrixPanelListener() { - - @Override - public void matrixChanged(MatrixPanelEvent arg0) { - if (getPopulationSeasonInfo() != null && fieldPopulationSeasonReproductionDistribution.getMatrix() != null){ - getPopulationSeasonInfo().setLengthChangeMatrix(fieldPopulationSeasonReproductionDistribution.getMatrix().copy()); - } - } - }; + if(getPopulationSeasonInfo() != null) { + PopulationSeasonInfoImpl popInfo = getPopulationSeasonInfo(); + setPopulationSeasonInfo(null); + setPopulationSeasonInfo(popInfo); + getVerifier().addCurrentEntity(getPopulationSeasonInfo()); + } fieldPopulationSeasonReproductionDistribution.addMatrixListener(listener); + getVerifier().addCurrentPanel(populationSeasonSpecializedUI); } protected void setInterval() { if(getPopulationSeasonInfo() != null) { @@ -191,7 +198,7 @@ } protected void setCombo(){ if (getBean() != null){ - jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationSeasonInfoChooser,getBean().getPopulationSeasonInfo(), getBean().getPopulationSeasonInfo(), true); + jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationSeasonInfoChooser,getBean().getPopulationSeasonInfo(), getPopulationSeasonInfo(), true); } } protected void seasonGroupChanged(){ @@ -204,17 +211,17 @@ setPopulationSeasonInfo((PopulationSeasonInfoImpl)fieldPopulationSeasonInfoChooser.getSelectedItem()); getVerifier().addCurrentEntity(getPopulationSeasonInfo()); setPopSeasonInfoNotNull(getPopulationSeasonInfo() != null); - SwingUtilities.invokeLater(new Runnable() { - public void run() { - setInterval(); - setMatrix(); - init = false; - } - }); + setInterval(); + setMatrix(); + init = false; } protected void setMatrix(){ fieldPopulationSeasonReproductionDistribution.setMatrix(getPopulationSeasonInfo().getLengthChangeMatrix()); } +protected boolean isAgeGroupType(boolean result){ + populationSeasonSpecializedUI.setVisible(result); + return result; +} ]]> </script> <Table id='body'> @@ -240,32 +247,48 @@ </cell> </row> <row> - <cell> + <cell fill='both'> <JPanel/> </cell> - <cell fill='horizontal' weightx='1.0'> + <cell fill='both' weightx='1.0'> <JCheckBox id="fieldPopulationSeasonGroupChange" text="isisfish.populationSeasons.changeGroup" selected='{getPopulationSeasonInfo().getGroupChange()}' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"GroupChange"' - onActionPerformed='seasonGroupChanged()' enabled='{isPopSeasonInfoNotNull()}'/> + onActionPerformed='seasonGroupChanged()' enabled='{isPopSeasonInfoNotNull()}' visible='{isAgeGroupType(getPopulationSeasonInfo().getPopulation().getSpecies().getAgeGroupType())}'/> </cell> </row> <row> + <cell> + <JPanel/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JCheckBox id="fieldPopulationSeasonReproduction" selected='{getPopulationSeasonInfo().getReproduction()}' + onActionPerformed='getPopulationSeasonInfo().setReproduction(fieldPopulationSeasonReproduction.isSelected())' + text="isisfish.populationSeasons.Reproduction" enabled='{isPopSeasonInfoNotNull()}'/> + </cell> + </row> + <row> + <cell columns='2' fill='both' weightx='1.0' weighty='0.6'> + <PopulationSeasonSpacializedUI id='populationSeasonSpecializedUI' bean='{getBean()}' + populationSeasonInfo='{getPopulationSeasonInfo()}' popSeasonInfoNotNull='{isPopSeasonInfoNotNull()}' + ageGroupType='{isAgeGroupType(!getPopulationSeasonInfo().getPopulation().getSpecies().getAgeGroupType())}'/> + </cell> + </row> + <row> <cell anchor='east'> - <JLabel text="isisfish.populationSeasons.distributionSpawning" enabled='{isPopSeasonInfoNotNull()}'/> + <JLabel text="isisfish.populationSeasons.distributionSpawning" enabled='{isPopSeasonInfoNotNull()}' visible='{getPopulationSeasonInfo().getReproduction()}'/> </cell> - <cell fill='both' weightx='1.0'> - <JScrollPane> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationSeasonReproductionDistribution' - matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getLengthChangeMatrix()}' enabled='{isPopSeasonInfoNotNull()}' - decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"LengthChangeMatrix"'/> - </JScrollPane> + <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()}' + visible='{getPopulationSeasonInfo().getReproduction()}' + decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"LengthChangeMatrix"'/> </cell> </row> <row> <cell anchor='east'> <JLabel text="isisfish.populationSeasons.comments" enabled='{isPopSeasonInfoNotNull()}'/> </cell> - <cell fill='both' weightx='1.0' weighty='1.0'> + <cell fill='both' weightx='1.0' weighty='0.1'> <JScrollPane> <JTextArea id="fieldPopulationSeasonComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getSeasonsComment())}' onKeyReleased='getBean().setSeasonsComment(fieldPopulationSeasonComment.getText())' enabled='{isPopSeasonInfoNotNull()}' decorator='boxed'/> </JScrollPane> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-04-30 16:21:03 UTC (rev 2161) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-04-30 16:41:43 UTC (rev 2162) @@ -32,8 +32,6 @@ import fr.ifremer.isisfish.entities.Formule; import fr.ifremer.isisfish.entities.SetOfVessels; import fr.ifremer.isisfish.entities.SetOfVesselsImpl; -import java.util.logging.Level; -import java.util.logging.Logger; boolean init = false; addPropertyChangeListener("bean", new PropertyChangeListener() { 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-04-30 16:21:03 UTC (rev 2161) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-04-30 16:41:43 UTC (rev 2162) @@ -608,6 +608,7 @@ isisfish.message.simulation.ended=Simulation ended isisfish.message.simulation.execution=Simulation execution isisfish.message.simulation.prepare=Preparing simulation +isisfish.message.spacialized.visualisation= isisfish.message.tray.disabled=SystemTray disabled isisfish.message.update.finished=update finished isisfish.metier.comments=Comments @@ -731,10 +732,15 @@ isisfish.populationSeasonInfo.migration=Migration isisfish.populationSeasonInfo.months=Months isisfish.populationSeasonInfo.toString=%1$s season %2$s-%3$s +isisfish.populationSeasons.Reproduction=Reproduction isisfish.populationSeasons.changeGroup=Change of group isisfish.populationSeasons.comments=Comments +isisfish.populationSeasons.computeCoefficient=Calculate coefficient isisfish.populationSeasons.distributionSpawning=Distribution of spawning +isisfish.populationSeasons.noSpacialized=Not spacialized isisfish.populationSeasons.selectSeason=Select a season +isisfish.populationSeasons.showSpacialized=Show the spacialized +isisfish.populationSeasons.spacialized=Spacialized isisfish.populationSeasons.title=Saisons isisfish.populationZones.betweenSpawningRecruitmentAreas=Match between spawning and recruitment areas isisfish.populationZones.selectPopulationAreas=Select the population areas 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-04-30 16:21:03 UTC (rev 2161) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-04-30 16:41:43 UTC (rev 2162) @@ -608,6 +608,7 @@ isisfish.message.simulation.ended=Simulation termin\u00E9e isisfish.message.simulation.execution=Simulation execution isisfish.message.simulation.prepare=Pr\u00E9paration de la simulation +isisfish.message.spacialized.visualisation= isisfish.message.tray.disabled=Icone de notification d\u00E9sactiv\u00E9e isisfish.message.update.finished=Mise \u00E0 jour termin\u00E9e isisfish.metier.comments=Commentaires @@ -731,10 +732,15 @@ isisfish.populationSeasonInfo.migration=Migration isisfish.populationSeasonInfo.months=Mois isisfish.populationSeasonInfo.toString=%1$s saison %2$s-%3$s +isisfish.populationSeasons.Reproduction=Reproduction isisfish.populationSeasons.changeGroup=Changement de groupe isisfish.populationSeasons.comments=Commentaires +isisfish.populationSeasons.computeCoefficient=Calculer le coefficient isisfish.populationSeasons.distributionSpawning=Distribution de la reproduction +isisfish.populationSeasons.noSpacialized=Non spacialized isisfish.populationSeasons.selectSeason=S\u00E9lectionnez une saison +isisfish.populationSeasons.showSpacialized=Voir les spacialized +isisfish.populationSeasons.spacialized=Spacialized 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 @@ -1058,4 +1064,4 @@ minimum\ length= not\ started= region\ already\ exists\ %s\ use\ 'force'\ argument\ to\ force\ overwrite= -simulate\ %s\ with\ file\ %s= +simulate\ %s\ with\ file\ %s= \ No newline at end of file

1 0

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

30 Apr '09

Author: chatellier Date: 2009-04-30 16:21:03 +0000 (Thu, 30 Apr 2009) New Revision: 2161 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Log: Rechargement des ann?\195?\169es lors du rechargement d'un simulation Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-04-30 15:35:37 UTC (rev 2160) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-04-30 16:21:03 UTC (rev 2161) @@ -154,6 +154,8 @@ public void run() { getContextValue(SimulAction.class).loadOldSimulation(selected); refresh(); + // mise a jour des années + fieldSimulParamsNbAnnees.setText(String.valueOf(getContextValue(SimulAction.class).getNumberOfYear())); setFactorRegion(); setExportSens(); setSensitivityCalculator(); @@ -207,7 +209,7 @@ } } protected void setNbAnnees(){ - getContextValue(SimulAction.class).setNbAnnees(fieldSimulParamsNbAnnees.getText()); + getContextValue(SimulAction.class).setNumberOfYear(fieldSimulParamsNbAnnees.getText()); } protected void setListSimulParamsStrategiesItems(){ DefaultListModel listSimulParamsStrategiesModel = new DefaultListModel(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-04-30 15:35:37 UTC (rev 2160) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-04-30 16:21:03 UTC (rev 2161) @@ -514,7 +514,11 @@ // Years - public void setNbAnnees(String years) { + public int getNumberOfYear() { + return param.getNumberOfYear(); + } + + public void setNumberOfYear(String years) { param.setNumberOfYear(Integer.parseInt(years)); }

1 0

r2160 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: datastore simulator
by chatellier＠users.labs.libre-entreprise.org 30 Apr '09

30 Apr '09

Author: chatellier Date: 2009-04-30 15:35:37 +0000 (Thu, 30 Apr 2009) New Revision: 2160 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java Log: Fix hack cache problem (hack still not fixed) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2009-04-30 15:35:07 UTC (rev 2159) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2009-04-30 15:35:37 UTC (rev 2160) @@ -71,11 +71,20 @@ @SuppressWarnings("unchecked") static protected Map<String, RegionStorage> regions = (Map<String, RegionStorage>) new ReferenceMap(); - /** File to use to store next commit region comment */ protected File commentForNextCommitFile = null; - protected RegionStorage(File directory, String name) { + /** + * Constructor. + * + * @param directory region directory + * @param name region name + * + * FIXME constrcutor is publicc for hack in + * fr.ifremer.isisfish.simulator.SimulationParameter.fromProperties(File, Properties) + * set protected when fix hack + */ + public RegionStorage(File directory, String name) { super(directory, name); commentForNextCommitFile = new File(getDirectory(), "commentForNextCommit.txt"); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-04-30 15:35:07 UTC (rev 2159) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-04-30 15:35:37 UTC (rev 2160) @@ -349,7 +349,8 @@ // FIXME not good place and code if(this.region == null || !region.getName().equals(regionName)) { - this.region = RegionStorage.getRegion(directory, regionName); + // ATTENTION: directory pointe sur le repertoire de la simulation et non de la region + this.region = new RegionStorage(directory, regionName); // RegionStorage.getRegion(directory, regionName); } try {

1 0

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

30 Apr '09

Author: chatellier Date: 2009-04-30 15:35:07 +0000 (Thu, 30 Apr 2009) New Revision: 2159 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx Log: Re-enable combo box update Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-04-30 12:18:41 UTC (rev 2158) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-04-30 15:35:07 UTC (rev 2159) @@ -48,11 +48,10 @@ import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; // instances variables déclaration -// FIXME les liste ne sont plus actualisé, ca prend trop de resources -//SimulationServiceListener simulationListener; +SimulationServiceListener simulationListener; // end constructor code -/*simulationListener = new SimulationServiceListener() { +simulationListener = new SimulationServiceListener() { @Override public void simulationStart(SimulationService simService, SimulationJob job) { } @@ -65,15 +64,16 @@ @Override public void clearJobDone(SimulationService simService) { } -}*/ +} public ParamsUI(SimulAction action) { setContextValue(action); } public void refresh() { - //SimulationService.getService().removeSimulationServiceListener(simulationListener); - //SimulationService.getService().addSimulationServiceListener(simulationListener); + // TODO add comment why remove/readd ? + SimulationService.getService().removeSimulationServiceListener(simulationListener); + SimulationService.getService().addSimulationServiceListener(simulationListener); if (getContextValue(SimulAction.class).getSimulationStorage() != null) { fieldSimulParamsName.setText(getContextValue(SimulAction.class).getSimulationStorage().getName()); }

1 0

r2158 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish src/main/java/fr/ifremer/isisfish/actions src/main/java/fr/ifremer/isisfish/datastore src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 30 Apr '09

30 Apr '09

Author: chatellier Date: 2009-04-30 12:18:41 +0000 (Thu, 30 Apr 2009) New Revision: 2158 Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisTray.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java Log: Modify zip/unzip without export/import Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-04-29 15:04:54 UTC (rev 2157) +++ isis-fish/trunk/pom.xml 2009-04-30 12:18:41 UTC (rev 2158) @@ -527,6 +527,11 @@ </links> </configuration> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <version>1.2</version> + </plugin> </plugins> </reporting> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisTray.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisTray.java 2009-04-29 15:04:54 UTC (rev 2157) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisTray.java 2009-04-30 12:18:41 UTC (rev 2158) @@ -1,6 +1,5 @@ /* *##% - * Copyright (C) 2007 - * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2007 - 2009 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 @@ -17,18 +16,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -/* * - * IsisTray.java - * - * Created: 6 janv. 07 13:52:25 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ - package fr.ifremer.isisfish; import static org.codelutin.i18n.I18n._; @@ -51,54 +38,72 @@ import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; /** + * IsisTray.java + * + * Created: 6 janv. 07 13:52:25 + * * @author poussin + * @version $Revision$ * + * Last update: $Date$ + * by : $Author$ */ -public abstract class IsisTray implements SimulationServiceListener, PropertyChangeListener { +public abstract class IsisTray implements SimulationServiceListener, + PropertyChangeListener { /** to use log facility, just put in your code: log.info(\"...\"); */ - protected static Log log = LogFactory.getLog(IsisTray.class); + protected static final Log log = LogFactory.getLog(IsisTray.class); protected static final ImageIcon TRAY_IMAGE_STOP = Resource.getIcon("/images/BulbR.gif"); protected static final ImageIcon TRAY_IMAGE_START = Resource.getIcon("/images/BulbG.gif"); - - static final public String NO_SIMULATION_TEXT = n_("isisfish.tray.simulation.no"); - /** text a utiliser pour afficher l'etat de la simulation en cours + + private static final String NO_SIMULATION_TEXT = n_("isisfish.tray.simulation.no"); + + /** + * Texte a utiliser pour afficher l'etat de la simulation en cours. + * * <li>0 = id de simulation * <li>1 = pas de temps courant de la simulation * <li>2 = nombre total de pas de temps attendu */ - static final public String SIMULATION_TEXT = n_("isisfish.tray.simulation"); - - static protected IsisTray instance = null; - - abstract public void setImage(ImageIcon image); - abstract public void setToolTip(String text); - - static public IsisTray getInstance() { + private static final String SIMULATION_TEXT = n_("isisfish.tray.simulation"); + + private static IsisTray instance = null; + + public abstract void setImage(ImageIcon image); + + public abstract void setToolTip(String text); + + public static IsisTray getInstance() { if (instance == null) { if (AWTSystemTray.isSupported()) { instance = new AWTSystemTray(); } else { instance = new DummySystemTray(); } - log.info("Use System tray: " + instance.getClass().getName()); + if (log.isInfoEnabled()) { + log.info("Use System tray: " + instance.getClass().getName()); + } instance.setToolTip(_(NO_SIMULATION_TEXT)); - SimulationService.getService().addSimulationServiceListener(instance); + SimulationService.getService().addSimulationServiceListener( + instance); } return instance; } - - /* (non-Javadoc) + + /* * @see fr.ifremer.isisfish.simulator.SimulationQueueListener#simulationStart(fr.ifremer.isisfish.simulator.SimulationQueueEvent) */ public void simulationStart(SimulationService simService, SimulationJob job) { SimulationControl control = job.getItem().getControl(); control.addPropertyChangeListener(this); - getInstance().setToolTip(_(SIMULATION_TEXT, control.getId(), control.getProgress(), control.getProgressMax())); + getInstance().setToolTip( + _(SIMULATION_TEXT, control.getId(), control.getProgress(), + control.getProgressMax())); getInstance().setImage(TRAY_IMAGE_START); } - /* (non-Javadoc) + + /* * @see fr.ifremer.isisfish.simulator.SimulationQueueListener#simulationStop(fr.ifremer.isisfish.simulator.SimulationQueueEvent) */ public void simulationStop(SimulationService simService, SimulationJob job) { @@ -111,51 +116,54 @@ public void clearJobDone(SimulationService simService) { // nothing to do } - - /* (non-Javadoc) + + /* * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent) */ public void propertyChange(PropertyChangeEvent evt) { - SimulationControl control = (SimulationControl)evt.getSource(); - getInstance().setToolTip(_(SIMULATION_TEXT, control.getId(), control.getProgress(), control.getProgressMax())); + SimulationControl control = (SimulationControl) evt.getSource(); + getInstance().setToolTip( + _(SIMULATION_TEXT, control.getId(), control.getProgress(), + control.getProgressMax())); } - + static class DummySystemTray extends IsisTray { - /* (non-Javadoc) + /* * @see fr.ifremer.isisfish.IsisTray#setImage(javax.swing.ImageIcon) */ @Override public void setImage(ImageIcon image) { } - /* (non-Javadoc) + /* * @see fr.ifremer.isisfish.IsisTray#setToolTip(java.lang.String) */ @Override - public void setToolTip(String text) { + public void setToolTip(String text) { } - + } - + static class AWTSystemTray extends IsisTray { protected java.awt.TrayIcon trayIcon = null; - + static public boolean isSupported() { boolean result = SystemTray.isSupported(); return result; } - + @Override public void setImage(ImageIcon image) { trayIcon.setImage(image.getImage()); } + @Override public void setToolTip(String text) { trayIcon.setToolTip(text); } - - public AWTSystemTray() { + + public AWTSystemTray() { if (SystemTray.isSupported()) { // get the SystemTray instance SystemTray tray = SystemTray.getSystemTray(); @@ -179,7 +187,8 @@ popup.add(defaultItem);*/ /// ... add other items // construct a TrayIcon - trayIcon = new java.awt.TrayIcon(TRAY_IMAGE_STOP.getImage(), "Tray Demo", null); + trayIcon = new java.awt.TrayIcon(TRAY_IMAGE_STOP.getImage(), + "Tray Demo", null); trayIcon.setImageAutoSize(true); // set the TrayIcon properties //trayIcon.addActionListener(trayListener); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2009-04-29 15:04:54 UTC (rev 2157) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2009-04-30 12:18:41 UTC (rev 2158) @@ -23,11 +23,13 @@ import java.io.File; import java.io.FileInputStream; +import java.util.Collections; import java.util.Properties; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.util.FileUtil; +import org.codelutin.util.ZipUtil; import org.codelutin.util.ApplicationConfig.Action.Step; import fr.ifremer.isisfish.IsisConfig; @@ -71,8 +73,12 @@ File region) throws Exception { Properties props = new Properties(); FileInputStream inStream = new FileInputStream(parameterFile); - props.load(inStream); - inStream.close(); + try { + props.load(inStream); + } + finally { + inStream.close(); + } SimulationParameter params = new SimulationParameter(); params.fromProperties(SimulationStorage.getSimulationDirectory(), @@ -162,11 +168,17 @@ SimulationStorage simulationStorage = launcher.getSimulationStorage(SimulationService.getService(), control); // zip + md5 creation - simulationStorage.createZip(simulationResultZip, true); - + //simulationStorage.createZip(simulationResultZip, true); // close all resources + //simulationStorage.getStorage().closeContext(); + + // FIXME more performant than simulationStorage.createZip + //ZipUtil.compressFiles(simulationResultZip, simulationStorage.getFile(), + // Collections.singletonList(new File(simulationStorage.getFile(), simulationStorage.getName())), true); + ZipUtil.compress(simulationResultZip, simulationStorage.getFile(), null, true); + simulationStorage.getStorage().closeContext(); - + // remove simulation simulationStorage.delete(false); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2009-04-29 15:04:54 UTC (rev 2157) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2009-04-30 12:18:41 UTC (rev 2158) @@ -1,6 +1,5 @@ /* *##% - * Copyright (C) 2007 - * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2007 - 2009 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 @@ -17,18 +16,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -/* * - * SimulationInformation.java - * - * Created: 22 mars 07 11:01:01 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ - package fr.ifremer.isisfish.datastore; import static org.codelutin.i18n.I18n._; @@ -50,7 +37,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - /** * Cette classe permet de conserver des informations sur le deroulement d'une * simulation. La plupart des informations sont automatiquement renseignees, @@ -58,6 +44,10 @@ * {@link #addInformation(String)} * * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ */ public class SimulationInformation { @@ -84,7 +74,9 @@ this.file = file; if (file.exists()) { try { - info.load(new FileReader(file)); + FileReader reader = new FileReader(file); + info.load(reader); + reader.close(); } catch (IOException eee) { if (log.isWarnEnabled()) { log.warn(_("isisfish.error.read.simulation", file.getPath()), eee); @@ -93,7 +85,7 @@ } } - /* (non-Javadoc) + /* * @see java.lang.Object#toString() */ @Override @@ -131,7 +123,9 @@ protected void store() { try { - info.store(new FileWriter(file), "Simulation Information"); + FileWriter writer = new FileWriter(file); + info.store(writer, "Simulation Information"); + writer.close(); } catch (IOException eee) { if (log.isWarnEnabled()) { log.warn(_("isisfish.error.write.simulation", file.getPath()), eee); @@ -217,7 +211,7 @@ } } if (value == null) { - value = new Long(0); + value = Long.valueOf(0); } result.put(exportName, value); } 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-04-29 15:04:54 UTC (rev 2157) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-04-30 12:18:41 UTC (rev 2158) @@ -23,6 +23,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; +import java.io.InputStream; import java.io.StringWriter; import java.io.Writer; import java.rmi.RemoteException; @@ -36,10 +37,10 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaException; import org.codelutin.util.FileUtil; import org.codelutin.util.MD5; import org.codelutin.util.MD5InputStream; +import org.codelutin.util.ZipUtil; import com.jcraft.jsch.JSch; import com.jcraft.jsch.JSchException; @@ -184,6 +185,9 @@ public void simulationStarted() { try { semaphore.acquire(); + if (log.isDebugEnabled()) { + log.debug("Semaphore have now " + semaphore.availablePermits() + " available resources"); + } } catch (InterruptedException e) { if (log.isErrorEnabled()) { log.error("Semaphore aquiere has been interrupted", e); @@ -196,6 +200,9 @@ */ protected void simulationEnded() { semaphore.release(); + if (log.isDebugEnabled()) { + log.debug("Semaphore have now " + semaphore.availablePermits() + " available resources"); + } } /** @@ -203,7 +210,7 @@ */ @Override public void simulationStopRequest() { - semaphore.release(); + simulationEnded(); } /** @@ -346,7 +353,9 @@ // mais qu'elle a demandée a être arrêté simulationEnded(); - SimulationStorage.importZip(resultZipFile); + // FIXME too slow methods + //SimulationStorage.importZip(resultZipFile); + ZipUtil.uncompress(resultZipFile, SimulationStorage.getSimulationDirectory()); if (log.isDebugEnabled()) { log.debug("Simulation imported : " + resultZipFile.getAbsolutePath()); @@ -373,11 +382,11 @@ if (log.isDebugEnabled()) { log.debug(_("Error while downloading file : %s", e.getMessage())); } - } catch (TopiaException e) { + } /*catch (TopiaException e) { if (log.isErrorEnabled()) { log.error("Can't import result zip file", e); } - } + }*/ // INFORMATION file try { @@ -392,7 +401,13 @@ // on dit juste que la simulation a eu une demande // d'arret pour qu'elle s'arrete dans l'UI Properties infoProperties = new Properties(); - infoProperties.load(new FileInputStream(infoFile)); + InputStream isInfoFile = new FileInputStream(infoFile); + try { + infoProperties.load(isInfoFile); + } + finally { + isInfoFile.close(); + } if (!StringUtils.isEmpty(infoProperties .getProperty("exception"))) { synchronized (control) { @@ -649,7 +664,7 @@ String remoteFile = getRemoteResultZipPath(simulationId); SSHUtils.scpFrom(session, remoteFile, localFile); - + if (!StringUtils.isEmpty(md5sum)) { MD5InputStream in = new MD5InputStream(new FileInputStream(localFile)); while(in.read() != -1) {}

1 0

r2157 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: simulator/launcher ui/simulator
by chatellier＠users.labs.libre-entreprise.org 29 Apr '09

29 Apr '09

Author: chatellier Date: 2009-04-29 15:04:54 +0000 (Wed, 29 Apr 2009) New Revision: 2157 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/IsisFishServerSimulationLauncher.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Log: Change again semaphore mecanism. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-04-29 14:43:10 UTC (rev 2156) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-04-29 15:04:54 UTC (rev 2157) @@ -533,18 +533,8 @@ * Do nothing (no restriction on inprocess launcher). */ @Override - public void simulationEnded() { + public void simulationStopRequest() { } - /** - * {@inheritDoc} - * - * Do nothing (no restriction on inprocess launcher). - */ - @Override - public void simulationStarted() { - - } - } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/IsisFishServerSimulationLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/IsisFishServerSimulationLauncher.java 2009-04-29 14:43:10 UTC (rev 2156) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/IsisFishServerSimulationLauncher.java 2009-04-29 15:04:54 UTC (rev 2157) @@ -251,17 +251,7 @@ * Do nothing (no restriction on xml rpc launcher). */ @Override - public void simulationEnded() { + public void simulationStopRequest() { } - - /** - * {@inheritDoc} - * - * Do nothing (no restriction on xml rpc launcher). - */ - @Override - public void simulationStarted() { - - } } 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-04-29 14:43:10 UTC (rev 2156) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-04-29 15:04:54 UTC (rev 2157) @@ -178,13 +178,9 @@ } /** - * {@inheritDoc} - * * Use semaphore to limit simultaneous simulation number on caparmor. - * * @see Semaphore */ - @Override public void simulationStarted() { try { semaphore.acquire(); @@ -196,12 +192,17 @@ } /** + * Release one resource on semaphore. + */ + protected void simulationEnded() { + semaphore.release(); + } + + /** * {@inheritDoc} - * - * Release one resource onr semaphore. */ @Override - public void simulationEnded() { + public void simulationStopRequest() { semaphore.release(); } @@ -219,7 +220,7 @@ String simulationPrescript) throws RemoteException { // ask for available resources on caparmor - // bloquin until available + // blocking until available simulationStarted(); // start ssh session 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-04-29 14:43:10 UTC (rev 2156) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-04-29 15:04:54 UTC (rev 2157) @@ -436,9 +436,14 @@ // FIXME check SimulationStorage.exists(control.getId()) condition if ((control.getProgress() > 0 - && control.getProgress() >= control.getProgressMax() && SimulationStorage.exists(control.getId())) || control.isStopSimulationRequest()) { + && control.getProgress() >= control.getProgressMax() && SimulationStorage.exists(control.getId()))) { simulationEnded = true; } + + if (control.isStopSimulationRequest()) { + launcher.simulationStopRequest(); // to release one resource + simulationEnded = true; + } } catch (RemoteException e) { if (log.isErrorEnabled()) { log.error("Progression thread update error", e); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java 2009-04-29 14:43:10 UTC (rev 2156) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java 2009-04-29 15:04:54 UTC (rev 2157) @@ -105,23 +105,11 @@ */ public void updateControl(SimulationService simulationService, SimulationControl control) throws RemoteException; - - - /** - * Call it before starting a simulation. - * - * This call is bloquing until available resources. - * - * @deprecated managed by launcher himelf - */ - public void simulationStarted(); /** - * Call it after simulation end. + * Called if a started simulation has been ask to stop. * - * Release one resources. - * - * @deprecated managed by launcher himelf + * TODO review this mecanism (some resource could be not released) */ - public void simulationEnded(); + public void simulationStopRequest(); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java 2009-04-29 14:43:10 UTC (rev 2156) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java 2009-04-29 15:04:54 UTC (rev 2157) @@ -315,17 +315,7 @@ * Do nothing (no restriction on subprocess launcher). */ @Override - public void simulationEnded() { + public void simulationStopRequest() { } - - /** - * {@inheritDoc} - * - * Do nothing (no restriction on subprocess launcher). - */ - @Override - public void simulationStarted() { - - } } 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-04-29 14:43:10 UTC (rev 2156) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx 2009-04-29 15:04:54 UTC (rev 2157) @@ -17,18 +17,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ - -/* * - * QueueUI.java - * - * Created: 1 aout 2005 18:37:25 CEST - * - * @author Benjamin POUSSIN <poussin at codelutin.com> - * @version $Revision: 1312 $ - * - * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $ - * by : $Author: sletellier $ - */ --> <Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-04-29 14:43:10 UTC (rev 2156) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-04-29 15:04:54 UTC (rev 2157) @@ -237,7 +237,7 @@ return result; } - protected void stopSimulation(SimulationJob job) { + public void stopSimulation(SimulationJob job) { job.stop(); if (log.isInfoEnabled()) { log.info(_("User stop simulation %s", job.getItem().getControl()

1 0

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

29 Apr '09

Author: chatellier Date: 2009-04-29 14:43:10 +0000 (Wed, 29 Apr 2009) New Revision: 2156 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java Log: Fix test 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-04-29 14:42:22 UTC (rev 2155) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-04-29 14:43:10 UTC (rev 2156) @@ -82,8 +82,8 @@ protected Configuration freemarkerConfiguration; /** Freemarker qsub template. */ - //protected static final String QSUB_SCRIPT_TEMPLATE = "templates/ssh/isis-launch-with-qsub.seq"; - protected static final String QSUB_SCRIPT_TEMPLATE = "templates/ssh/isis-launch-with-cron.seq"; + protected static final String QSUB_SCRIPT_TEMPLATE = "templates/ssh/isis-launch-with-qsub.seq"; + //protected static final String QSUB_SCRIPT_TEMPLATE = "templates/ssh/isis-launch-with-cron.seq"; /** * Opened session. Stored in static context to not reask passphrase at each

1 0

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

29 Apr '09

Author: chatellier Date: 2009-04-29 14:42:22 +0000 (Wed, 29 Apr 2009) New Revision: 2155 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java Log: Add comment (for semaphore hack) don't work in all case. 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-04-29 14:35:39 UTC (rev 2154) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-04-29 14:42:22 UTC (rev 2155) @@ -82,8 +82,8 @@ protected Configuration freemarkerConfiguration; /** Freemarker qsub template. */ - protected static final String QSUB_SCRIPT_TEMPLATE = "templates/ssh/isis-launch-with-qsub.seq"; - //protected static final String QSUB_SCRIPT_TEMPLATE = "templates/ssh/isis-launch-with-cron.seq"; + //protected static final String QSUB_SCRIPT_TEMPLATE = "templates/ssh/isis-launch-with-qsub.seq"; + protected static final String QSUB_SCRIPT_TEMPLATE = "templates/ssh/isis-launch-with-cron.seq"; /** * Opened session. Stored in static context to not reask passphrase at each @@ -340,6 +340,9 @@ if (resultZipFile != null) { // FIXME done here to not break upload during import + // FIXME je pense que les resources ne sont + // pas liberees si la simulation a commencé + // mais qu'elle a demandée a être arrêté simulationEnded(); SimulationStorage.importZip(resultZipFile);

1 0

r2154 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator: . launcher
by chatellier＠users.labs.libre-entreprise.org 29 Apr '09

29 Apr '09

Author: chatellier Date: 2009-04-29 14:35:39 +0000 (Wed, 29 Apr 2009) New Revision: 2154 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java Log: Start simulation uploading before importing zip Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java 2009-04-29 14:12:34 UTC (rev 2153) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java 2009-04-29 14:35:39 UTC (rev 2154) @@ -52,11 +52,14 @@ } catch (IOException e) { log.warn(_("isisfish.error.load.file", file)); } finally { - if (reader != null) try { - reader.close(); - } catch (IOException e) { - //TODO + if (reader != null) { + try { + reader.close(); + } catch (IOException e) { + //TODO + } } + } } } 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-04-29 14:12:34 UTC (rev 2153) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-04-29 14:35:39 UTC (rev 2154) @@ -338,6 +338,10 @@ File resultZipFile = downloadZIPResults(sshSession, control.getId(), md5sum); if (resultZipFile != null) { + + // FIXME done here to not break upload during import + simulationEnded(); + SimulationStorage.importZip(resultZipFile); if (log.isDebugEnabled()) { 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-04-29 14:12:34 UTC (rev 2153) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-04-29 14:35:39 UTC (rev 2154) @@ -468,7 +468,8 @@ SimulationControl control = job.getItem().getControl(); // Release one available resource on launcher - launcher.simulationEnded(); + // FIXME done by launcher himself + //launcher.simulationEnded(); if (log.isInfoEnabled()) { log.info("Do post simulation operation for " + control.getId()); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java 2009-04-29 14:12:34 UTC (rev 2153) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java 2009-04-29 14:35:39 UTC (rev 2154) @@ -111,6 +111,8 @@ * Call it before starting a simulation. * * This call is bloquing until available resources. + * + * @deprecated managed by launcher himelf */ public void simulationStarted(); @@ -118,6 +120,8 @@ * Call it after simulation end. * * Release one resources. + * + * @deprecated managed by launcher himelf */ public void simulationEnded(); }

1 0

r2153 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions
by chatellier＠users.labs.libre-entreprise.org 29 Apr '09

29 Apr '09

Author: chatellier Date: 2009-04-29 14:12:34 +0000 (Wed, 29 Apr 2009) New Revision: 2153 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java Log: Delete simulation after closing it Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2009-04-29 13:27:09 UTC (rev 2152) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2009-04-29 14:12:34 UTC (rev 2153) @@ -164,12 +164,12 @@ // zip + md5 creation simulationStorage.createZip(simulationResultZip, true); + // close all resources + simulationStorage.getStorage().closeContext(); + // remove simulation simulationStorage.delete(false); - // close all resources - simulationStorage.getStorage().closeContext(); - // FIXME integrer ca dans le process normal d'init IsisFish.quit(); }

1 0