r3324 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui: . input sensitivity
Author: chatellier Date: 2011-05-12 14:07:46 +0000 (Thu, 12 May 2011) New Revision: 3324 Log: Ne doit pas demander de sauvegarder dans le cas de AS. Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySaveVerifier.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2011-05-12 13:46:50 UTC (rev 3323) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2011-05-12 14:07:46 UTC (rev 3324) @@ -61,6 +61,7 @@ import fr.ifremer.isisfish.ui.queue.QueueUI; import fr.ifremer.isisfish.ui.result.ResultUI; import fr.ifremer.isisfish.ui.script.ScriptUI; +import fr.ifremer.isisfish.ui.sensitivity.SensitivitySaveVerifier; import fr.ifremer.isisfish.ui.sensitivity.SensitivityUI; import fr.ifremer.isisfish.ui.simulator.SimulAction; import fr.ifremer.isisfish.ui.simulator.SimulUI; @@ -170,7 +171,7 @@ * @param welcomeUI */ public void newSensitivityFrame(WelcomeUI welcomeUI) { - openFrame(welcomeUI, new SensitivityUI(new JAXXInitialContext().add(new InputAction()).add(new InputSaveVerifier()).add(new SimulAction()).add(this)), _("isisfish.sensitivity.title")); + openFrame(welcomeUI, new SensitivityUI(new JAXXInitialContext().add(new InputAction()).add(new SensitivitySaveVerifier()).add(new SimulAction()).add(this)), _("isisfish.sensitivity.title")); } /** Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2011-05-12 13:46:50 UTC (rev 3323) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2011-05-12 14:07:46 UTC (rev 3324) @@ -24,10 +24,11 @@ --> <JPanel layout='{new BorderLayout()}'> <import> - fr.ifremer.isisfish.ui.simulator.SimulAction; - jaxx.runtime.context.JAXXInitialContext; - fr.ifremer.isisfish.ui.input.InputAction; - fr.ifremer.isisfish.ui.input.InputSaveVerifier; + fr.ifremer.isisfish.ui.simulator.SimulAction + jaxx.runtime.context.JAXXInitialContext + fr.ifremer.isisfish.ui.input.InputAction + fr.ifremer.isisfish.ui.input.InputSaveVerifier + fr.ifremer.isisfish.ui.sensitivity.SensitivitySaveVerifier javax.swing.ImageIcon </import> @@ -54,7 +55,7 @@ </tab> <tab title=' ' icon='{new ImageIcon(getClass().getResource("/images/sensitivities.gif"))}'> <fr.ifremer.isisfish.ui.sensitivity.SensitivityUI id="sensitivityUI" - constructorParams='new JAXXInitialContext().add(new InputAction()).add(new InputSaveVerifier()).add(new SimulAction()).add(this)' /> + constructorParams='new JAXXInitialContext().add(new InputAction()).add(new SensitivitySaveVerifier()).add(new SimulAction()).add(this)' /> </tab> <tab title=' ' icon='{new ImageIcon(getClass().getResource("/images/calc.gif"))}'> <fr.ifremer.isisfish.ui.result.ResultUI /> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2011-05-12 13:46:50 UTC (rev 3323) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2011-05-12 14:07:46 UTC (rev 3324) @@ -75,9 +75,6 @@ /** Current entity modification state (modifier by PCL). */ protected boolean changed = false; - /** Editable is true when entity can be modified (in sensitivity, cannot). */ - protected boolean editable = false; - /** L'ui en cours d'edition (au plus bas niveau des tabPane). */ protected InputContentUI<?> inputContentUI; @@ -118,18 +115,16 @@ @Override public int checkEdit() { int response = JOptionPane.NO_OPTION; - if (editable) { - if (changed) { - // ask user to close edition - // still in edit mode, must warn user - response = JOptionPane.showConfirmDialog(null, _("isisfish.message.page.modified"), - _("isisfish.input.menu.commit"), JOptionPane.YES_NO_CANCEL_OPTION, - JOptionPane.WARNING_MESSAGE); - if (response == JOptionPane.NO_OPTION) { - cancel(); - } else if (response == JOptionPane.YES_OPTION) { - save(); - } + if (changed) { + // ask user to close edition + // still in edit mode, must warn user + response = JOptionPane.showConfirmDialog(null, _("isisfish.message.page.modified"), + _("isisfish.input.menu.commit"), JOptionPane.YES_NO_CANCEL_OPTION, + JOptionPane.WARNING_MESSAGE); + if (response == JOptionPane.NO_OPTION) { + cancel(); + } else if (response == JOptionPane.YES_OPTION) { + save(); } } return response; @@ -349,7 +344,6 @@ */ public void addCurrentEntity(TopiaEntityContextable currentEntity, String key) { if (currentEntity != null) { - editable = true; currentEntity.addPropertyChangeListener(entityPCL); this.currentEntities.put(key, currentEntity); } @@ -388,20 +382,6 @@ noModif(); } - /*public void removeAllEntity() { - currentEntities.clear(); - editable = false; - noModif(); - }*/ - - /*public boolean isEditable() { - return editable; - }*/ - - /*public Collection<TopiaEntityContextable> getCurrentEntities() { - return currentEntities.values(); - }*/ - public <E extends TopiaEntityContextable> E getEntity(Class<E> clazz, String key) { return (E) currentEntities.get(key); } @@ -414,8 +394,4 @@ } return null; } - - /*public void setEditable(boolean editable) { - this.editable = editable; - }*/ } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-05-12 13:46:50 UTC (rev 3323) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-05-12 14:07:46 UTC (rev 3324) @@ -127,7 +127,7 @@ sensitivityTabUI.getCardlayoutPrincipal().show(sensitivityTabUI.getInputPanePrincipal(),"normale"); } } - + /** * Changement de selection dans l'arbre de la pecherie. * Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySaveVerifier.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySaveVerifier.java (rev 0) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySaveVerifier.java 2011-05-12 14:07:46 UTC (rev 3324) @@ -0,0 +1,56 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.ui.sensitivity; + +import javax.swing.JOptionPane; + +import fr.ifremer.isisfish.ui.input.InputSaveVerifier; + +/** + * Save verifier pour l'interface de sensibilité. + * + * Surchargé pour ne rien faire. Apparement il est difficile de se passer + * d'une instance dans les interface. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class SensitivitySaveVerifier extends InputSaveVerifier { + + @Override + public int checkEdit() { + // si jamais il y a eu des modifications dues a des setters + // qui sont passés ou des modifications d'equation + // on ne doit pas demander à l'utilisateur de sauver + // ou meme carrement sauver les modification + return JOptionPane.YES_OPTION; + } + + +} Property changes on: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySaveVerifier.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2011-05-12 13:46:50 UTC (rev 3323) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2011-05-12 14:07:46 UTC (rev 3324) @@ -66,7 +66,6 @@ return getContextValue(RegionStorage.class); } - public void setTreeModel() { if (getFisheryRegion() != null) { getCardlayoutPrincipal().show(inputPanePrincipal,"normale"); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx 2011-05-12 13:46:50 UTC (rev 3323) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx 2011-05-12 14:07:46 UTC (rev 3324) @@ -25,9 +25,9 @@ <fr.ifremer.isisfish.ui.SimulationUI> <import> - fr.ifremer.isisfish.ui.input.InputAction; - fr.ifremer.isisfish.ui.input.InputSaveVerifier; - jaxx.runtime.context.JAXXInitialContext; + fr.ifremer.isisfish.ui.input.InputAction + fr.ifremer.isisfish.ui.sensitivity.SensitivitySaveVerifier + jaxx.runtime.context.JAXXInitialContext </import> <script><
chatellier＠users.labs.libre-entreprise.org