Author: chatellier Date: 2009-05-29 13:55:35 +0000 (Fri, 29 May 2009) New Revision: 2295 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java Log: Return false, if at least one verifier return cancel option Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java 2009-05-29 13:48:35 UTC (rev 2294) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java 2009-05-29 13:55:35 UTC (rev 2295) @@ -24,37 +24,48 @@ import javax.swing.JOptionPane; -import fr.ifremer.isisfish.ui.input.InputSaveVerifier; - /** * WelcomeSaveVerifier. * * @author letellier - * @version $Revision: 2088 $ + * @version $Revision$ * - * Last update: $Date: 2009-04-08 12:24:31 +0200 (mer. 08 avril 2009) $ - * by : $Author: chatellier $ + * Last update: $Date$ + * by : $Author$ */ public class WelcomeSaveVerifier { + /** Save verifier list. */ protected List<SaveVerifier> verifiers = new ArrayList<SaveVerifier>(); - public void addSaveVerifier(InputSaveVerifier inputVerifier) { - verifiers.add(inputVerifier); + /** + * Add new verifier to manage. + * + * @param saveVerifier new verifier + */ + public void addSaveVerifier(SaveVerifier saveVerifier) { + verifiers.add(saveVerifier); } + /** + * Check that all 'input' opened interface has no non-saved modification. + * + * @return <tt>true> if interface can be closed + */ public boolean allIsSaved() { - boolean exit = true; - int responce = JOptionPane.CANCEL_OPTION; + boolean canExit = true; + for (fr.ifremer.isisfish.ui.SaveVerifier s : verifiers) { - responce = s.checkEdit(); + int reponse = s.checkEdit(); + + // return false, if at least one verifier + // return cancel option + if (reponse == JOptionPane.CANCEL_OPTION) { + canExit = false; + } } - //boolean exit = checkEdit(event, component); - if (responce == JOptionPane.OK_OPTION) { - } else if (responce == JOptionPane.CANCEL_OPTION) { - exit = false; - } - return exit; + + return canExit; } } Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java ___________________________________________________________________ Name: svn:keywords + Date Author Revision