Author: tchemit Date: 2014-03-21 16:22:42 +0100 (Fri, 21 Mar 2014) New Revision: 1633 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1633 Log: fixes #4717: [TRAIT] j'enregistre un changement dans l'onglet Trait/Mise en oeuvre de l'engin et je bascule dans l'onglet Esp?\195?\168ce : il faut rester sur Trait/Mise en oeuvre de l'engin Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveFishingOperationAction.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveFishingOperationAction.java 2014-03-21 15:22:11 UTC (rev 1632) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveFishingOperationAction.java 2014-03-21 15:22:42 UTC (rev 1633) @@ -1,4 +1,3 @@ - package fr.ifremer.tutti.ui.swing.action; /* @@ -90,6 +89,7 @@ boolean mustSave = beanToSave.getFishingOperation() != null && beanToSave.isValid(); + boolean moveTab = true; if (mustSave) { // prepare model @@ -102,13 +102,14 @@ for (AbstractCaracteristicTabUIModel subModel : subModels) { Class<?> modelClass = subModel.getClass(); CaracteristicMap caracteristics = subModel.getCaracteristicMap(); - + if (subModel.isModify()) { + // see http://forge.codelutin.com/issues/4717 + moveTab = false; + } if (modelClass.isAssignableFrom(VesselUseFeatureTabUIModel.class)) { toSave.setVesselUseFeatures(caracteristics); - } else if (modelClass.isAssignableFrom(GearUseFeatureTabUIModel.class)) { toSave.setGearUseFeatures(caracteristics); - } subModel.setModify(false); } @@ -116,7 +117,8 @@ sendMessage( "[ Trait - Caractéristiques générales ] " + "Sauvegarde des modifications de " + decorate(toSave) + - "."); + "." + ); if (log.isInfoEnabled()) { log.info("FishingOperation " + toSave.getId() + @@ -128,7 +130,7 @@ saveFishingOperation(toSave); - if (ValidationService.VALIDATION_CONTEXT_EDIT.equals(getContext().getValidationContext())) { + if (moveTab && ValidationService.VALIDATION_CONTEXT_EDIT.equals(getContext().getValidationContext())) { handler.getParentUi().getTabPane().setSelectedIndex(1); handler.getParentUi().getCatchesTabContent().getTabPane().setSelectedIndex(1); }