Author: tchemit Date: 2014-05-14 16:41:51 +0200 (Wed, 14 May 2014) New Revision: 1770 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1770 Log: reports refs #5034 (from version 3.4.2) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCatchesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCatchesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCatchesAction.java 2014-05-14 14:27:35 UTC (rev 1769) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCatchesAction.java 2014-05-14 14:41:51 UTC (rev 1770) @@ -28,9 +28,14 @@ import fr.ifremer.tutti.service.ValidationService; import fr.ifremer.tutti.ui.swing.TuttiScreen; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; +import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUI; +import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.JComponent; +import javax.swing.SwingUtilities; + /** * Opens the operations edition screen. * @@ -58,14 +63,23 @@ } @Override - public void postFailedAction(Throwable error) { -// TuttiUIContext context = getContext(); -// if (error != null) { -// if (context.isDbLoaded()) { -// context.setScreen(TuttiScreen.SELECT_CRUISE); -// } else { -// context.setScreen(TuttiScreen.MANAGE_DB); -// } -// } + public void postSuccessAction() { + super.postSuccessAction(); + + SwingUtilities.invokeLater( + new Runnable() { + @Override + public void run() { + + FishingOperationsUI currentBoby = (FishingOperationsUI) getHandler().getCurrentBody(); + EditFishingOperationUI fishingOperationTabContent = currentBoby.getFishingOperationTabContent(); + + JComponent componentToFocus = fishingOperationTabContent.getHandler().getComponentToFocus(); + componentToFocus.requestFocusInWindow(); + + } + } + ); + } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationAction.java 2014-05-14 14:27:35 UTC (rev 1769) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationAction.java 2014-05-14 14:41:51 UTC (rev 1770) @@ -58,9 +58,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.JTabbedPane; +import javax.swing.SwingUtilities; import java.awt.BorderLayout; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -410,6 +412,18 @@ super.postSuccessAction(); final EditFishingOperationUI fishingOperationTabContent = getUI().getFishingOperationTabContent(); fishingOperationTabContent.getModel().setModify(false); + + SwingUtilities.invokeLater( + new Runnable() { + @Override + public void run() { + + JComponent componentToFocus = fishingOperationTabContent.getHandler().getComponentToFocus(); + componentToFocus.requestFocusInWindow(); + + } + } + ); // SwingUtilities.invokeLater( // new Runnable() { // @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2014-05-14 14:27:35 UTC (rev 1769) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2014-05-14 14:41:51 UTC (rev 1770) @@ -520,9 +520,7 @@ } @Override - protected JComponent getComponentToFocus() { - - //TODO + public JComponent getComponentToFocus() { return getUI().getStationNumberField(); }