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

r1689 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org 18 Dec '08

18 Dec '08

Author: sletellier Date: 2008-12-18 14:44:56 +0000 (Thu, 18 Dec 2008) New Revision: 1689 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx Log: Debug final ! Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2008-12-18 14:32:38 UTC (rev 1688) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2008-12-18 14:44:56 UTC (rev 1689) @@ -63,7 +63,7 @@ import org.codelutin.topia.TopiaException; -protected IsisMapBean cellMap = new IsisMapBean(); +protected IsisMapBean cellMap = null; protected OpenMapToolPanel toolMap = new OpenMapToolPanel(); protected OMToolSet toolSet = new OMToolSet(); protected OpenMapEvents mapListener = null; @@ -92,17 +92,18 @@ Cell cell = action.getCell(); setBean((CellImpl) cell); jaxx.runtime.swing.Utils.fillComboBox(fieldCell,action.getFisheryRegion().getCell(), cell); + if (cellMap == null){ + cellMap = new IsisMapBean(); + cellMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION); + cellMap.setActiveMouseMode(new SelectMouseMode()); + cellMap.setFisheryRegion(action.getFisheryRegion()); + toolSet.setupListeners(cellMap); + toolMap.add((Component)toolSet); + setMapListener(); + cellMapPanel.add(toolMap, BorderLayout.NORTH); + cellMapPanel.add(cellMap, BorderLayout.CENTER); + } - cellMap = new IsisMapBean(); - cellMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION); - cellMap.setActiveMouseMode(new SelectMouseMode()); - cellMap.setFisheryRegion(action.getFisheryRegion()); - toolSet.setupListeners(cellMap); - toolMap.add((Component)toolSet); - setMapListener(); - cellMapPanel.add(toolMap, BorderLayout.NORTH); - cellMapPanel.add(cellMap, BorderLayout.CENTER); - if (cell != null){ cellMap.setSelectedCells(cell); }

1 0

r1688 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map
by sletellier＠users.labs.libre-entreprise.org 18 Dec '08

18 Dec '08

Author: sletellier Date: 2008-12-18 14:32:38 +0000 (Thu, 18 Dec 2008) New Revision: 1688 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java Log: Debug final ! Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2008-12-18 14:22:08 UTC (rev 1687) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2008-12-18 14:32:38 UTC (rev 1688) @@ -86,7 +86,7 @@ protected MouseDelegator md; protected CellSelectionLayer activeSelectionLayer = null; - protected int selectionMode = CellSelectionLayer.SINGLE_SELECTION; + protected int selectionMode = CellSelectionLayer.MULT_SELECTION; protected static final float SCALE = 9500000f;

1 0

r1687 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org 18 Dec '08

18 Dec '08

Author: sletellier Date: 2008-12-18 14:22:08 +0000 (Thu, 18 Dec 2008) New Revision: 1687 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx Log: Debug final ! Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2008-12-18 13:47:04 UTC (rev 1686) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2008-12-18 14:22:08 UTC (rev 1687) @@ -93,11 +93,12 @@ setBean((CellImpl) cell); jaxx.runtime.swing.Utils.fillComboBox(fieldCell,action.getFisheryRegion().getCell(), cell); + cellMap = new IsisMapBean(); + cellMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION); + cellMap.setActiveMouseMode(new SelectMouseMode()); cellMap.setFisheryRegion(action.getFisheryRegion()); toolSet.setupListeners(cellMap); toolMap.add((Component)toolSet); -// cellMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION); -// cellMap.setActiveMouseMode(new SelectMouseMode()); setMapListener(); cellMapPanel.add(toolMap, BorderLayout.NORTH); cellMapPanel.add(cellMap, BorderLayout.CENTER); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2008-12-18 13:47:04 UTC (rev 1686) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2008-12-18 14:22:08 UTC (rev 1687) @@ -45,6 +45,8 @@ import fr.ifremer.isisfish.entities.FisheryRegion; import com.bbn.openmap.gui.OMToolSet; import fr.ifremer.isisfish.map.IsisMapBean; + import fr.ifremer.isisfish.map.CellSelectionLayer; + import com.bbn.openmap.event.SelectMouseMode; import fr.ifremer.isisfish.map.OpenMapToolPanel; import fr.ifremer.isisfish.ui.WelcomePanelUI; @@ -59,6 +61,8 @@ } protected void init(){ cellMap = new IsisMapBean(); + cellMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION); + cellMap.setActiveMouseMode(new SelectMouseMode()); toolSet.setupListeners(cellMap); toolMap.add((Component)toolSet); fisheryRegionMapPanel.add(toolMap, BorderLayout.NORTH); @@ -79,6 +83,9 @@ refreshMap(); } protected void refreshMap(){ +// cellMap = new IsisMapBean(); +// cellMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION); +// cellMap.setActiveMouseMode(new SelectMouseMode()); cellMap.setFisheryRegion(region); cellMap.repaint(); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2008-12-18 13:47:04 UTC (rev 1686) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2008-12-18 14:22:08 UTC (rev 1687) @@ -93,6 +93,9 @@ } + portMap = new IsisMapBean(); + portMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION); + portMap.setActiveMouseMode(new SelectMouseMode()); portMap.setFisheryRegion(getContextValue(InputAction.class).getFisheryRegion()); toolSet.setupListeners(portMap); toolMap.add((Component)toolSet); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2008-12-18 13:47:04 UTC (rev 1686) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2008-12-18 14:22:08 UTC (rev 1687) @@ -58,7 +58,7 @@ import java.util.logging.Level; import java.util.logging.Logger; - protected IsisMapBean zoneMap = new IsisMapBean(); + protected IsisMapBean zoneMap = null; protected OpenMapToolPanel toolMap = new OpenMapToolPanel(); protected OMToolSet toolSet = new OMToolSet(); protected MapMouseListener mapListener = null; @@ -101,12 +101,17 @@ fieldZoneName.setText(""); fieldZoneComment.setText(""); } - zoneMap.setFisheryRegion(getContextValue(InputAction.class).getFisheryRegion()); - toolSet.setupListeners(zoneMap); - toolMap.add((Component)toolSet); - setMapListener(); - zoneMapPanel.add(toolMap, BorderLayout.NORTH); - zoneMapPanel.add(zoneMap, BorderLayout.CENTER); + if (zoneMap == null){ + zoneMap = new IsisMapBean(); + zoneMap.setActiveMouseMode(new SelectMouseMode(false)); + zoneMap.setSelectionMode(CellSelectionLayer.MULT_SELECTION); + zoneMap.setFisheryRegion(getContextValue(InputAction.class).getFisheryRegion()); + toolSet.setupListeners(zoneMap); + toolMap.add((Component)toolSet); + setMapListener(); + zoneMapPanel.add(toolMap, BorderLayout.NORTH); + zoneMapPanel.add(zoneMap, BorderLayout.CENTER); + } refreshMap(); } protected void setMapListener(){

1 0

r1686 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org 18 Dec '08

18 Dec '08

Author: sletellier Date: 2008-12-18 13:47:04 +0000 (Thu, 18 Dec 2008) New Revision: 1686 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx Log: Debug vol5 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2008-12-18 13:37:45 UTC (rev 1685) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2008-12-18 13:47:04 UTC (rev 1686) @@ -96,21 +96,26 @@ GenericCell cell = (GenericCell) fieldPopulationGroupPopulationGroup.getSelectedItem(); if (cell.getValue() != null){ jaxx.runtime.Util.assignment(populationGroup = (PopulationGroup)cell.getValue(), "populationGroup", fr.ifremer.isisfish.ui.input.PopulationGroupUI.this); + valueChanged(true); refresh(); } } } protected void reproductionRateChanged(){ populationGroup.setReproductionRate(Double.parseDouble(fieldPopulationGroupReproductionRate.getText())); + valueChanged(true); } protected void groupMinLengthChanged(){ populationGroup.setMinLength(Double.parseDouble(fieldPopulationGroupMinLength.getText())); + valueChanged(true); } protected void groupMaxLengthChanged(){ populationGroup.setMaxLength(Double.parseDouble(fieldPopulationGroupMaxLength.getText())); + valueChanged(true); } protected void groupCommentChanged(){ populationGroup.setComment(fieldPopulationGroupComment.getText()); + valueChanged(true); } protected void save(){ TopiaEntity topia = getContextValue(InputAction.class).save(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2008-12-18 13:37:45 UTC (rev 1685) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2008-12-18 13:47:04 UTC (rev 1686) @@ -121,6 +121,7 @@ MatrixND mat = popInfo.getEmigrationMatrix().copy(); mat.setValue(group, departure, 0); + getParentContainer(PopulationMigrationUI.class).valueChanged(true); popInfo.setEmigrationMatrix(mat); }catch(Exception eee){ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2008-12-18 13:37:45 UTC (rev 1685) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2008-12-18 13:47:04 UTC (rev 1686) @@ -73,6 +73,7 @@ @Override public void matrixChanged(MatrixPanelEvent arg0) { popInfo.setImmigrationMatrix(populationMigrationImmigrationTable.getMatrix()); + getParentContainer(PopulationMigrationUI.class).valueChanged(true); } }); } @@ -116,6 +117,7 @@ MatrixND mat = popInfo.getImmigrationMatrix().copy(); mat.setValue(group, departure, arrival, 0); popInfo.setImmigrationMatrix(mat); + getParentContainer(PopulationMigrationUI.class).valueChanged(true); refresh(); } ]]> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2008-12-18 13:37:45 UTC (rev 1685) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2008-12-18 13:47:04 UTC (rev 1686) @@ -74,6 +74,7 @@ @Override public void matrixChanged(MatrixPanelEvent arg0) { popInfo.setMigrationMatrix(populationMigrationMigrationTable.getMatrix()); + getParentContainer(PopulationMigrationUI.class).valueChanged(true); } }); } @@ -127,6 +128,7 @@ MatrixND mat = popInfo.getMigrationMatrix().copy(); mat.setValue(group, departure, arrival, 0); popInfo.setMigrationMatrix(mat); + getParentContainer(PopulationMigrationUI.class).valueChanged(true); refresh(); } ]]> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2008-12-18 13:37:45 UTC (rev 1685) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2008-12-18 13:47:04 UTC (rev 1686) @@ -120,6 +120,7 @@ } protected void seasonChooserChanged(){ // populationSeasonInfoSelected = getPopulationSeasonInfo(); + valueChanged(true); refresh(); } protected void useEquationChanged(){ @@ -129,7 +130,7 @@ else{ ((CardLayout) hidablePanel.getLayout()).show(hidablePanel, "fieldUseMatrix"); } - + valueChanged(true); } protected void commentChanged(){ pop.setMigrationComment(fieldPopulationMigrationComment.getText()); 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 2008-12-18 13:37:45 UTC (rev 1685) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2008-12-18 13:47:04 UTC (rev 1686) @@ -142,18 +142,20 @@ } ip.setLabelRenderer(Month.MONTH); ip.setModel(interval); - valueChanged(false); + valueChanged(true); } } protected void groupChangedChanged(){ PopulationSeasonInfo selected = getPopulationSeasonInfo(); if (selected != null){ selected.setGroupChange(fieldPopulationSeasonGroupChange.isSelected()); + valueChanged(true); } } protected void commentChanged(){ if (pop != null){ pop.setSeasonsComment(fieldPopulationSeasonComment.getText()); + valueChanged(true); } } protected void create(){ @@ -172,7 +174,7 @@ refresh(); } protected void cancel(){ - TopiaEntity topia = getContextValue(InputAction.class).cancel(); + getContextValue(InputAction.class).cancel(); valueChanged(false); refresh(); setInfoText(_("isisfish.message.cancel.finished"));

1 0

r1685 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 18 Dec '08

18 Dec '08

Author: chatellier Date: 2008-12-18 13:37:45 +0000 (Thu, 18 Dec 2008) New Revision: 1685 Modified: 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: Modify about copyright. 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 2008-12-18 13:33:18 UTC (rev 1684) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2008-12-18 13:37:45 UTC (rev 1685) @@ -62,7 +62,7 @@ destination\ already\ exists\ %s\ use\ \\'force\\'\ argument\ to\ force\ overwrite= directory\ %s\ must\ be\ a\ directory= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. -isisfish.about.abouthtmltext=<html><b>Isis-Fish (%s)</b><br /><br />Copyright 2002 - 2008, Code Lutin.<br /><br /><a href\="http\://isis-fish.labs.libre-entreprise.org">http\://isis-fish.labs.libre-entreprise.org</a><br /><br />Please, report any bug you can found.<html> +isisfish.about.abouthtmltext=<html><b>Isis-Fish (%s)</b><br /><br />Copyright 2002 - 2008, Ifremer - Code Lutin.<br /><br /><a href\="http\://isis-fish.labs.libre-entreprise.org">http\://isis-fish.labs.libre-entreprise.org</a><br /><br />Please, report any bug you can found.<html> isisfish.about.licensetext=You can modify and redistribute the program under the conditions of the GNU General Public License (version 2 or later). A copy of the GPL is in the file "LICENSE.txt" provided with Isis-Fish. All rights reserved. No guarantees are provided for use of this program. isisfish.about.title=About Isis-Fish... isisfish.advancedParameters.title=advanced Parameters 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 2008-12-18 13:33:18 UTC (rev 1684) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2008-12-18 13:37:45 UTC (rev 1685) @@ -62,7 +62,7 @@ destination\ already\ exists\ %s\ use\ \\'force\\'\ argument\ to\ force\ overwrite= directory\ %s\ must\ be\ a\ directory= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. -isisfish.about.abouthtmltext=<html><b>Isis-Fish (%s)</b><br /><br />Copyright 2002 - 2008, Code Lutin.<br /><br /><a href\="http\://isis-fish.labs.libre-entreprise.org">http\://isis-fish.labs.libre-entreprise.org</a><br /><br />Merci de rapporter les bugs.<html> +isisfish.about.abouthtmltext=<html><b>Isis-Fish (%s)</b><br /><br />Copyright 2002 - 2008, Ifremer - Code Lutin.<br /><br /><a href\="http\://isis-fish.labs.libre-entreprise.org">http\://isis-fish.labs.libre-entreprise.org</a><br /><br />Merci de rapporter les bugs.<html> isisfish.about.licensetext=Vous pouvez modifier et redistribuer ce programme sous les conditions \u00E9nonc\u00E9es par la licence GNU GPL (version 2 ou ult\u00E9rieure). Une copie de la licence GPL est dans le fichier \u00AB\u00A0LICENSE.txt\u00A0\u00BB fourni avec Isis-Fish. Tous droits r\u00E9serv\u00E9s. Aucune garantie n'est fournie pour l'utilisation de ce programme. isisfish.about.title=\u00C0 propos de Isis-Fish... isisfish.advancedParameters.title=Param\u00E8tres avanc\u00E9s

1 0

r1684 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by sletellier＠users.labs.libre-entreprise.org 18 Dec '08

18 Dec '08

Author: sletellier Date: 2008-12-18 13:33:18 +0000 (Thu, 18 Dec 2008) New Revision: 1684 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx Log: Debug vol5 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2008-12-18 13:33:05 UTC (rev 1683) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2008-12-18 13:33:18 UTC (rev 1684) @@ -129,7 +129,7 @@ root.setInfoText(txt); } public void valueChanged(boolean b){ - changed = b; + getParentContainer(StrategyUI.class).setChanged(b); save.setEnabled(b); cancel.setEnabled(b); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2008-12-18 13:33:05 UTC (rev 1683) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2008-12-18 13:33:18 UTC (rev 1684) @@ -48,6 +48,8 @@ protected StrategyMonthInfo strategyMonthInfo = null; Month month = null; + PropertyChangeListener listener = null; + public StrategyOneMonthInfoUI (InputAction action){ setContextValue(action); @@ -95,16 +97,24 @@ protected void setFieldStrategyMonthInfoProportionModel(){ if (strategyMonthInfo != null){ fieldStrategyMonthInfoProportion.setMatrix(strategyMonthInfo.getProportionMetier()); - strategyMonthInfo.addPropertyChangeListener(new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - strategyMonthInfo.setProportionMetier(fieldStrategyMonthInfoProportion.getMatrix()); - valueChanged(true); + if (listener == null){ + strategyMonthInfo.addPropertyChangeListener(getListener()); } - }); } } + protected PropertyChangeListener getListener(){ + listener = new PropertyChangeListener() { + + @Override + public void propertyChange(PropertyChangeEvent evt) { + if (fieldStrategyMonthInfoProportion.getMatrix() != null){ + strategyMonthInfo.setProportionMetier(fieldStrategyMonthInfoProportion.getMatrix()); + valueChanged(true); + } + } + }; + return listener; + } protected void tripTypeChanged(){ Object selected = fieldStrategyMonthInfoTripType.getSelectedItem(); if (selected != null){ @@ -116,6 +126,7 @@ protected void minInactivityDayChanged(){ strategyMonthInfo.setMinInactivityDays(Double.parseDouble(fieldStrategyMonthInfoMinInactivityDays.getText())); valueChanged(true); + refresh(); } protected void valueChanged(boolean b){ getParentContainer(StrategyMonthInfoUI.class).valueChanged(b); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2008-12-18 13:33:05 UTC (rev 1683) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2008-12-18 13:33:18 UTC (rev 1684) @@ -170,7 +170,7 @@ root.setInfoText(txt); } protected void valueChanged(boolean b){ - changed=b; + getParentContainer(StrategyUI.class).setChanged(b); save.setEnabled(b); cancel.setEnabled(b); }

1 0

r1683 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui
by sletellier＠users.labs.libre-entreprise.org 18 Dec '08

18 Dec '08

Author: sletellier Date: 2008-12-18 13:33:05 +0000 (Thu, 18 Dec 2008) New Revision: 1683 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx Log: About Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2008-12-18 12:16:42 UTC (rev 1682) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2008-12-18 13:33:05 UTC (rev 1683) @@ -81,18 +81,21 @@ // FIXME a reimplanter } protected void about(){ - AboutFrame about = new AboutFrame(); - about.setTitle(_("isisfish.about.title")); - about.setIconPath("images/strategy.jpg"); - about.setAboutHtmlText(_("isisfish.about.abouthtmltext", IsisConfig.getVersion())); - about.setLicenseText(_("isisfish.about.licensetext")); - about.setBackgroundColor(Color.WHITE); - // center frame - Dimension dim = getToolkit().getScreenSize(); - about.setSize(640, 520); - about.setLocation((dim.width - about.getSize().width) / 2, - (dim.height - about.getSize().height) / 2); - about.setVisible(true); + org.codelutin.widget.AboutFrame about = new org.codelutin.widget.AboutFrame(); +// about.setAboutHtmlText($jaxxObjectDescriptor) +// AboutFrame about = new AboutFrame(); + about.setTitle(_("isisfish.about.title")); + about.setIconPath("images/strategy.jpg"); + about.setAboutHtmlText(_("isisfish.about.abouthtmltext", IsisConfig.getVersion())); + about.setLicenseText(_("isisfish.about.licensetext")); + about.setBackgroundColor(Color.WHITE); + // center frame + Dimension dim = getToolkit().getScreenSize(); + about.setSize(640, 520); + about.setLocation((dim.width - about.getSize().width) / 2, + (dim.height - about.getSize().height) / 2); +// about.pack(); + about.setVisible(true); } ]]> </script>

1 0

r1682 - isis-fish/trunk/src/main/resources/i18n
by sletellier＠users.labs.libre-entreprise.org 18 Dec '08

18 Dec '08

Author: sletellier Date: 2008-12-18 12:16:42 +0000 (Thu, 18 Dec 2008) New Revision: 1682 Modified: 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: Debug vol5 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 2008-12-18 12:16:30 UTC (rev 1681) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2008-12-18 12:16:42 UTC (rev 1682) @@ -752,6 +752,7 @@ isisfish.result.vbox=defaultToolTip-fr.ifremer.resultat.ResultatView.vbox1 isisfish.result.viewPanel=defaultToolTip-fr.ifremer.resultat.ResultatEdit.viewPanel isisfish.resultChoice.save=Results to save +isisfish.resultChoice.saved=Results saved isisfish.resultChoice.title=Result choice isisfish.resume.matrixInfoGrid=defaultToolTip-fr.ifremer.resultat.ResumePanel.matriceInfoGrid isisfish.resume.resumeTextArea=defaultToolTip-fr.ifremer.resultat.ResumePanel.resumeTextArea 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 2008-12-18 12:16:30 UTC (rev 1681) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2008-12-18 12:16:42 UTC (rev 1682) @@ -752,6 +752,7 @@ isisfish.result.vbox=defaultToolTip-fr.ifremer.resultat.ResultatView.vbox1 isisfish.result.viewPanel=defaultToolTip-fr.ifremer.resultat.ResultatEdit.viewPanel isisfish.resultChoice.save=R\u00E9sultats \u00E0 sauvegarder +isisfish.resultChoice.saved=R\u00E9sultats sauvegard\u00E9 isisfish.resultChoice.title=Choix de r\u00E9sultats isisfish.resume.matrixInfoGrid=defaultToolTip-fr.ifremer.resultat.ResumePanel.matriceInfoGrid isisfish.resume.resumeTextArea=defaultToolTip-fr.ifremer.resultat.ResumePanel.resumeTextArea

1 0

r1681 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: . input result script simulator
by sletellier＠users.labs.libre-entreprise.org 18 Dec '08

18 Dec '08

Author: sletellier Date: 2008-12-18 12:16:30 +0000 (Thu, 18 Dec 2008) New Revision: 1681 Removed: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulQueueUI.jaxx Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx Log: Debug vol5 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2008-12-17 17:18:58 UTC (rev 1680) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2008-12-18 12:16:30 UTC (rev 1681) @@ -39,8 +39,8 @@ import fr.ifremer.isisfish.ui.result.ResultAction; import fr.ifremer.isisfish.ui.result.ResultView; import fr.ifremer.isisfish.ui.script.ScriptUI; - import fr.ifremer.isisfish.ui.simulator.SimulQueueUI; import fr.ifremer.isisfish.ui.simulator.SimulUI; + import fr.ifremer.isisfish.ui.simulator.QueueUI; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisConfig; import javax.swing.JFrame; @@ -67,12 +67,15 @@ } protected void updateVCS(){ // FIXME a reimplanter +// thread:Welcome.updateVCS() } protected void config(){ // FIXME a reimplanter +// Welcome.showConfig() } protected void configVCS(){ // FIXME a reimplanter +// fr.ifremer.isisfish.versionning.ui.VCSConfigUI.doLaunch() } protected void help(){ // FIXME a reimplanter @@ -108,7 +111,7 @@ <JMenuItem text="isisfish.welcome.menu.input" onActionPerformed='openFrame(new InputUI(new InputAction()), _("isisfish.input.title"))'/> <JMenuItem text="isisfish.welcome.menu.script" onActionPerformed='openFrame(new ScriptUI(), _("isisfish.script.title"))'/> <JSeparator/> - <JMenuItem text="isisfish.welcome.menu.queue" onActionPerformed='openFrame(new SimulQueueUI(), _("isisfish.queue.title"))'/> + <JMenuItem text="isisfish.welcome.menu.queue" onActionPerformed='openFrame(new QueueUI(), _("isisfish.queue.title"))'/> <JSeparator/> <JMenu text="isisfish.welcome.menu.configuration"> <JMenuItem text="isisfish.welcome.menu.configuration" onActionPerformed='config()'/> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2008-12-17 17:18:58 UTC (rev 1680) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2008-12-18 12:16:30 UTC (rev 1681) @@ -144,7 +144,7 @@ valueChanged(true); } } - refresh(); +// refresh(); } protected void remove(){ fr.ifremer.isisfish.entities.SetOfVessels setOfVessels = getContextValue(InputAction.class).getSetOfVessels(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2008-12-17 17:18:58 UTC (rev 1680) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2008-12-18 12:16:30 UTC (rev 1681) @@ -53,9 +53,18 @@ protected OpenMapToolPanel toolMap = new OpenMapToolPanel(); protected OMToolSet toolSet = new OMToolSet(); + init(); public FisheryRegionUI(InputAction action){ setContextValue(action); } + protected void init(){ + cellMap = new IsisMapBean(); + toolSet.setupListeners(cellMap); + toolMap.add((Component)toolSet); + fisheryRegionMapPanel.add(toolMap, BorderLayout.NORTH); + fisheryRegionMapPanel.add(cellMap, BorderLayout.CENTER); + + } public void refresh(){ jaxx.runtime.Util.assignment(region = getContextValue(InputAction.class).getFisheryRegion(), "region", fr.ifremer.isisfish.ui.input.FisheryRegionUI.this); fieldRegion.setText(region.getName()); @@ -70,15 +79,8 @@ refreshMap(); } protected void refreshMap(){ - cellMap = new IsisMapBean(); cellMap.setFisheryRegion(region); - cellMap.setSelectionMode(0); - toolSet.setupListeners(cellMap); - toolMap.add((Component)toolSet); - fisheryRegionMapPanel.add(toolMap, BorderLayout.NORTH); - fisheryRegionMapPanel.add(cellMap, BorderLayout.CENTER); cellMap.repaint(); -// cellMap.setSelectedCells(cell); } protected void setFieldMapfilesModel(FisheryRegion region){ DefaultListModel model = new DefaultListModel(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2008-12-17 17:18:58 UTC (rev 1680) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2008-12-18 12:16:30 UTC (rev 1681) @@ -131,7 +131,9 @@ // valueChanged(true); } protected void paramPossibleValueChanged(){ - getContextValue(InputAction.class).getGear().setStandardisationFactor(Double.parseDouble(fieldGearParamPossibleValue.getText())); + if (fieldGearParamPossibleValue.getText() != ""){ + getContextValue(InputAction.class).getGear().setStandardisationFactor(Double.parseDouble(fieldGearParamPossibleValue.getText())); + } valueChanged(true); } protected void commentChanged(){ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2008-12-17 17:18:58 UTC (rev 1680) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2008-12-18 12:16:30 UTC (rev 1681) @@ -274,14 +274,17 @@ } protected void importRegion(){ setInfoText(_("isisfish.message.import.zip" + getContextValue(InputAction.class).importRegion())); + fieldCurrentRegion.setModel(getFieldCurrentRegionModel()); setInfoText(_("isisfish.message.import.finished")); } protected void importRegionAndRename(){ setInfoText(_("isisfish.message.import.zip" + getContextValue(InputAction.class).importRegionAndRename())); + fieldCurrentRegion.setModel(getFieldCurrentRegionModel()); setInfoText(_("isisfish.message.import.finished")); } protected void importV2Region(){ setInfoText(_("isisfish.message.import.xml.v2.file") + getContextValue(InputAction.class).importV2Region()); + fieldCurrentRegion.setModel(getFieldCurrentRegionModel()); setInfoText(_("isisfish.message.import.finished")); } protected void importRegionFromSimulation(){ @@ -289,23 +292,23 @@ } protected void exportRegion(){ setInfoText(_("isisfish.message.export.zip", getContextValue(InputAction.class).exportRegion())); + fieldCurrentRegion.setModel(getFieldCurrentRegionModel()); setInfoText(_("isisfish.message.export.done")); } protected void copyRegion(){ setInfoText(_("isisfish.message.copy.region", getContextValue(InputAction.class).copyRegion())); + fieldCurrentRegion.setModel(getFieldCurrentRegionModel()); setInfoText(_("isisfish.message.copy.finished")); } protected void removeRegion(){ setInfoText(_("isisfish.message.removing.region" + getContextValue(InputAction.class).getRegionStorage().getName())); + fieldCurrentRegion.setModel(getFieldCurrentRegionModel()); setInfoText(getContextValue(InputAction.class).removeRegion(false)); } protected void commitRegionInCVS(){ setInfoText(_("isisfish.message.commiting.region" + getContextValue(InputAction.class).getRegionStorage().getName())); setInfoText(getContextValue(InputAction.class).commitRegionInCVS()); } - protected void about(){ - // TODO - } ]]> </script> <JMenuBar id="menu" constraints='BorderLayout.NORTH'> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2008-12-17 17:18:58 UTC (rev 1680) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2008-12-18 12:16:30 UTC (rev 1681) @@ -235,16 +235,20 @@ } } protected void saveGrowthReverseModel(){ - Equation e = getEquation(); - if (e != null){ - getContextValue(InputAction.class).saveAsModel(e.getCategory(), e.getLanguage(), e.getContent()); - } + + getContextValue(InputAction.class).saveAsModel("Population", "Java", editor.getText()); + setInfoText(_("isisfish.message.saveModel.finished")); +// Equation e = getEquation(); +// if (e != null){ +// getContextValue(InputAction.class).saveAsModel(e.getCategory(), e.getLanguage(), e.getContent()); +// } } protected void openGrowthReverseEditor(){ - Equation e = getEquation(); - if (e != null){ - getContextValue(InputAction.class).openEditor(e.getCategory(), e.getName(), fr.ifremer.isisfish.equation.PopulationGrowthReverse.class, e.getContent(), editorReverse); - } + getContextValue(InputAction.class).openEditor("PopulationGrowth","new",fr.ifremer.isisfish.equation.PopulationGrowthReverse.class, editorReverse.getText(), editorReverse); +// Equation e = getEquation(); +// if (e != null){ +// getContextValue(InputAction.class).openEditor(e.getCategory(), e.getName(), fr.ifremer.isisfish.equation.PopulationGrowthReverse.class, e.getContent(), editorReverse); +// } } protected void commentChanged(){ pop.setComment(fieldPopulationBasicsComment.getText()); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2008-12-17 17:18:58 UTC (rev 1680) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2008-12-18 12:16:30 UTC (rev 1681) @@ -130,6 +130,7 @@ } protected void saveAsModel(){ getContextValue(InputAction.class).saveAsModel("Selectivity", "Java", fieldSelectivityScript.getText()); + refresh(); setInfoText(_("isisfish.message.saveModel.finished")); } protected void setInfoText(String txt){ 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 2008-12-17 17:18:58 UTC (rev 1680) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2008-12-18 12:16:30 UTC (rev 1681) @@ -175,7 +175,7 @@ root.setInfoText(txt); } protected void valueChanged(boolean b){ - getParentContainer(GearUI.class).setChanged(b); + getParentContainer(SetOfVesselsUI.class).setChanged(b); save.setEnabled(b); cancel.setEnabled(b); } @@ -233,8 +233,7 @@ setInfoText(_("isisfish.message.saveModel.finished")); } protected void openEditor(){ - fr.ifremer.isisfish.entities.SetOfVessels setOfVessels = getContextValue(InputAction.class).getSetOfVessels(); - getContextValue(InputAction.class).openEditor(setOfVessels.getTechnicalEfficiencyEquation().getCategory(),"new",fr.ifremer.isisfish.equation.SoVTechnicalEfficiencyEquation.class, editor.getText(), editor); + getContextValue(InputAction.class).openEditor("SetOfVessels","new",fr.ifremer.isisfish.equation.SoVTechnicalEfficiencyEquation.class, editor.getText(), editor); } ]]> </script> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2008-12-17 17:18:58 UTC (rev 1680) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2008-12-18 12:16:30 UTC (rev 1681) @@ -73,7 +73,6 @@ fieldSpeciesComment.setText(""); goToPopulation.setEnabled(false); } - valueChanged(false); } protected void create(){ TopiaEntity topia = getContextValue(InputAction.class).create("Species"); @@ -100,7 +99,6 @@ setInfoText(getContextValue(InputAction.class).remove()); getParentContainer(InputUI.class).setTreeModel(); getParentContainer(InputUI.class).setTreeSelection("$root/$species"); - valueChanged(false); refresh(); } protected void goToPopulation(){ @@ -119,32 +117,26 @@ protected void commentChanged(){ getContextValue(InputAction.class).getSpecies().setComment(fieldSpeciesComment.getText()); valueChanged(true); - refresh(); } protected void dynamicAgeChanged(){ getContextValue(InputAction.class).getSpecies().setAgeGroupType(fieldSpeciesDynamicAge.isSelected()); valueChanged(true); - refresh(); } protected void CEEChanged(){ getContextValue(InputAction.class).getSpecies().setCodeCEE(Integer.parseInt(fieldSpeciesCEE.getText())); valueChanged(true); - refresh(); } protected void codeChanged(){ getContextValue(InputAction.class).getSpecies().setCodeRubbin(fieldSpeciesCodeRubbin.getText()); valueChanged(true); - refresh(); } protected void scientificNameChanged(){ getContextValue(InputAction.class).getSpecies().setScientificName(fieldSpeciesScientificName.getText()); valueChanged(true); - refresh(); } protected void nameChanged(){ getContextValue(InputAction.class).getSpecies().setName(fieldSpeciesName.getText()); valueChanged(true); - refresh(); } ]]> </script> @@ -156,7 +148,7 @@ <JLabel text="isisfish.species.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' columns='2' weightx='1.0'> - <JTextField id="fieldSpeciesName" onFocusLost='nameChanged()' enabled='{isActif()}'/> + <JTextField id="fieldSpeciesName" onKeyTyped='valueChanged(true)' onFocusLost='nameChanged()' enabled='{isActif()}'/> </cell> </row> <row> @@ -164,7 +156,7 @@ <JLabel text="isisfish.species.scientificName" enabled='{isActif()}'/> </cell> <cell fill='horizontal' columns='2' weightx='1.0'> - <JTextField id="fieldSpeciesScientificName" onFocusLost='scientificNameChanged()' enabled='{isActif()}'/> + <JTextField id="fieldSpeciesScientificName" onKeyTyped='valueChanged(true)' onFocusLost='scientificNameChanged()' enabled='{isActif()}'/> </cell> </row> <row> @@ -172,7 +164,7 @@ <JLabel text="isisfish.species.rubbinCode" enabled='{isActif()}'/> </cell> <cell fill='horizontal' columns='2' weightx='1.0'> - <JTextField id="fieldSpeciesCodeRubbin" onFocusLost='codeChanged()' enabled='{isActif()}'/> + <JTextField id="fieldSpeciesCodeRubbin" onKeyTyped='valueChanged(true)' onFocusLost='codeChanged()' enabled='{isActif()}'/> </cell> </row> <row> @@ -180,7 +172,7 @@ <JLabel text="isisfish.species.cee" enabled='{isActif()}'/> </cell> <cell fill='horizontal' columns='2' weightx='1.0'> - <JTextField id="fieldSpeciesCEE" onFocusLost='CEEChanged()' enabled='{isActif()}'/> + <JTextField id="fieldSpeciesCEE" onKeyTyped='valueChanged(true)' onFocusLost='CEEChanged()' enabled='{isActif()}'/> </cell> </row> <row> @@ -200,7 +192,7 @@ </cell> <cell fill='both' columns='2' weightx='1.0' weighty='1.0'> <JScrollPane> - <JTextArea id="fieldSpeciesComment" onFocusLost='commentChanged()' enabled='{isActif()}'/> + <JTextArea id="fieldSpeciesComment" onKeyTyped='valueChanged(true)' onFocusLost='commentChanged()' enabled='{isActif()}'/> </JScrollPane> </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2008-12-17 17:18:58 UTC (rev 1680) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2008-12-18 12:16:30 UTC (rev 1681) @@ -131,11 +131,11 @@ // GenericCell g = (GenericCell)fieldStrategyInactivity.getSelectedItem(); // getContextValue(InputAction.class).saveEquationAsModel((Equation)g.getValue()); getContextValue(InputAction.class).saveAsModel("Strategy", "Java", editor.getText()); + refresh(); setInfoText(_("isisfish.message.saveModel.finished")); } protected void openEditor(){ - fr.ifremer.isisfish.entities.Strategy strategy = getContextValue(InputAction.class).getStrategy(); - getContextValue(InputAction.class).openEditor(strategy.getInactivityEquation().getContent(),"new",fr.ifremer.isisfish.equation.StrategyInactivityEquation.class, editor.getText(), editor); + getContextValue(InputAction.class).openEditor("Strategy","new",fr.ifremer.isisfish.equation.StrategyInactivityEquation.class, editor.getText(), editor); } protected void create(){ TopiaEntity topia = getContextValue(InputAction.class).create("Strategy"); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2008-12-17 17:18:58 UTC (rev 1680) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2008-12-18 12:16:30 UTC (rev 1681) @@ -79,11 +79,11 @@ valueChanged(true); } protected void typeDurationChanged(){ - getContextValue(InputAction.class).getTripType().setTripDuration(new TimeUnit(Double.parseDouble(fieldTripTypeDuration.getText()))); + getContextValue(InputAction.class).getTripType().setTripDuration(new TimeUnit(Double.parseDouble(fieldTripTypeDuration.getText()) * 3600)); valueChanged(true); } protected void minTimeChanged(){ - getContextValue(InputAction.class).getTripType().setMinTimeBetweenTrip(new TimeUnit(Double.parseDouble(fieldTripTypeMinTimeBetweenTrip.getText()))); + getContextValue(InputAction.class).getTripType().setMinTimeBetweenTrip(new TimeUnit(Double.parseDouble(fieldTripTypeMinTimeBetweenTrip.getText()) * 3600)); valueChanged(true); } protected void commentChanged(){ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2008-12-17 17:18:58 UTC (rev 1680) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2008-12-18 12:16:30 UTC (rev 1681) @@ -181,7 +181,6 @@ } protected void nameChange(){ getContextValue(InputAction.class).getZone().setName(fieldZoneName.getText()); - valueChanged(true); } protected void valueChanged(boolean b){ changed = b; @@ -202,7 +201,7 @@ </row> <row> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldZoneName" enabled='{isActif()}' onKeyTyped='nameChange()'/> + <JTextField id="fieldZoneName" enabled='{isActif()}' onKeyTyped='valueChanged(true)' onFocusLost='nameChange()'/>  </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java 2008-12-17 17:18:58 UTC (rev 1680) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java 2008-12-18 12:16:30 UTC (rev 1681) @@ -10,12 +10,18 @@ * @version */ +import java.util.logging.Level; +import java.util.logging.Logger; import static org.codelutin.i18n.I18n._; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.logging.SimulationLoggerUtil; import fr.ifremer.isisfish.simulator.SimulationProperties; +import fr.ifremer.isisfish.simulator.launcher.SimulationJob; +import fr.ifremer.isisfish.simulator.launcher.SimulationService; +import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; import fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil; +import fr.ifremer.isisfish.ui.widget.ErrorDialogUI; import fr.ifremer.isisfish.ui.widget.filter.FilterModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -38,12 +44,35 @@ public ResultView (){ super(); + + SimulationService.getService().addSimulationServiceListener(new SimulationServiceListener() { + + @Override + public void simulationStart(SimulationService simService, SimulationJob job) { + } + + @Override + public void simulationStop(SimulationService simService, SimulationJob job) { + try { + initSimulation(); + } catch (IOException ex) { + Logger.getLogger(ResultView.class.getName()).log(Level.SEVERE, null, ex); + } catch (ParseException ex) { + Logger.getLogger(ResultView.class.getName()).log(Level.SEVERE, null, ex); + } + } + + @Override + public void clearJobDone(SimulationService simService) { + } + }); init(); try { initSimulation(); } catch (Exception e) { log.warn(_("could not create simulation filter model for reason %1$s",e.getMessage()),e); + showMsgBox(e); } } @@ -95,6 +124,7 @@ initSimulation(); } catch (Exception eee) { log.warn("Can't delete simulation", eee); + showMsgBox(eee); } } } @@ -120,6 +150,7 @@ intFrame.setSelected(true); } catch (PropertyVetoException eee) { log.warn("Error dans l internalFrame ", eee); + showMsgBox(eee); } } } @@ -131,7 +162,8 @@ SimulationLoggerUtil.showSimulationLogConsole(name); } catch (Exception e) { - // ignore ? + log.error(e); + showMsgBox(e); } } public void on_filterSimulationLogButton_clicked() { @@ -145,7 +177,11 @@ } } catch (Exception e) { log.warn(_("could not filter on simulations"), e); + showMsgBox(e); } } + protected void showMsgBox(Exception eee){ + ErrorDialogUI.showError(eee); + } }// ResultView Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2008-12-17 17:18:58 UTC (rev 1680) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2008-12-18 12:16:30 UTC (rev 1681) @@ -13,6 +13,7 @@ import fr.ifremer.isisfish.datastore.RuleStorage; import fr.ifremer.isisfish.datastore.ScriptStorage; import fr.ifremer.isisfish.datastore.SimulatorStorage; +import fr.ifremer.isisfish.ui.widget.ErrorDialogUI; import fr.ifremer.isisfish.ui.widget.editor.GenericCell; import fr.ifremer.isisfish.vcs.VCSException; import java.io.ByteArrayOutputStream; @@ -58,10 +59,8 @@ public ScriptAction(){ } - protected void showMsgBox(String txt){ - if (txt != null){ - showMessageDialog(null, txt); - } + protected void showMsgBox(Exception eee){ + ErrorDialogUI.showError(eee); } public CodeSourceStorage getCode(){ return code; @@ -218,7 +217,7 @@ } protected void returnError(String s, Exception eee) { log.error(s,eee); - showMsgBox("error " + s); + showMsgBox(eee); } public void loadScript(GenericCell c, String fileName, String type){ ScriptMapping mapping = ScriptMapping.valueOf(type); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2008-12-17 17:18:58 UTC (rev 1680) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2008-12-18 12:16:30 UTC (rev 1681) @@ -30,7 +30,13 @@ * by : $Author: sletellier $ */ --> + <Table> + <Boolean id='ajout' javaBean='false'/> + + <Boolean id='remove' javaBean='false'/> + + <Boolean id='changed' javaBean='false'/> <script> <![CDATA[ import javax.swing.table.DefaultTableModel; @@ -63,6 +69,7 @@ protected void addTagValue(){ getContextValue(SimulAction.class).addTagValue(fieldTag.getText(), fieldValue.getText()); setTableTagValue(); + setRemove(true); } protected void removeTagValue(){ getContextValue(SimulAction.class).removeTagValue(tableTagValue.getValueAt(tableTagValue.getSelectedRow(),0).toString()); @@ -104,6 +111,69 @@ DefaultTableModel model = new DefaultTableModel(columnName, 0); } } + protected void simulationStatistiqueChanged(){ + getContextValue(SimulAction.class).getSimulationParameter().setUseStatistic(fieldSimulationStatistique.isSelected()); + valueChanged(true); + } + protected void simulationCacheChanged(){ + getContextValue(SimulAction.class).getSimulationParameter().setUseOptimization(fieldSimulationCache.isSelected()); + valueChanged(true); + } + + protected void simulErrorChanged(){ + getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("error"); + valueChanged(true); + } + protected void simulWarnChanged(){ + getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("warn"); + valueChanged(true); + } + protected void simulInfoChanged(){ + getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("info"); + valueChanged(true); + } + protected void simulDebugChanged(){ + getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("debug"); + valueChanged(true); + } + + protected void scriptErrorChanged(){ + getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("error"); + valueChanged(true); + } + protected void scriptWarnChanged(){ + getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("warn"); + valueChanged(true); + } + protected void scriptInfoChanged(){ + getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("info"); + valueChanged(true); + } + protected void scriptDebugChanged(){ + getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("debug"); + valueChanged(true); + } + + protected void libErrorChanged(){ + getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("error"); + valueChanged(true); + } + protected void libWarnChanged(){ + getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("warn"); + valueChanged(true); + } + protected void libInfoChanged(){ + getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("info"); + valueChanged(true); + } + protected void libDebugChanged(){ + getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("debug"); + valueChanged(true); + } + protected void valueChanged(boolean b){ + save.setEnabled(b); + setChanged(b); + } ]]> </script> <row> @@ -128,13 +198,13 @@ <JPanel/> </cell> <cell columns="2" fill="horizontal" weightx="0.3"> - <JCheckBox id="fieldSimulationStatistique" text="isisfish.advancedParams.simulationStatistique"/> + <JCheckBox id="fieldSimulationStatistique" text="isisfish.advancedParams.simulationStatistique" onActionPerformed = 'simulationStatistiqueChanged()'/> </cell> <cell fill="horizontal" weightx="0.2"> <JPanel/> </cell> <cell columns="2" fill="horizontal" weightx="0.3"> - <JCheckBox id="fieldSimulationCache" text="isisfish.advancedParams.simulationCache"/> + <JCheckBox id="fieldSimulationCache" text="isisfish.advancedParams.simulationCache" onActionPerformed = 'simulationCacheChanged()'/> </cell> </row> <row> @@ -142,16 +212,16 @@ <JLabel text="isisfish.advancedParams.simulLevelLogger"/> </cell> <cell fill="horizontal" weightx="0.2"> - <JRadioButton id="fieldSimulAdvParamsSimulLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup"/> + <JRadioButton id="fieldSimulAdvParamsSimulLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" onActionPerformed = 'simulErrorChanged()'/> </cell> <cell fill="horizontal" weightx="0.2"> - <JRadioButton id="fieldSimulAdvParamsSimulLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup"/> + <JRadioButton id="fieldSimulAdvParamsSimulLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" onActionPerformed = 'simulWarnChanged()'/> </cell> <cell fill="horizontal" weightx="0.2"> - <JRadioButton id="fieldSimulAdvParamsSimulLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup"/> + <JRadioButton id="fieldSimulAdvParamsSimulLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" onActionPerformed = 'simulInfoChanged()'/> </cell> <cell fill="horizontal" weightx="0.2"> - <JRadioButton id="fieldSimulAdvParamsSimulLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup"/> + <JRadioButton id="fieldSimulAdvParamsSimulLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" onActionPerformed = 'simulDebugChanged()'/> </cell> </row> <row> @@ -159,16 +229,16 @@ <JLabel text="isisfish.advancedParams.scriptLevelLogger"/> </cell> <cell fill="horizontal" weightx="0.2"> - <JRadioButton id="fieldSimulAdvParamsScriptLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup"/> + <JRadioButton id="fieldSimulAdvParamsScriptLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" onActionPerformed = 'scriptErrorChanged()'/> </cell> <cell fill="horizontal" weightx="0.2"> - <JRadioButton id="fieldSimulAdvParamsScriptLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup"/> + <JRadioButton id="fieldSimulAdvParamsScriptLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" onActionPerformed = 'scriptWarnChanged()'/> </cell> <cell fill="horizontal" weightx="0.2"> - <JRadioButton id="fieldSimulAdvParamsScriptLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup"/> + <JRadioButton id="fieldSimulAdvParamsScriptLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" onActionPerformed = 'scriptInfoChanged()'/> </cell> <cell fill="horizontal" weightx="0.2"> - <JRadioButton id="fieldSimulAdvParamsScriptLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup"/> + <JRadioButton id="fieldSimulAdvParamsScriptLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" onActionPerformed = 'scriptDebugChanged()'/> </cell> </row> <row> @@ -176,16 +246,16 @@ <JLabel text="isisfish.advancedParams.libLevelLogger"/> </cell> <cell fill="horizontal" weightx="0.2"> - <JRadioButton id="fieldSimulAdvParamsLibLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsLibLoggerGroup"/> + <JRadioButton id="fieldSimulAdvParamsLibLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsLibLoggerGroup" onActionPerformed = 'libErrorChanged()'/> </cell> <cell fill="horizontal" weightx="0.2"> - <JRadioButton id="fieldSimulAdvParamsLibLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsLibLoggerGroup"/> + <JRadioButton id="fieldSimulAdvParamsLibLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsLibLoggerGroup" onActionPerformed = 'libWarnChanged()'/> </cell> <cell fill="horizontal" weightx="0.2"> - <JRadioButton id="fieldSimulAdvParamsLibLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsLibLoggerGroup"/> + <JRadioButton id="fieldSimulAdvParamsLibLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsLibLoggerGroup" onActionPerformed = 'libInfoChanged()'/> </cell> <cell fill="horizontal" weightx="0.2"> - <JRadioButton id="fieldSimulAdvParamsLibLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsLibLoggerGroup"/> + <JRadioButton id="fieldSimulAdvParamsLibLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsLibLoggerGroup" onActionPerformed = 'libDebugChanged()'/> </cell> </row> <row> @@ -198,18 +268,18 @@ <JLabel text="isisfish.common.tag"/> </cell> <cell columns="2" fill="horizontal" weightx="0.25"> - <JTextField id="fieldTag"/> + <JTextField id="fieldTag" onKeyTyped="setAjout(true)"/> </cell> <cell fill="horizontal" weightx="0.25"> <JLabel text="isisfish.common.value"/> </cell> <cell columns="2" fill="horizontal" weightx="0.25"> - <JTextField id="fieldValue"/> + <JTextField id="fieldValue" onKeyTyped="setAjout(true)"/> </cell> </row> <row> <cell columns="6" fill="horizontal" weightx="1.0"> - <JButton text="isisfish.common.add" onActionPerformed = 'addTagValue()'/> + <JButton id='add' text="isisfish.common.add" enabled="{isAjout()}" onActionPerformed='addTagValue()'/> </cell> </row> <row> @@ -221,12 +291,12 @@ </row> <row> <cell columns="6" fill="horizontal" weightx="1.0"> - <JButton text="isisfish.common.remove" onActionPerformed = 'removeTagValue()'/> - </cell> + <JButton text="isisfish.common.remove" enabled="{isRemove()}" onActionPerformed='removeTagValue()'/> + </cell> </row> <row> <cell columns="6" fill="horizontal" weightx="1.0"> - <JButton text="isisfish.common.saveNextSimulation" onActionPerformed = 'saveTagValue()'/> + <JButton id='save' text="isisfish.common.saveNextSimulation" enabled="{isChanged()}" onActionPerformed='saveTagValue()'/> </cell> </row> </Table> \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2008-12-17 17:18:58 UTC (rev 1680) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2008-12-18 12:16:30 UTC (rev 1681) @@ -39,6 +39,13 @@ setContextValue(action); } public void refresh(){ + fieldSimulExportFolder.setText(getContextValue(SimulAction.class).getSimulationParameter().getExportDirectory()); + listSimulExportChoose.setModel(getListSimulExportChooseModel()); + } + protected DefaultComboBoxModel getListSimulExportChooseModel(){ + return new DefaultComboBoxModel(getContextValue(SimulAction.class).getExportNames().toArray()); + } + protected void exportChanged(){ if (listSimulExportChoose.getSelectedIndex() > -1){ Object[] values = listSimulExportChoose.getSelectedValues(); java.util.List<String> exportNames = new LinkedList<String>(); @@ -47,18 +54,13 @@ } getContextValue(SimulAction.class).getSimulationParameter().setExportNames(exportNames); } - fieldSimulExportFolder.setText(getContextValue(SimulAction.class).getSimulationParameter().getExportDirectory()); - listSimulExportChoose.setModel(getListSimulExportChooseModel()); } - protected DefaultComboBoxModel getListSimulExportChooseModel(){ - return new DefaultComboBoxModel(getContextValue(SimulAction.class).getExportNames().toArray()); - } ]]> </script> <row> <cell columns="4" fill="both" weightx="1.0" weighty="1.0"> <JScrollPane> - <JList id="listSimulExportChoose" selectionMode="2" model='{getListSimulExportChooseModel()}' onValueChanged='refresh()'/> + <JList id="listSimulExportChoose" selectionMode="2" model='{getListSimulExportChooseModel()}' onValueChanged='exportChanged()'/> </JScrollPane> </cell> </row> 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 2008-12-17 17:18:58 UTC (rev 1680) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2008-12-18 12:16:30 UTC (rev 1681) @@ -55,9 +55,30 @@ import javax.swing.text.JTextComponent; import org.dom4j.DocumentHelper; import org.dom4j.Element; + import fr.ifremer.isisfish.simulator.launcher.SimulationService; + import fr.ifremer.isisfish.simulator.launcher.SimulationJob; + import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; setContextValue(new MatrixPanelEditor()); simulParamsNumbers.add(getContextValue(MatrixPanelEditor.class), BorderLayout.CENTER); + + + SimulationService.getService().addSimulationServiceListener(new SimulationServiceListener() { + + @Override + public void simulationStart(SimulationService simService, SimulationJob job) { + } + + @Override + public void simulationStop(SimulationService simService, SimulationJob job) { + System.out.println("refresh !!!"); + fieldSimulParamsSelect.setModel(getSimulParamsSelectModel()); + } + + @Override + public void clearJobDone(SimulationService simService) { + } + }); public ParamsUI(SimulAction action){ setContextValue(action); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2008-12-17 17:18:58 UTC (rev 1680) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2008-12-18 12:16:30 UTC (rev 1681) @@ -32,8 +32,9 @@ --> <JPanel id="ResultChoice" name="isisfish.resultChoice.title" layout='{new BorderLayout()}'> <script><![CDATA[ - public ResultChoiceUI (SimulAction action){ - + import fr.ifremer.isisfish.ui.WelcomePanelUI; + + public ResultChoiceUI (SimulAction action){ setContextValue(action); } public void refresh(){ @@ -45,8 +46,13 @@ protected void saveResultNames(){ if (listResultNames.getSelectedIndex() != -1){ getContextValue(SimulAction.class).saveResultNames(listResultNames.getSelectedValues()); + setInfoText("isisfish.resultChoice.saved"); } } + protected void setInfoText(String txt){ + WelcomePanelUI root = getParentContainer(WelcomePanelUI.class); + root.setInfoText(txt); + } ]]> </script> <JLabel text="isisfish.resultChoice.save" horizontalAlignment="0" constraints='BorderLayout.NORTH'/> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx 2008-12-17 17:18:58 UTC (rev 1680) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx 2008-12-18 12:16:30 UTC (rev 1681) @@ -46,6 +46,7 @@ } public void refresh(){ listSimulParamsAnalysePlansList.setModel(new DefaultComboBoxModel(getContextValue(SimulAction.class).getParamAnalysePlans().toArray())); + setSimulParamsAnalysePlans(); } public void addAnalysePlan(){ getContextValue(SimulAction.class).addAnalysePlan(fieldSimulParamsAnalysePlansSelect.getSelectedItem().toString()); @@ -87,16 +88,23 @@ return result; } }; + java.util.List<GenericCell> valuesList = new ArrayList<GenericCell>(); + java.util.List<Object> propertyList = new ArrayList<Object>(); for (Iterator<String> it = values.keySet().iterator(); it.hasNext();) { String name = it.next(); Object properties = getContextValue(SimulAction.class).getAnalysePlanParameterValue(name, listSimulParamsAnalysePlansList.getSelectedValue().toString()); GenericCell value = new GenericCell(name, values.get(name), null); - model.setValueAt(value, row, 0); - model.setValueAt(properties, row, 1); + valuesList.add(value); + propertyList.add(properties); +// model.setValueAt(value, row, 0); +// model.setValueAt(properties, row, 1); row++; } + model.addColumn("Name", valuesList.toArray()); + model.addColumn("Value", propertyList.toArray()); simulParamsAnalysePlans.setModel(model); ParameterColumnEditor cellEditor = new ParameterColumnEditor(); + cellEditor.setName("Name"); cellEditor.setRegion(getContextValue(SimulAction.class).getRegionStorage()); simulParamsAnalysePlans.getColumnModel().getColumn(1).setCellEditor(cellEditor); simulParamsAnalysePlans.getModel().addTableModelListener(new TableModelListener() { Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulQueueUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulQueueUI.jaxx 2008-12-17 17:18:58 UTC (rev 1680) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulQueueUI.jaxx 2008-12-18 12:16:30 UTC (rev 1681) @@ -1,34 +0,0 @@ - -<JPanel visible="true" size='{new Dimension(400,400)}' layout='{new BorderLayout()}'> -</JPanel>

1 0

r1680 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish src/main/java/fr/ifremer/isisfish/ui src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 17 Dec '08

17 Dec '08

Author: chatellier Date: 2008-12-17 17:18:58 +0000 (Wed, 17 Dec 2008) New Revision: 1680 Removed: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/AboutFrameUI.jaxx Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.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: Add about frame Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2008-12-17 17:18:41 UTC (rev 1679) +++ isis-fish/trunk/pom.xml 2008-12-17 17:18:58 UTC (rev 1680) @@ -317,7 +317,7 @@ <topia.version>2.1.2-SNAPSHOT</topia.version>  - <lutinwidget.version>0.11</lutinwidget.version> + <lutinwidget.version>0.12-SNAPSHOT</lutinwidget.version>  <lutinmatrix.version>1.2-SNAPSHOT</lutinmatrix.version> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2008-12-17 17:18:41 UTC (rev 1679) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2008-12-17 17:18:58 UTC (rev 1680) @@ -31,6 +31,27 @@ package fr.ifremer.isisfish; +import static org.codelutin.i18n.I18n._; + +import java.io.File; +import java.text.SimpleDateFormat; +import java.util.List; +import java.util.Locale; + +import javax.swing.JOptionPane; + +import org.apache.commons.beanutils.ConvertUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.i18n.I18n; +import org.codelutin.log.LutinLogFactory; +import org.codelutin.log.UserLog; +import org.codelutin.math.matrix.DoubleBigVector; +import org.codelutin.math.matrix.MatrixFactory; +import org.codelutin.topia.TopiaException; +import org.codelutin.util.LocaleConverter; +import org.codelutin.util.VersionNumber; + import fr.ifremer.isisfish.datastore.AnalysePlanStorage; import fr.ifremer.isisfish.datastore.ExportStorage; import fr.ifremer.isisfish.datastore.FormuleStorage; @@ -44,6 +65,7 @@ import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.types.RangeOfValues; import fr.ifremer.isisfish.types.TimeUnit; +import fr.ifremer.isisfish.ui.WelcomeUI; import fr.ifremer.isisfish.util.DateConverter; import fr.ifremer.isisfish.util.MonthConverter; import fr.ifremer.isisfish.util.RangeOfValuesConverter; @@ -54,26 +76,7 @@ import fr.ifremer.isisfish.vcs.VCSException; import fr.ifremer.isisfish.vcs.VCSFactory; import fr.ifremer.isisfish.vcs.VetoableActionListener; -import java.io.File; -import java.text.SimpleDateFormat; -import org.apache.commons.beanutils.ConvertUtils; -import org.apache.commons.logging.LogFactory; -import static org.codelutin.i18n.I18n._; -import org.codelutin.log.LutinLogFactory; -import org.codelutin.math.matrix.DoubleBigVector; -import org.codelutin.math.matrix.MatrixFactory; -import java.util.Locale; -import javax.swing.JOptionPane; -import org.apache.commons.logging.Log; -import org.codelutin.i18n.I18n; -import org.codelutin.log.UserLog; -import org.codelutin.topia.TopiaException; -import org.codelutin.util.LocaleConverter; -import org.codelutin.util.VersionNumber; - -import fr.ifremer.isisfish.ui.WelcomeUI; - /** * This is the main class of <code>IsisFish</code> application. * @@ -207,7 +210,7 @@ } } else if (action == VCSActionEvent.UPDATE_REPOSITORY) { - // consctuit une chaine plutot qu'un Arrays.toString() qui + // construit une chaine plutot qu'un Arrays.toString() qui // est illisible String modifiedFiles = ""; for(File file : files) { @@ -225,10 +228,10 @@ * Permet de faire une demande a l'utilisateur. S'il repond annuler, on * quit l'application * - * @param msg + * @param msg question to ask * @return true if user confirm question */ - public static boolean ask(String msg) { + protected static boolean ask(String msg) { boolean result = true; int value = JOptionPane.showConfirmDialog(null, msg); if (value == JOptionPane.CANCEL_OPTION) { @@ -237,6 +240,19 @@ result = value == JOptionPane.OK_OPTION; return result; } + + /** + * Permet d'afficher un message d'avertissement + * à l'utilisateur. + * + * @param msg msg to show + * @return true if user confirm question + */ + protected static void warn(String msg) { + JOptionPane.showMessageDialog(null, msg, + _("isisfish.error.warning.title"), + JOptionPane.WARNING_MESSAGE); + } /** * Switch le vcs vers VCSNone et le sauvegarde pour le prochain lancement @@ -249,8 +265,9 @@ } /** - * Initialise le VCS et check s'il y a des mises a jour pour prevenir - * l'utilisateur + * Initialise le VCS et check s'il y a des mises à jour pour + * prevenir l'utilisateur. + * * @throws VCSException */ static public void initVCS() throws VCSException { @@ -269,9 +286,7 @@ if (local.exists()) { if (!vcs.isValidLocalRepository()) { log.info(_("Local repository exists but it's not valide for current vcs: %s", config.getOption(VCS.VCS_TYPE))); - if (ask(_("Your database repository: %s\n don't use correct" + - " protocol.\nDo you want to make backup of your database" + - " and take the correct one ?", local))) { + if (ask(_("isisfish.vcs.init.wrongprotocol", local))) { File localBackup = new File(local.getParentFile(), local.getName() + "-" + new SimpleDateFormat("yyyy-mm-dd-HH-mm-ss").format(new java.util.Date())); @@ -291,8 +306,7 @@ log.info(_("Local repository don't exist")); if (!vcs.isConnected()) { UserLog.warn(_( - "No database version %s found and can't get it.\n" + - "You must go to ISIS-Fish web site and download database manualy.", + "isisfish.vcs.init.notfoundcantdownload", IsisConfig.getDatabaseVersion())); } else { // Si on utilise pas le bon tag on change de tag @@ -345,13 +359,31 @@ } else { // Si on utilise pas le bon tag on change de tag VersionNumber tag = IsisConfig.getApiVersion(); + + List<File> filesInClonflict = null; if (vcs.isTag(tag)) { // un tag dispo, on a donc pas la derniere version, on switch - vcs.setTag(tag); + filesInClonflict = vcs.setTag(tag); } else { // pas de tag dispo on retourne sur le trunk - vcs.setTag(null); + filesInClonflict = vcs.setTag(null); } + + // TODO change code is case of conflict + // display a beautiful frame to manage each case + // for now, display a simple warning message + // si refus de l'utilisateur, c'est null aussi + if(filesInClonflict != null && !filesInClonflict.isEmpty()) { + + // construit une chaine plutot qu'un Arrays.toString() qui + // est illisible + String conflictFiles = ""; + for(File file : filesInClonflict) { + conflictFiles += " - " + file.toString() + "\n"; + } + + warn(_("isisfish.vcs.switchtag.warningconflict", conflictFiles)); + } } // check file status @@ -379,24 +411,18 @@ // add context welcome.setVisible(true); } + else { + if (log.isInfoEnabled()) { + log.info(_("isisfish.message.launchui.notlaunch")); + } + } } -// static public void checkout() throws VCSException { -// checkout(true); -// } -// -// static public void checkout(boolean createRegion) throws VCSException { -// if (config.isUseVCS()) { -// IsisVCSHelper.doCheckoutModule(context.handler, SCRIPT, EXPORT, SIMULATOR, FORMULE, RULE, ANALYSE_PLAN); -// VCSHelper.doCheckoutDir(context.handler, SIMULATION.getDirectory(), REGION.getDirectory()); -// IsisVCSHelper.doCheckoutRegion(context.handler, "DemoRegion", createRegion); -// } -// } + /** + * Initialise les convertiseurs utilisé par commons-beansutils. + */ + protected static void initConvertersAndMatrixFactory() { - public static void initConvertersAndMatrixFactory() { - // ajout du support de XMLGridLayout dans SwiXml -// ConverterLibrary.getInstance().register(java.awt.LayoutManager.class, new LayoutConverter()); - ConvertUtils.register(new LocaleConverter(), Locale.class); // init converters @@ -410,4 +436,5 @@ // par defaut on utilise des doubles pour les matrices MatrixFactory.setDefaultVectorClass(DoubleBigVector.class); } + } // IsisFish Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/AboutFrameUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/AboutFrameUI.jaxx 2008-12-17 17:18:41 UTC (rev 1679) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/AboutFrameUI.jaxx 2008-12-17 17:18:58 UTC (rev 1680) @@ -1,37 +0,0 @@ - -<JPanel id="aboutFrame" layout='{new BorderLayout()}'> - <JLabel id="version" text='{_("isisfish.about.text") + " " + fr.ifremer.isisfish.IsisConfig.getVersion()}' constraints='BorderLayout.NORTH'/> - <JLabel text="isisfish.about.site" constraints='BorderLayout.CENTER'/> - <JButton text="isisfish.common.ok" constraints='BorderLayout.SOUTH' onActionPerformed='getParentContainer(JFrame.class).dispose()'/> -</JPanel> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2008-12-17 17:18:41 UTC (rev 1679) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2008-12-17 17:18:58 UTC (rev 1680) @@ -42,7 +42,10 @@ import fr.ifremer.isisfish.ui.simulator.SimulQueueUI; import fr.ifremer.isisfish.ui.simulator.SimulUI; import fr.ifremer.isisfish.IsisFish; + import fr.ifremer.isisfish.IsisConfig; import javax.swing.JFrame; + import org.codelutin.widget.AboutFrame; + welcomePanelUI.setContent(new WelcomeTabUI()); this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); protected void openFrame(Container c, String title){ @@ -75,12 +78,18 @@ // FIXME a reimplanter } protected void about(){ - JFrame f = new JFrame(); - f.setLayout(new BorderLayout()); - f.add(new AboutFrameUI(), BorderLayout.CENTER); - f.setTitle(_("isisfish.about.title")); - f.setVisible(true); - f.pack(); + AboutFrame about = new AboutFrame(); + about.setTitle(_("isisfish.about.title")); + about.setIconPath("images/strategy.jpg"); + about.setAboutHtmlText(_("isisfish.about.abouthtmltext", IsisConfig.getVersion())); + about.setLicenseText(_("isisfish.about.licensetext")); + about.setBackgroundColor(Color.WHITE); + // center frame + Dimension dim = getToolkit().getScreenSize(); + about.setSize(640, 520); + about.setLocation((dim.width - about.getSize().width) / 2, + (dim.height - about.getSize().height) / 2); + about.setVisible(true); } ]]> </script> 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 2008-12-17 17:18:41 UTC (rev 1679) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2008-12-17 17:18:58 UTC (rev 1680) @@ -62,8 +62,8 @@ destination\ already\ exists\ %s\ use\ \\'force\\'\ argument\ to\ force\ overwrite= directory\ %s\ must\ be\ a\ directory= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. -isisfish.about.site=http\://isisfish.labs.libre-entreprise.org - by B.Poussin -isisfish.about.text=Isis-Fish Simulator +isisfish.about.abouthtmltext=<html><b>Isis-Fish (%s)</b><br /><br />Copyright 2002 - 2008, Code Lutin.<br /><br /><a href\="http\://isis-fish.labs.libre-entreprise.org">http\://isis-fish.labs.libre-entreprise.org</a><br /><br />Please, report any bug you can found.<html> +isisfish.about.licensetext=You can modify and redistribute the program under the conditions of the GNU General Public License (version 2 or later). A copy of the GPL is in the file "LICENSE.txt" provided with Isis-Fish. All rights reserved. No guarantees are provided for use of this program. isisfish.about.title=About Isis-Fish... isisfish.advancedParameters.title=advanced Parameters isisfish.advancedParams.freeParameters= @@ -211,7 +211,7 @@ isisfish.error.delete.file=could not delete file %1$s isisfish.error.delete.vcs.files=Can't delete vcs files isisfish.error.dialog.message=Some errors have been detected -isisfish.error.dialog.title=Error... +isisfish.error.dialog.title=Error isisfish.error.during.simulation=Error during simulation isisfish.error.emigration.negative=emigration negative isisfish.error.empty.code.rubbin=rubbin's code is empty @@ -337,6 +337,7 @@ isisfish.error.undefined.zone.reproduction=No reprodution's zone defined isisfish.error.unsupported.equation.langage=unsupported langage '%1$s' for equation\: %2$s isisfish.error.wait.simThread=Can't wait SimThread +isisfish.error.warning.title=Warning isisfish.error.write.simulation=Can't write information %1$s isisfish.exit.text=Something has change, please enter a comment isisfish.exit.title=Exit @@ -536,6 +537,7 @@ isisfish.message.import.scripts.file.cancelled=Import scripts cancelled isisfish.message.import.xml.v2.file=Import xml v2 file isisfish.message.import.zip=Import zip file +isisfish.message.launchui.notlaunch= isisfish.message.load.finished=load finished isisfish.message.load.map=Try to load map file\: %1$s (%2$s, %3$s) isisfish.message.loading.old.simulation=Loading old simulation ... @@ -886,7 +888,10 @@ isisfish.vcs.commit.cancel=vcs.commit.cancel isisfish.vcs.commit.label=vcs.commit.label isisfish.vcs.commit.ok=vcs.commit.ok +isisfish.vcs.init.notfoundcantdownload=No database version %s found and can't get it.\nYou must go to ISIS-Fish web site and download database manually. +isisfish.vcs.init.wrongprotocol=Your database repository\: %s\n don't use correct protocol.\nDo you want to make backup of your database and take the correct one ? isisfish.vcs.switchprotocol.confirm=Protocol to access repository script has changed.\nDo you want to switch your repository ? +isisfish.vcs.switchtag.warningconflict=Your repository is now up-to-date, but following files are conflicted, you may check them \:\n%s isisfish.vcs.switchversion.confirm=You don't use correct repository script for your application version %s.\nDo you want to switch your repository ? isisfish.vcs.update=vcs.update isisfish.vcs.update.cancel=cancel 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 2008-12-17 17:18:41 UTC (rev 1679) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2008-12-17 17:18:58 UTC (rev 1680) @@ -62,9 +62,9 @@ destination\ already\ exists\ %s\ use\ \\'force\\'\ argument\ to\ force\ overwrite= directory\ %s\ must\ be\ a\ directory= filter\ loaded\ in\ %1$s\ ms\ \:\ found\ %2$s\ lines.=filter loaded in %1$s ms \: found %2$s lines. -isisfish.about.site=http\://isisfish.labs.libre-entreprise.org - par B.Poussin -isisfish.about.text=Simulateur Isis-Fish -isisfish.about.title=A propos de Isis-Fish... +isisfish.about.abouthtmltext=<html><b>Isis-Fish (%s)</b><br /><br />Copyright 2002 - 2008, Code Lutin.<br /><br /><a href\="http\://isis-fish.labs.libre-entreprise.org">http\://isis-fish.labs.libre-entreprise.org</a><br /><br />Merci de rapporter les bugs.<html> +isisfish.about.licensetext=Vous pouvez modifier et redistribuer ce programme sous les conditions \u00E9nonc\u00E9es par la licence GNU GPL (version 2 ou ult\u00E9rieure). Une copie de la licence GPL est dans le fichier \u00AB\u00A0LICENSE.txt\u00A0\u00BB fourni avec Isis-Fish. Tous droits r\u00E9serv\u00E9s. Aucune garantie n'est fournie pour l'utilisation de ce programme. +isisfish.about.title=\u00C0 propos de Isis-Fish... isisfish.advancedParameters.title=Param\u00E8tres avanc\u00E9s isisfish.advancedParams.freeParameters=Param\u00E8tres libres isisfish.advancedParams.libLevelLogger=Niveau de tracage des librairies @@ -211,7 +211,7 @@ isisfish.error.delete.file=could not delete file %1$s isisfish.error.delete.vcs.files=Can't delete vcs files isisfish.error.dialog.message=Une erreur a \u00E9t\u00E9 d\u00E9tect\u00E9e -isisfish.error.dialog.title=Erreur... +isisfish.error.dialog.title=Erreur isisfish.error.during.simulation=Error during simulation isisfish.error.emigration.negative=emigration negative isisfish.error.empty.code.rubbin=le code rubbin est vide @@ -337,6 +337,7 @@ isisfish.error.undefined.zone.reproduction=il n'y a pas de zone de reproduction de d\u00E9finit isisfish.error.unsupported.equation.langage=unsupported langage '%1$s' for equation\: %2$s isisfish.error.wait.simThread=Can't wait SimThread +isisfish.error.warning.title=Attention isisfish.error.write.simulation=Can't write information %1$s isisfish.exit.text=Quelque chose a chang\u00E9, merci de saisir un commentaire isisfish.exit.title=Exit @@ -536,6 +537,7 @@ isisfish.message.import.scripts.file.cancelled=Importation des scripts annul\u00E9 isisfish.message.import.xml.v2.file=Import xml v2 file isisfish.message.import.zip=Import zip file +isisfish.message.launchui.notlaunch= isisfish.message.load.finished=Chargement termin\u00E9 isisfish.message.load.map=Chargement de la carte \: %1$s (%2$s, %3$s) isisfish.message.loading.old.simulation=Chargement d'une ancienne simulation ... @@ -886,7 +888,10 @@ isisfish.vcs.commit.cancel=annuler isisfish.vcs.commit.label=Entrer quelques mots concernant la modification des scripts isisfish.vcs.commit.ok=confirmer +isisfish.vcs.init.notfoundcantdownload=La base de donn\u00E9es pour la version %s n'a ni pu \u00EAtre trouv\u00E9e, ni t\u00E9l\u00E9charg\u00E9e.\nVous devez la t\u00E9l\u00E9charger manullement \u00E0 partir du site d'Isis-Fish. +isisfish.vcs.init.wrongprotocol=Votre base de donn\u00E9es locale \: %s n'utilise pas un protocole correct.\nVoulez-vous faire une sauvegarde de cette base et r\u00E9cup\u00E9rer une meilleure version ? isisfish.vcs.switchprotocol.confirm=Le protocole d'acc\u00E8s au d\u00E9p\u00F4t des scripts a chang\u00E9.\nVoulez-vous changer vers le nouveau d\u00E9p\u00F4t ? +isisfish.vcs.switchtag.warningconflict=Votre base de donn\u00E9es a \u00E9t\u00E9 mise \u00E0 jour\nmais les fichiers suivants sont en conflit, merci de les v\u00E9rifier \:\n%s isisfish.vcs.switchversion.confirm=Vous n'utilisez pas le d\u00E9p\u00F4t correct pour votre version d'Isis-Fish \: %s.\nVoulez-vous changer de d\u00E9p\u00F4t ? isisfish.vcs.update=R\u00E9sultats de la synchronisation avec le serveur isisfish.vcs.update.cancel=annuler

1 0