Author: tchemit Date: 2013-04-29 14:31:29 +0200 (Mon, 29 Apr 2013) New Revision: 882 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/882 Log: fixes Evolution #2374: Mettre l'onglet Captures accidentelles en dernier Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ImportTemporaryReferentialAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ImportTemporaryReferentialAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ImportTemporaryReferentialAction.java 2013-04-29 10:22:47 UTC (rev 881) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ImportTemporaryReferentialAction.java 2013-04-29 12:31:29 UTC (rev 882) @@ -49,7 +49,7 @@ protected boolean prepareAction() throws Exception { boolean result = super.prepareAction(); if (result) { - String answer = null; + String answer; do { answer = JOptionPane.showInputDialog(getContext().getActionUI(), _("tutti.manageTemporaryReferential.passwordDialog.message"), Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-04-29 10:22:47 UTC (rev 881) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-04-29 12:31:29 UTC (rev 882) @@ -315,7 +315,7 @@ public boolean quitCurrentScreen() { boolean canClose; - if (context.getScreen() == null) { + if (context.getScreen() == null || currentBody==null) { // no screen, surely can quit canClose = true; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-04-29 10:22:47 UTC (rev 881) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-04-29 12:31:29 UTC (rev 882) @@ -121,8 +121,8 @@ setCustomTab(1, ui.getSpeciesTabContent().getModel()); setCustomTab(2, ui.getBenthosTabContent().getModel()); setCustomTab(3, ui.getMarineLitterTabContent().getModel()); - setCustomTab(4, ui.getAccidentalTabContent().getModel()); - setCustomTab(5, ui.getIndividualObservationTabContent().getModel()); + setCustomTab(4, ui.getIndividualObservationTabContent().getModel()); + setCustomTab(5, ui.getAccidentalTabContent().getModel()); getTabPanel().setSelectedIndex(1); }