Author: tchemit Date: 2014-05-14 16:27:35 +0200 (Wed, 14 May 2014) New Revision: 1769 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1769 Log: fixes #5034 [TRAIT] mettre le curseur (ou focus) sur le champ Code Station ?\195?\160 la cr?\195?\169ation d'un nouveau trait (et pas dans le champ qui porte l'intitul?\195?\169 du trait) Modified: branches/tutti-3.4.x/pom.xml branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCatchesAction.java branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationAction.java branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIModel.java Modified: branches/tutti-3.4.x/pom.xml =================================================================== --- branches/tutti-3.4.x/pom.xml 2014-05-14 13:05:47 UTC (rev 1768) +++ branches/tutti-3.4.x/pom.xml 2014-05-14 14:27:35 UTC (rev 1769) @@ -140,7 +140,7 @@ <nuitonValidatorVersion>3.0-rc-1</nuitonValidatorVersion> <eugenePluginVersion>2.7.4</eugenePluginVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> - <jaxxVersion>2.8.4</jaxxVersion> + <jaxxVersion>2.8.5-SNAPSHOT</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <slf4jVersion>1.7.5</slf4jVersion> <adagioVersion>3.4.1</adagioVersion> Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCatchesAction.java =================================================================== --- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCatchesAction.java 2014-05-14 13:05:47 UTC (rev 1768) +++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCatchesAction.java 2014-05-14 14:27:35 UTC (rev 1769) @@ -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,24 @@ } @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: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationAction.java =================================================================== --- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationAction.java 2014-05-14 13:05:47 UTC (rev 1768) +++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationAction.java 2014-05-14 14:27:35 UTC (rev 1769) @@ -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: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java =================================================================== --- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2014-05-14 13:05:47 UTC (rev 1768) +++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2014-05-14 14:27:35 UTC (rev 1769) @@ -560,4 +560,8 @@ public void setBodyTitle(String title) { ui.getBody().setTitle(title); } + + public JComponent getCurrentBody() { + return currentBody; + } } Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java =================================================================== --- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2014-05-14 13:05:47 UTC (rev 1768) +++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2014-05-14 14:27:35 UTC (rev 1769) @@ -520,7 +520,7 @@ } @Override - protected JComponent getComponentToFocus() { + public JComponent getComponentToFocus() { return getUI().getStationNumberField(); } @@ -583,6 +583,11 @@ return ui.getFishingOperationTabPane(); } + @Override + public boolean removeTab(int i) { + return false; + } + //------------------------------------------------------------------------// //-- TabHandler methods --// //------------------------------------------------------------------------// @@ -652,6 +657,11 @@ registerValidators(ui.getValidator()); } + @Override + public boolean onRemoveTab() { + return false; + } + //------------------------------------------------------------------------// //-- Public methods --// //------------------------------------------------------------------------// Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java =================================================================== --- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2014-05-14 13:05:47 UTC (rev 1768) +++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2014-05-14 14:27:35 UTC (rev 1769) @@ -287,6 +287,11 @@ } @Override + public boolean isCloseable() { + return false; + } + + @Override public boolean isEmpty() { boolean result; Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java =================================================================== --- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2014-05-14 13:05:47 UTC (rev 1768) +++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2014-05-14 14:27:35 UTC (rev 1769) @@ -123,6 +123,8 @@ initUI(this.ui); + this.ui.getFishingOperationComboBox().setAutoFocus(false); + editFishingOperationAction = getContext().getActionFactory().createLogicAction(this, EditFishingOperationAction.class); @@ -269,6 +271,11 @@ return ui.getTabPane(); } + @Override + public boolean removeTab(int i) { + return false; + } + //------------------------------------------------------------------------// //-- Public methods --// //------------------------------------------------------------------------// Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java =================================================================== --- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2014-05-14 13:05:47 UTC (rev 1768) +++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2014-05-14 14:27:35 UTC (rev 1769) @@ -203,6 +203,11 @@ } @Override + public boolean removeTab(int i) { + return false; + } + + @Override public boolean onTabChanged(int currentIndex, int newIndex) { ui.getCatchesCaracteristicsAttachmentsButton().onCloseUI(); ui.getComputeSpeciesBatchButton().setVisible(newIndex < 4); @@ -276,6 +281,11 @@ registerValidators(); } + @Override + public boolean onRemoveTab() { + return false; + } + //------------------------------------------------------------------------// //-- Public methods --// //------------------------------------------------------------------------// Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java =================================================================== --- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java 2014-05-14 13:05:47 UTC (rev 1768) +++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java 2014-05-14 14:27:35 UTC (rev 1769) @@ -349,6 +349,11 @@ return null; } + @Override + public boolean isCloseable() { + return false; + } + // public CatchBatch getCatchBatch() { // return editObject; // } Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java =================================================================== --- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java 2014-05-14 13:05:47 UTC (rev 1768) +++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java 2014-05-14 14:27:35 UTC (rev 1769) @@ -91,4 +91,9 @@ return null; } + @Override + public boolean isCloseable() { + return false; + } + } \ No newline at end of file Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java =================================================================== --- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java 2014-05-14 13:05:47 UTC (rev 1768) +++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java 2014-05-14 14:27:35 UTC (rev 1769) @@ -187,6 +187,11 @@ return null; } + @Override + public boolean isCloseable() { + return false; + } + public Float getBenthosTotalComputedWeight() { return catchesUIModel.getBenthosTotalComputedWeight(); } Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java =================================================================== --- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java 2014-05-14 13:05:47 UTC (rev 1768) +++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java 2014-05-14 14:27:35 UTC (rev 1769) @@ -134,4 +134,9 @@ public String getIcon() { return null; } + + @Override + public boolean isCloseable() { + return false; + } } Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java =================================================================== --- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java 2014-05-14 13:05:47 UTC (rev 1768) +++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java 2014-05-14 14:27:35 UTC (rev 1769) @@ -122,4 +122,9 @@ public String getIcon() { return null; } + + @Override + public boolean isCloseable() { + return false; + } } \ No newline at end of file Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java =================================================================== --- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java 2014-05-14 13:05:47 UTC (rev 1768) +++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java 2014-05-14 14:27:35 UTC (rev 1769) @@ -403,6 +403,11 @@ return null; } + @Override + public boolean isCloseable() { + return false; + } + public List<SpeciesBatchRowModel> getLeafs(Species species) { List<SpeciesBatchRowModel> result = Lists.newArrayList(); for (SpeciesBatchRowModel rowModel : getRows()) { Modified: branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIModel.java =================================================================== --- branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIModel.java 2014-05-14 13:05:47 UTC (rev 1768) +++ branches/tutti-3.4.x/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIModel.java 2014-05-14 14:27:35 UTC (rev 1769) @@ -117,4 +117,9 @@ protected FishingOperation newEntity() { return null; } + + @Override + public boolean isCloseable() { + return false; + } }