Author: sletellier Date: 2009-03-04 17:36:39 +0000 (Wed, 04 Mar 2009) New Revision: 1910 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java 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/GearUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java 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: Ajout de FactorWizard 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 2009-03-04 13:14:34 UTC (rev 1909) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-03-04 17:36:39 UTC (rev 1910) @@ -133,7 +133,7 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldCellName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getName())}' decorator='boxed' - _bean='{getBean()}' _method='"Name"' onKeyReleased='getBean().setName(fieldCellName.getText())' enabled='{isActif()}'/> + _bean='{CellImpl.class}' _method='"Name"' onKeyReleased='getBean().setName(fieldCellName.getText())' enabled='{isActif()}'/> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-03-04 13:14:34 UTC (rev 1909) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-03-04 17:36:39 UTC (rev 1910) @@ -41,8 +41,9 @@ import fr.ifremer.isisfish.entities.Metier; setButtonTitle(_("isisfish.input.continueMetiers")); setNextPath("$root/$metiers"); -gearTab.addChangeListener(new InputTabbedPaneListener()); public void refresh() { + gearTab.removeChangeListener(getTabListener()); + gearTab.addChangeListener(getTabListener()); getVerifier().addCurrentPanel(selectivityUI ,gearTabUI); } ]]></script> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-03-04 13:14:34 UTC (rev 1909) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-03-04 17:36:39 UTC (rev 1910) @@ -28,7 +28,17 @@ import java.lang.reflect.Method; import org.apache.commons.beanutils.MethodUtils; import fr.ifremer.isisfish.ui.util.UtilsUI; +import fr.ifremer.isisfish.ui.sensitivity.FactorWizard; +import fr.ifremer.isisfish.ui.sensitivity.EditorHelper; +protected ChangeListener tabListener = null; + +public ChangeListener getTabListener(){ + return tabListener; +} +public void setTabListener(ChangeListener l){ + this.tabListener = l; +} public void refresh(){} public InputAction getAction() { return getContextValue(InputAction.class); @@ -56,7 +66,7 @@ boolean isSensitivity = UtilsUI.isSensitivity(classBean.getSimpleName().replace("Impl", "") + "." + method); jaxx.runtime.swing.BlockingLayerUI ui = active ? layerUI.clone() : null; - ui.setUseIcon(isSensitivity); + ui.setUseIcon(isSensitivity && isActif()); SwingUtil.getLayer(boxed).setUI(ui); } } @@ -65,25 +75,13 @@ protected void accept(ActionEvent e) { JComponent source = (JComponent) e.getSource(); + FactorWizard wizard = new FactorWizard(this); Class classBean = (Class)source.getClientProperty("bean"); - String method = (String)source.getClientProperty("method"); - - System.out.println("bean : " + classBean); - System.out.println("method : " + method); - System.out.println("in Properies : " + UtilsUI.isSensitivity(classBean.getSimpleName().replace("Impl", "") + "." + method)); - Object result = null; - try { - if (classBean != null && method != null){ - TopiaEntity bean = getVerifier().getEntity(classBean); - - Method m = bean.getClass().getMethod("get" + method, null); - result = m.invoke(bean, (Object[])null); - } - } catch (Exception ex) { - System.out.println(ex); - } - System.out.println("result : " + result); + TopiaEntity bean = getVerifier().getEntity(classBean); + wizard.init(source, bean, EditorHelper.canBeContinue(source, bean)); + wizard.pack(); + wizard.setVisible(true); } ]]> 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-03-04 13:14:34 UTC (rev 1909) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java 2009-03-04 17:36:39 UTC (rev 1910) @@ -95,6 +95,7 @@ // apply refresh method (should a contract for all this ui with a method refresh...) try { currentUI = (InputContentUI) newUI; + currentUI.setTabListener(new InputTabbedPaneListener()); context.getContextValue(InputSaveVerifier.class).addCurrentPanel(currentUI); currentNode = node; } catch (Exception e) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java 2009-03-04 13:14:34 UTC (rev 1909) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java 2009-03-04 17:36:39 UTC (rev 1910) @@ -17,8 +17,7 @@ */ public class InputTabbedPaneListener implements ChangeListener{ protected int cacheSelectedIndex = -1; - - + @Override public void stateChanged(ChangeEvent e) { try { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-03-04 13:14:34 UTC (rev 1909) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-03-04 17:36:39 UTC (rev 1910) @@ -48,8 +48,9 @@ setButtonTitle(_("isisfish.input.continueGears")); setNextPath("$root/$gears"); -populationTab.addChangeListener(new InputTabbedPaneListener()); public void refresh(){ + populationTab.removeChangeListener(getTabListener()); + populationTab.addChangeListener(getTabListener()); getVerifier().addCurrentPanel(populationMigrationUI, populationRecruitementUI, populationCapturabilityUI, populationSeasonsUI, populationZoneUI, populationEquationUI, populationGroupUI, populationBasicsUI); } ]]> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2009-03-04 13:14:34 UTC (rev 1909) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2009-03-04 17:36:39 UTC (rev 1910) @@ -41,8 +41,9 @@ setButtonTitle(_("isisfish.input.continueStrategies")); setNextPath("$root/$strategies"); -setOfVesselsTab.addChangeListener(new InputTabbedPaneListener()); public void refresh() { + setOfVesselsTab.removeChangeListener(getTabListener()); + setOfVesselsTab.addChangeListener(getTabListener()); getVerifier().addCurrentPanel(effortDescriptionUI, setOfVesselsTabsUI); } ]]></script> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2009-03-04 13:14:34 UTC (rev 1909) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2009-03-04 17:36:39 UTC (rev 1910) @@ -37,8 +37,9 @@ <fr.ifremer.isisfish.ui.input.InputContentUI> <script><![CDATA[ -strategyTab.addChangeListener(new InputTabbedPaneListener()); public void refresh() { + strategyTab.removeChangeListener(getTabListener()); + strategyTab.addChangeListener(getTabListener()); getVerifier().addCurrentPanel(strategyMonthInfoUI, strategyTabUI); } ]]></script> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-03-04 13:14:34 UTC (rev 1909) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-03-04 17:36:39 UTC (rev 1910) @@ -13,6 +13,7 @@ import javax.swing.JCheckBox; import javax.swing.JComboBox; import javax.swing.JComponent; +import javax.swing.JList; import javax.swing.JRadioButton; import javax.swing.JTable; import javax.swing.JTextField; @@ -28,21 +29,20 @@ */ public class EditorHelper { - public JComponent getEditor(JComponent c) { + public static JComponent getEditor(JComponent c, TopiaEntity e) { JComponent result = null; try { - TopiaEntity e = (TopiaEntity) c.getClientProperty("bean"); - String fieldName = (String) c.getClientProperty("fieldName"); +// TopiaEntity e = (TopiaEntity) c.getClientProperty("bean"); + String fieldName = (String) c.getClientProperty("method"); result = c.getClass().newInstance(); if (result instanceof JTextField) { - ((JTextComponent) result).setText(BeanUtils.getProperty(e, fieldName)); + ((JTextComponent) result).setText(String.valueOf(callMethod(e, fieldName))); } else if (result instanceof JTable){ // ((JTable) result).setText(BeanUtils.getProperty(e, fieldName)); } else if (result instanceof MatrixPanelEditor){ - ((MatrixPanelEditor) result).setMatrix((MatrixND)callMethod(e, fieldName)); } else if (result instanceof JComboBox){ @@ -67,7 +67,7 @@ return result; } - public Object getValue(JComponent c) { + public static Object getValue(JComponent c) { Object result = null; if (result instanceof JTextComponent) { result = ((JTextComponent)result).getText(); @@ -80,6 +80,9 @@ } else if (result instanceof JComboBox){ // ((JComboBox) result).setModel(BeanUtils.getProperty(e, fieldName)); + } else if (result instanceof JList){ +// ((JComboBox) result).setModel(BeanUtils.getProperty(e, fieldName)); + } else if (result instanceof JCheckBox){ result = ((JCheckBox)result).isSelected(); @@ -96,8 +99,20 @@ return result; } - - protected Object callMethod(TopiaEntity e, String fieldName){ + public static boolean canBeContinue(JComponent c, TopiaEntity e){ + String fieldName = (String) c.getClientProperty("method"); + if (c instanceof JTextComponent) { + Object o = callMethod(e, fieldName); + System.out.println(o + " " + o.getClass()); + if (Integer.class.isInstance(o)){ + return true; + } else if (Double.class.isInstance(o)){ + return true; + } + } + return false; + } + protected static Object callMethod(TopiaEntity e, String fieldName){ Object result = null; try { Method m = e.getClass().getMethod("get" + fieldName, null); Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java 2009-03-04 17:36:39 UTC (rev 1910) @@ -0,0 +1,18 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package fr.ifremer.isisfish.ui.sensitivity; + +import fr.ifremer.isisfish.datastore.SensitivityStorage; + +/** + * + * @author letellier + */ +public class FactorAction { + public void save(){ + + } +} Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx 2009-03-04 17:36:39 UTC (rev 1910) @@ -0,0 +1,128 @@ +<!-- +/* *##% + * Copyright (C) 2005 + * Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +/* * + * IsisFish.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 $ + */ + --> +<JDialog id="FactorTypeChooser" title='isisfish.factor.title' resizable='false' modal='true' layout='{new BorderLayout()}'> + + <Boolean id='continuePossible' javaBean='true'/> + + <Boolean id='continueSelected' javaBean='false'/> + + <Boolean id='tabVisible' javaBean='false'/> + + <script><![CDATA[ +import org.codelutin.topia.persistence.TopiaEntity; + +protected JComponent cOrigine = null; +protected TopiaEntity bean = null; +protected java.util.List<JComponent> discretComponent = new ArrayList<JComponent>(); + +public void init(JComponent c, TopiaEntity bean, Boolean b){ + this.bean = bean; + this.cOrigine = c; + setContinuePossible(b); +} +protected JComponent getNewComponent(){ + return EditorHelper.getEditor(cOrigine, bean); +} +protected void addTabs(String sNbTab){ + int nbTab = Integer.parseInt(sNbTab); + discretComponent.clear(); + tabPane.removeAll(); + for (int i=0;i<nbTab;i++){ + JComponent c = getNewComponent(); + discretComponent.add(c); + tabPane.add(c, "Factor " + (i+1)); + } + setTabVisible(true); + this.pack(); +} + ]]> + </script> + <Table constraints='BorderLayout.CENTER'> + <row> + <cell columns='1' fill='horizontal' weightx='0.5'> + <JLabel text='isisfish.factor.name'/> + </cell> + <cell columns='3' fill='horizontal' weightx='0.5'> + <JTextField id='factorName'/> + </cell> + </row> + <row> + <cell columns='4' fill='horizontal' weightx='1'> + <JRadioButton id='continueRadion' text='isisfish.factor.continue' buttonGroup='factorType' visible='{isContinuePossible()}' selected='false' onActionPerformed='setContinueSelected(continueRadion.isSelected())'/> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='0.25'> + <JLabel text='isisfish.factor.firstValue' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + <cell fill='horizontal' weightx='0.25'> + <JTextField id='continueMin' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + <cell fill='horizontal' weightx='0.25'> + <JLabel text='isisfish.factor.lastValue' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + <cell fill='horizontal' weightx='0.25'> + <JTextField id='continueMax' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + </row> + <row> + <cell columns='4' fill='horizontal' weightx='1'> + <JRadioButton id='discret' text='isisfish.factor.discret' selected='true' buttonGroup='factorType' onActionPerformed='setContinueSelected(continueRadion.isSelected())'/> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='0.25'> + <JLabel text='isisfish.factor.selectDiscretNumber' enabled='{!isContinueSelected()}'/> + </cell> + <cell fill='horizontal' weightx='0.25'> + <JTextField id='discretNumber' enabled='{!isContinueSelected()}'/> + </cell> + <cell columns='2' fill='horizontal' weightx='0.5'> + <JButton text='isisfish.factor.validDiscretNumber' enabled='{!isContinueSelected()}' onActionPerformed='addTabs(discretNumber.getText())'/> + </cell> + </row> + <row> + <cell columns='4' fill='both' weightx='1' weighty='1'> + <JTabbedPane id='tabPane' visible='{isTabVisible() && !isContinueSelected()}' enabled='{!isContinueSelected()}'/> + </cell> + </row> + <row> + <cell columns='2' fill='horizontal' weightx='0.5'> + <JButton id='cancel' text='isisfish.common.cancel' onActionPerformed='this.dispose()'/> + </cell> + <cell columns='2' fill='horizontal' weightx='0.5'> + <JButton id='save' text='isisfish.common.save'/> + </cell> + </row> + </Table> +</JDialog> \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java 2009-03-04 13:14:34 UTC (rev 1909) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java 2009-03-04 17:36:39 UTC (rev 1910) @@ -83,7 +83,7 @@ e.printStackTrace(); } // go back to previous node - returnToPreviousNode(getNavigationTree(), event); + // returnToPreviousNode(getNavigationTree(), event); } @@ -97,9 +97,11 @@ // apply refresh method (should a contract for all this ui with a method refresh...) try { currentUI = (InputContentUI) newUI; - if (currentUI != null) + if (currentUI != null){ + currentUI.setTabListener(new SensitivityTabbedPaneListener()); + context.getContextValue(InputSaveVerifier.class).addCurrentPanel(currentUI); currentUI.setLayer(true); - context.getContextValue(InputSaveVerifier.class).addCurrentPanel(currentUI); + } currentNode = node; } catch (Exception e) { log.debug(e.getMessage(), e); @@ -125,7 +127,7 @@ else{ verif.addCurrentEntity(null); } - verif.refreshAll(); +// verif.refreshAll(); verif.setCurrentNode(node); } Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java 2009-03-04 17:36:39 UTC (rev 1910) @@ -0,0 +1,58 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package fr.ifremer.isisfish.ui.sensitivity; + +import fr.ifremer.isisfish.ui.input.InputContentUI; +import fr.ifremer.isisfish.ui.input.InputSaveVerifier; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.swing.JOptionPane; +import javax.swing.JTabbedPane; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; + +/** + * + * @author letellier + */ +public class SensitivityTabbedPaneListener implements ChangeListener{ + + protected int cacheSelectedIndex = -1; + + @Override + public void stateChanged(ChangeEvent e) { + try { + JTabbedPane pane = (JTabbedPane)e.getSource(); + pane.removeChangeListener(this); + int selectedIndex = pane.getSelectedIndex(); + if (cacheSelectedIndex != -1){ + pane.setSelectedIndex(cacheSelectedIndex); + } + InputContentUI ui = (InputContentUI) pane.getSelectedComponent(); + if (closeUI(ui)) { + pane.setSelectedIndex(selectedIndex); + } + ui = (InputContentUI) pane.getSelectedComponent(); + ui.setLayer(true); + ui.refresh(); + cacheSelectedIndex = pane.getSelectedIndex(); + pane.addChangeListener(this); + } catch (Exception ex) { + Logger.getLogger(SensitivityTabbedPaneListener.class.getName()).log(Level.SEVERE, null, ex); + } + } + + /* + * Ask you to save if modification are made + * @param ui selected + * @return true to change tab + */ + protected boolean closeUI(InputContentUI context) throws Exception { + boolean exit = true; + return exit; + } + +} 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-03-04 13:14:34 UTC (rev 1909) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-03-04 17:36:39 UTC (rev 1910) @@ -128,7 +128,6 @@ refresh(); if (isSensitivity()){ try { - System.out.println("isSelectivity"); getParentContainer(SensitivityUI.class).getSensitivityTabUI().setRegion((FisheryRegionImpl) getContextValue(SimulAction.class).getSimulationParameter().getRegion().getFisheryRegion()); getParentContainer(SensitivityUI.class).getSensitivityTabUI().setTreeModel(); } catch (StorageException ex) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java 2009-03-04 13:14:34 UTC (rev 1909) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java 2009-03-04 17:36:39 UTC (rev 1910) @@ -28,7 +28,6 @@ static public boolean isSensitivity(String sens){ Properties data = loadProperties(); - System.out.println(sens + " " + data.getProperty(sens)); return data.getProperty(sens) != null; } 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-03-04 13:14:34 UTC (rev 1909) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-03-04 17:36:39 UTC (rev 1910) @@ -351,6 +351,14 @@ isisfish.export.directory=Export directory isisfish.export.saved=Export saved isisfish.export.title=Results export +isisfish.factor.continue=Continue factor +isisfish.factor.discret=Discret factor +isisfish.factor.firstValue=First value +isisfish.factor.lastValue=Last value +isisfish.factor.name=Factor name +isisfish.factor.selectDiscretNumber=Number of factors +isisfish.factor.title=Factor input +isisfish.factor.validDiscretNumber=Ok isisfish.filter=Filter isisfish.filter.apply=Apply filter isisfish.filter.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 2009-03-04 13:14:34 UTC (rev 1909) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-03-04 17:36:39 UTC (rev 1910) @@ -351,6 +351,14 @@ isisfish.export.directory=Dossier d'export isisfish.export.saved=Exports des r\u00E9sultats sauvegard\u00E9s isisfish.export.title=Export des r\u00E9sultats +isisfish.factor.continue=Facteur continue +isisfish.factor.discret=Facteur discret +isisfish.factor.firstValue=Premi\u00E8re valeur +isisfish.factor.lastValue=Derin\u00E8re valeur +isisfish.factor.name=Nom du facteur +isisfish.factor.selectDiscretNumber=Nombre de facteurs +isisfish.factor.title=Saisie d'un facteur +isisfish.factor.validDiscretNumber=Valider isisfish.filter=Filtrer isisfish.filter.apply=Appliquer le filtre isisfish.filter.cancel=Annuler