Author: kmorin Date: 2013-04-10 17:07:59 +0200 (Wed, 10 Apr 2013) New Revision: 760 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/760 Log: fixes #2267 [ESPECE] - Cr?\195?\169ation lot (Alt + C), mettre le focus sur le champ ESPECES DU LOT Added: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIModel-error-validation.xml Removed: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/individualObservation/ 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/benthos/create/CreateBenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java 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-10 14:17:43 UTC (rev 759) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-04-10 15:07:59 UTC (rev 760) @@ -33,14 +33,14 @@ import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper; import jaxx.runtime.swing.CardLayout2Ext; +import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTitledPanel; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JTabbedPane; +import javax.swing.*; +import java.awt.*; import java.util.Set; import static org.nuiton.i18n.I18n._; @@ -288,19 +288,25 @@ actionPanel.setVisible(false); TuttiUI tuttiUi = null; JXTitledPanel titlePanel = null; + Component component2focus = null; String title = ""; if (CREATE_BATCH_CARD.equals(card)) { tuttiUi = ui.getSpeciesTabCreateBatch(); titlePanel = ui.getSpeciesTabCreateBatchReminderLabel(); title = n_("tutti.createSpeciesBatch.title"); + component2focus = ui.getSpeciesTabCreateBatch().getSpeciesComboBox(); + } else if (SPLIT_BATCH_CARD.equals(card)) { tuttiUi = ui.getSpeciesTabSplitBatch(); titlePanel = ui.getSpeciesTabSplitBatchReminderLabel(); title = n_("tutti.splitSpeciesBatch.title"); + component2focus = ui.getSpeciesTabSplitBatch().getCategoryComboBox(); + } else if (EDIT_FREQUENCY_CARD.equals(card)) { tuttiUi = ui.getSpeciesTabFrequencyEditor(); titlePanel = ui.getSpeciesTabFrequencyEditorReminderLabel(); title = n_("tutti.editSpeciesFrequencies.title"); + component2focus = ui.getSpeciesTabFrequencyEditor().getLengthStepCaracteristicComboBox(); } if (tuttiUi != null) { @@ -309,6 +315,9 @@ if (titlePanel != null) { titlePanel.setTitle(ui.getSpeciesTabFishingOperationReminderLabel().getTitle() + " - " + _(title)); } + if (component2focus != null) { + component2focus.requestFocus(); + } } } } @@ -327,19 +336,25 @@ actionPanel.setVisible(false); TuttiUI tuttiUi = null; JXTitledPanel titlePanel = null; + Component component2focus = null; String title = ""; if (CREATE_BATCH_CARD.equals(card)) { tuttiUi = ui.getBenthosTabCreateBatch(); titlePanel = ui.getBenthosTabCreateBatchReminderLabel(); title = n_("tutti.createBenthosBatch.title"); + component2focus = ui.getBenthosTabCreateBatch().getSpeciesComboBox(); + } else if (SPLIT_BATCH_CARD.equals(card)) { tuttiUi = ui.getBenthosTabSplitBatch(); titlePanel = ui.getBenthosTabSplitBatchReminderLabel(); title = n_("tutti.splitBenthosBatch.title"); + component2focus = ui.getBenthosTabSplitBatch().getCategoryComboBox(); + } else if (EDIT_FREQUENCY_CARD.equals(card)) { tuttiUi = ui.getBenthosTabFrequencyEditor(); titlePanel = ui.getBenthosTabFrequencyEditorReminderLabel(); title = n_("tutti.editBenthosFrequencies.title"); + component2focus = ui.getBenthosTabFrequencyEditor().getLengthStepCaracteristicComboBox(); } if (tuttiUi != null) { @@ -348,6 +363,9 @@ if (titlePanel != null) { titlePanel.setTitle(ui.getBenthosTabFishingOperationReminderLabel().getTitle() + " - " + _(title)); } + if (component2focus != null) { + component2focus.requestFocus(); + } } } } @@ -366,11 +384,13 @@ actionPanel.setVisible(false); TuttiUI tuttiUi = null; JXTitledPanel titlePanel = null; + Component component2focus = null; String title = ""; if (CREATE_BATCH_CARD.equals(card)) { tuttiUi = ui.getMarineLitterTabCreateBatch(); titlePanel = ui.getMarineLitterTabCreateBatchReminderLabel(); title = n_("tutti.createMarineLitterBatch.title"); + component2focus = ui.getMarineLitterTabCreateBatch().getMarineLitterCategoryComboBox(); } if (tuttiUi != null) { @@ -379,6 +399,9 @@ if (titlePanel != null) { titlePanel.setTitle(ui.getMarineLitterTabCreateBatchReminderLabel().getTitle() + " - " + _(title)); } + if (component2focus != null) { + component2focus.requestFocus(); + } } } } @@ -397,15 +420,18 @@ actionPanel.setVisible(false); TuttiUI tuttiUi = null; JXTitledPanel titlePanel = null; + Component component2focus = null; String title = ""; if (CREATE_BATCH_CARD.equals(card)) { tuttiUi = ui.getIndividualObservationTabCreateBatch(); titlePanel = ui.getIndividualObservationTabCreateBatchReminderLabel(); title = n_("tutti.createIndividualObservationBatch.title"); + component2focus = ui.getIndividualObservationTabCreateBatch().getIndividualObservationSpeciesComboBox(); } else if (EDIT_CARACTERISTICS_CARD.equals(card)) { titlePanel = ui.getIndividualObservationTabFishingOperationReminderLabel(); title = n_("tutti.editCaracteristics.title"); + component2focus = ui.getCaracteristicMapEditor().getNewRowKey(); } if (tuttiUi != null) { @@ -414,6 +440,9 @@ if (titlePanel != null) { titlePanel.setTitle(ui.getIndividualObservationTabCreateBatchReminderLabel().getTitle() + " - " + _(title)); } + if (component2focus != null) { + component2focus.requestFocus(); + } } } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java 2013-04-10 14:17:43 UTC (rev 759) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java 2013-04-10 15:07:59 UTC (rev 760) @@ -215,7 +215,6 @@ } model.setAvailableSpecies(speciesToUse); - ui.getSpeciesComboBox().requestFocus(); } public void save() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java 2013-04-10 14:17:43 UTC (rev 759) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java 2013-04-10 15:07:59 UTC (rev 760) @@ -111,7 +111,6 @@ model.reset(); - ui.getIndividualObservationSpeciesComboBox().requestFocus(); } public void save() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java 2013-04-10 14:17:43 UTC (rev 759) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java 2013-04-10 15:07:59 UTC (rev 760) @@ -141,8 +141,6 @@ ui.getValidator().setBean(model); model.reset(); - - ui.getMarineLitterCategoryComboBox().requestFocus(); } public void save() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java 2013-04-10 14:17:43 UTC (rev 759) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java 2013-04-10 15:07:59 UTC (rev 760) @@ -214,7 +214,6 @@ } model.setAvailableSpecies(speciesToUse); - ui.getSpeciesComboBox().requestFocus(); } public void save() { Copied: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIModel-error-validation.xml (from rev 758, trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/individualObservation/create/CreateIndividualObservationBatchUIModel-error-validation.xml) =================================================================== --- trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIModel-error-validation.xml (rev 0) +++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIModel-error-validation.xml 2013-04-10 15:07:59 UTC (rev 760) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="species"> + <field-validator type="required" short-circuit="true"> + <message> + tutti.validator.error.createIndividualObservationBatch.individualObservationSpecies.required + </message> + </field-validator> + </field> + +</validators> \ No newline at end of file