Author: kmorin Date: 2013-04-10 18:53:38 +0200 (Wed, 10 Apr 2013) New Revision: 762 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/762 Log: fixes #2275 [PROTOCOLE] quand on clone un protocole, le focus doit etre mis sur le nouveau nom du protocole car c'est bien la premi?\195?\168re chose ?\195?\160 faire 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/config/TuttiConfigUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 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/FishingOperationsUIHandler.java 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/accidental/AccidentalBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.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/benthos/frequency/BenthosFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/caracteristics/CaracteristicMapEditorUIHandler.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/MarineLitterBatchUIHandler.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/plankton/PlanktonBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 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/frequency/SpeciesFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/AbstractTuttiAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIHandler.java 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-10 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-04-10 16:53:38 UTC (rev 762) @@ -213,6 +213,11 @@ } @Override + protected JComponent getComponentToFocus() { + return currentBody; + } + + @Override public void onCloseUI() { // remove any screen Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2013-04-10 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2013-04-10 16:53:38 UTC (rev 762) @@ -43,6 +43,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.*; import javax.swing.table.TableCellEditor; import java.awt.BorderLayout; @@ -196,6 +197,11 @@ } @Override + protected JComponent getComponentToFocus() { + return getUI(); + } + + @Override public void onCloseUI() { if (log.isDebugEnabled()) { log.debug("closing: " + ui); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-04-10 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-04-10 16:53:38 UTC (rev 762) @@ -42,6 +42,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.*; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.List; @@ -221,6 +222,11 @@ } @Override + protected JComponent getComponentToFocus() { + return getUI().getProgramComboBox(); + } + + @Override public void onCloseUI() { if (log.isDebugEnabled()) { log.debug("closing: " + ui); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java 2013-04-10 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java 2013-04-10 16:53:38 UTC (rev 762) @@ -30,7 +30,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.SwingUtilities; +import javax.swing.*; import static org.nuiton.i18n.I18n._; @@ -99,6 +99,11 @@ } @Override + protected JComponent getComponentToFocus() { + return getUI().getUpgradeDbButton(); + } + + @Override public void onCloseUI() { } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-04-10 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-04-10 16:53:38 UTC (rev 762) @@ -38,9 +38,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.AbstractButton; -import javax.swing.JButton; -import javax.swing.JComboBox; +import javax.swing.*; import java.awt.event.ActionEvent; import java.awt.event.MouseEvent; import java.beans.PropertyChangeEvent; @@ -229,6 +227,11 @@ ui.applyDataBinding(SelectCruiseUI.BINDING_VALIDATE_CATCHES_BUTTON_ENABLED); } + @Override + protected JComponent getComponentToFocus() { + return getUI().getEditCatchesButton(); + } + protected boolean resetEditProtolAction; public void resetEditProtolAction() { 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 2013-04-10 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-04-10 16:53:38 UTC (rev 762) @@ -54,9 +54,7 @@ import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXDatePicker; -import javax.swing.JButton; -import javax.swing.JOptionPane; -import javax.swing.JTabbedPane; +import javax.swing.*; import java.awt.Color; import java.awt.Component; import java.awt.event.ActionEvent; @@ -345,6 +343,11 @@ } @Override + protected JComponent getComponentToFocus() { + return getUI().getStationNumberField(); + } + + @Override public void onCloseUI() { if (log.isDebugEnabled()) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-04-10 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-04-10 16:53:38 UTC (rev 762) @@ -39,7 +39,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.JTabbedPane; +import javax.swing.*; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.List; @@ -185,6 +185,11 @@ } @Override + protected JComponent getComponentToFocus() { + return null; + } + + @Override public void onCloseUI() { // ui will be saved so we do not want to keep selected tab indexes 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 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-04-10 16:53:38 UTC (rev 762) @@ -124,6 +124,11 @@ } @Override + protected JComponent getComponentToFocus() { + return getUI().getCatchTotalWeightField(); + } + + @Override public void onCloseUI() { if (log.isDebugEnabled()) { @@ -284,29 +289,27 @@ if (MAIN_CARD.equals(card)) { registerValidators(); actionPanel.setVisible(true); + } else { 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) { @@ -315,9 +318,6 @@ if (titlePanel != null) { titlePanel.setTitle(ui.getSpeciesTabFishingOperationReminderLabel().getTitle() + " - " + _(title)); } - if (component2focus != null) { - component2focus.requestFocus(); - } } } } @@ -332,29 +332,27 @@ if (MAIN_CARD.equals(card)) { registerValidators(); actionPanel.setVisible(true); + } else { 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) { @@ -363,9 +361,6 @@ if (titlePanel != null) { titlePanel.setTitle(ui.getBenthosTabFishingOperationReminderLabel().getTitle() + " - " + _(title)); } - if (component2focus != null) { - component2focus.requestFocus(); - } } } } @@ -380,17 +375,17 @@ if (MAIN_CARD.equals(card)) { registerValidators(); actionPanel.setVisible(true); + } else { 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) { @@ -399,9 +394,6 @@ if (titlePanel != null) { titlePanel.setTitle(ui.getMarineLitterTabCreateBatchReminderLabel().getTitle() + " - " + _(title)); } - if (component2focus != null) { - component2focus.requestFocus(); - } } } } @@ -416,22 +408,21 @@ if (MAIN_CARD.equals(card)) { registerValidators(); actionPanel.setVisible(true); + } else { 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) { @@ -440,9 +431,6 @@ 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/accidental/AccidentalBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2013-04-10 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2013-04-10 16:53:38 UTC (rev 762) @@ -45,6 +45,7 @@ import org.jdesktop.swingx.table.DefaultTableColumnModelExt; import org.nuiton.util.decorator.Decorator; +import javax.swing.*; import java.util.List; /** @@ -264,6 +265,11 @@ } @Override + protected JComponent getComponentToFocus() { + return getUI().getTable(); + } + + @Override public void onCloseUI() { if (log.isDebugEnabled()) { log.debug("closing: " + ui); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-04-10 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-04-10 16:53:38 UTC (rev 762) @@ -76,9 +76,7 @@ import org.jdesktop.swingx.table.DefaultTableColumnModelExt; import org.nuiton.util.decorator.Decorator; -import javax.swing.JOptionPane; -import javax.swing.RowFilter; -import javax.swing.UIManager; +import javax.swing.*; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumnModel; import java.awt.Color; @@ -631,6 +629,11 @@ } @Override + protected JComponent getComponentToFocus() { + return getUI().getTable(); + } + + @Override public void onCloseUI() { if (log.isDebugEnabled()) { log.debug("Closing: " + ui); 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 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java 2013-04-10 16:53:38 UTC (rev 762) @@ -45,6 +45,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.*; import java.awt.Dimension; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -147,6 +148,11 @@ } @Override + protected JComponent getComponentToFocus() { + return getUI().getSpeciesComboBox(); + } + + @Override public void onCloseUI() { if (log.isDebugEnabled()) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-04-10 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-04-10 16:53:38 UTC (rev 762) @@ -49,7 +49,7 @@ import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; -import javax.swing.JTextField; +import javax.swing.*; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.beans.PropertyChangeEvent; @@ -296,6 +296,11 @@ } @Override + protected JComponent getComponentToFocus() { + return getUI().getLengthStepCaracteristicComboBox(); + } + + @Override public void onCloseUI() { if (log.isDebugEnabled()) { log.debug("closing: " + ui); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java 2013-04-10 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java 2013-04-10 16:53:38 UTC (rev 762) @@ -46,8 +46,7 @@ import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; -import javax.swing.DefaultComboBoxModel; -import javax.swing.JComboBox; +import javax.swing.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.beans.PropertyChangeEvent; @@ -206,6 +205,11 @@ } @Override + protected JComponent getComponentToFocus() { + return getUI().getCategoryComboBox(); + } + + @Override public void onCloseUI() { if (log.isDebugEnabled()) { log.debug("closing: " + ui); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2013-04-10 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2013-04-10 16:53:38 UTC (rev 762) @@ -38,6 +38,7 @@ import org.jdesktop.swingx.table.DefaultTableColumnModelExt; import org.nuiton.util.decorator.Decorator; +import javax.swing.*; import java.awt.*; import java.util.Collection; import java.util.List; @@ -356,6 +357,11 @@ } @Override + protected JComponent getComponentToFocus() { + return getUI().getTable(); + } + + @Override public void onCloseUI() { if (log.isDebugEnabled()) { log.debug("closing: " + ui); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/caracteristics/CaracteristicMapEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/caracteristics/CaracteristicMapEditorUIHandler.java 2013-04-10 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/caracteristics/CaracteristicMapEditorUIHandler.java 2013-04-10 16:53:38 UTC (rev 762) @@ -25,6 +25,7 @@ import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; +import javax.swing.*; import java.util.List; import static fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.caracteristics.CaracteristicMapCellComponent.CaracteristicMapCellEditor; @@ -135,6 +136,11 @@ } @Override + protected JComponent getComponentToFocus() { + return getUI().getNewRowKey(); + } + + @Override public void onCloseUI() { if (log.isDebugEnabled()) { log.debug("closing: " + ui); 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 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java 2013-04-10 16:53:38 UTC (rev 762) @@ -17,6 +17,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.*; import java.awt.*; import java.util.List; @@ -65,6 +66,11 @@ } @Override + protected JComponent getComponentToFocus() { + return getUI().getIndividualObservationSpeciesComboBox(); + } + + @Override public void onCloseUI() { if (log.isDebugEnabled()) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java 2013-04-10 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java 2013-04-10 16:53:38 UTC (rev 762) @@ -59,6 +59,7 @@ import org.jdesktop.swingx.table.DefaultTableColumnModelExt; import org.nuiton.util.decorator.Decorator; +import javax.swing.*; import java.awt.Color; import java.awt.Component; import java.util.Collection; @@ -369,6 +370,11 @@ } @Override + protected JComponent getComponentToFocus() { + return getUI().getTable(); + } + + @Override public void onCloseUI() { if (log.isDebugEnabled()) { log.debug("closing: " + ui); 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 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java 2013-04-10 16:53:38 UTC (rev 762) @@ -42,6 +42,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.*; import java.awt.Dimension; import java.util.List; @@ -96,6 +97,11 @@ } @Override + protected JComponent getComponentToFocus() { + return getUI().getMarineLitterCategoryComboBox(); + } + + @Override public void onCloseUI() { if (log.isDebugEnabled()) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchUIHandler.java 2013-04-10 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchUIHandler.java 2013-04-10 16:53:38 UTC (rev 762) @@ -45,6 +45,7 @@ import org.jdesktop.swingx.table.DefaultTableColumnModelExt; import org.nuiton.util.decorator.Decorator; +import javax.swing.*; import java.util.List; /** @@ -270,6 +271,11 @@ } @Override + protected JComponent getComponentToFocus() { + return getUI().getTable(); + } + + @Override public void onCloseUI() { if (log.isDebugEnabled()) { log.debug("closing: " + ui); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-04-10 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-04-10 16:53:38 UTC (rev 762) @@ -650,6 +650,11 @@ } @Override + protected JComponent getComponentToFocus() { + return getUI().getTable(); + } + + @Override public void onCloseUI() { if (log.isDebugEnabled()) { log.debug("Closing: " + ui); 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 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java 2013-04-10 16:53:38 UTC (rev 762) @@ -45,6 +45,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.*; import java.awt.Dimension; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -147,6 +148,11 @@ } @Override + protected JComponent getComponentToFocus() { + return getUI().getSpeciesComboBox(); + } + + @Override public void onCloseUI() { if (log.isDebugEnabled()) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-04-10 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-04-10 16:53:38 UTC (rev 762) @@ -50,7 +50,7 @@ import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; -import javax.swing.JTextField; +import javax.swing.*; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.beans.PropertyChangeEvent; @@ -297,6 +297,11 @@ } @Override + protected JComponent getComponentToFocus() { + return getUI().getLengthStepCaracteristicComboBox(); + } + + @Override public void onCloseUI() { if (log.isDebugEnabled()) { log.debug("closing: " + ui); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 2013-04-10 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 2013-04-10 16:53:38 UTC (rev 762) @@ -46,8 +46,7 @@ import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; -import javax.swing.DefaultComboBoxModel; -import javax.swing.JComboBox; +import javax.swing.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.beans.PropertyChangeEvent; @@ -206,6 +205,11 @@ } @Override + protected JComponent getComponentToFocus() { + return getUI().getCategoryComboBox(); + } + + @Override public void onCloseUI() { if (log.isDebugEnabled()) { log.debug("closing: " + ui); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java 2013-04-10 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java 2013-04-10 16:53:38 UTC (rev 762) @@ -42,6 +42,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.*; import java.util.List; /** @@ -133,6 +134,11 @@ } @Override + protected JComponent getComponentToFocus() { + return getKeyCombo(); + } + + @Override public void onCloseUI() { if (log.isDebugEnabled()) { log.debug("closing: " + getUI()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java 2013-04-10 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java 2013-04-10 16:53:38 UTC (rev 762) @@ -33,6 +33,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.*; + import static org.nuiton.i18n.I18n._; /** @@ -119,6 +121,11 @@ } @Override + protected JComponent getComponentToFocus() { + return getUI().getNameField(); + } + + @Override public void onCloseUI() { if (log.isDebugEnabled()) { log.debug("closing: " + ui); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2013-04-10 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2013-04-10 16:53:38 UTC (rev 762) @@ -82,7 +82,8 @@ <JMenuItem id='removeBenthosProtocolButton'/> </JPopupMenu> - <JTabbedPane constraints='BorderLayout.CENTER'> + <JTabbedPane id='tabPanel' + constraints='BorderLayout.CENTER'> <tab title='tutti.editProtocol.tab.info'> <Table id='protocolInfoForm' fill='both'> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-04-10 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-04-10 16:53:38 UTC (rev 762) @@ -60,9 +60,7 @@ import org.jdesktop.swingx.table.DefaultTableColumnModelExt; import org.nuiton.util.decorator.Decorator; -import javax.swing.JComboBox; -import javax.swing.JTabbedPane; -import javax.swing.ListSelectionModel; +import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.event.ListSelectionEvent; @@ -72,6 +70,9 @@ import javax.swing.table.TableColumnModel; import java.awt.Component; import java.awt.Dimension; +import java.awt.event.ComponentEvent; +import java.awt.event.HierarchyEvent; +import java.awt.event.HierarchyListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.Collection; @@ -476,6 +477,11 @@ dialog = new SelectSpeciesUI(ui); } + @Override + protected JComponent getComponentToFocus() { + return getUI().getNameField(); + } + public List<EditProtocolSpeciesRowModel> toRows(List<SpeciesProtocol> speciesProtocols) { BeanFilterableComboBox<Species> speciesComboBox = ui.getSpeciesComboBox(); Preconditions.checkNotNull(speciesComboBox.getData()); @@ -520,6 +526,7 @@ log.debug("closing: " + ui); } clearValidators(); + ui.getTabPanel().setSelectedIndex(0); } @Override @@ -650,9 +657,9 @@ ComboBoxCellEditor editor = new ComboBoxCellEditor(comboBox); addColumnToModel(model, - editor, - newTableCellRender(decorator), - EditProtocolSpeciesTableModel.LENGTH_STEP_PMFM_ID); + editor, + newTableCellRender(decorator), + EditProtocolSpeciesTableModel.LENGTH_STEP_PMFM_ID); } protected void initTable(JXTable table) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java 2013-04-10 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java 2013-04-10 16:53:38 UTC (rev 762) @@ -68,6 +68,11 @@ } @Override + protected JComponent getComponentToFocus() { + return null; + } + + @Override public void onCloseUI() { if (log.isDebugEnabled()) { log.debug("closing: " + ui); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-04-10 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-04-10 16:53:38 UTC (rev 762) @@ -102,14 +102,7 @@ import java.awt.Font; import java.awt.Frame; import java.awt.Point; -import java.awt.event.ActionEvent; -import java.awt.event.FocusAdapter; -import java.awt.event.FocusEvent; -import java.awt.event.ItemEvent; -import java.awt.event.KeyEvent; -import java.awt.event.MouseEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; +import java.awt.event.*; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; @@ -415,8 +408,22 @@ initScrollPane((JScrollPane) component); } } + + ((Component)ui).addHierarchyListener(new HierarchyListener() { + @Override + public void hierarchyChanged(HierarchyEvent e) { + JComponent component = getComponentToFocus(); + if ((e.getChangeFlags() & HierarchyEvent.SHOWING_CHANGED) > 0 + && e.getChanged() .isShowing() + && component != null) { + component.requestFocus(); + } + } + }); } + protected abstract JComponent getComponentToFocus(); + protected void initTextField(JTextField jTextField) { Boolean computed = (Boolean) jTextField.getClientProperty("computed"); if (computed != null && computed) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/AbstractTuttiAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/AbstractTuttiAction.java 2013-04-10 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/AbstractTuttiAction.java 2013-04-10 16:53:38 UTC (rev 762) @@ -162,47 +162,4 @@ return getDecorator(object.getClass(), context).toString(object); } - //FIXME-TC Is this working ? - protected void test(final Runnable r) throws InterruptedException { - SwingUtilities.invokeLater(new Runnable() { - - public void run() { - System.out.println("run"); -// getContext().getActionUI().pause(); - r.run(); -// getContext().getActionUI().resume(); - - System.out.println("Deblock ?"); - log.info("Deblock ?"); - unblock(); - } - }); - - log.info("Block ?"); - System.out.println("Block ?"); - block(); - - System.out.println("Block !"); - log.info("Block !"); - } - - protected void block() { - try { - synchronized (this) { - lock.wait(); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - protected void unblock() { - try { - synchronized (this) { - lock.notifyAll(); - } - } catch (Exception e) { - e.printStackTrace(); - } - } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java 2013-04-10 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java 2013-04-10 16:53:38 UTC (rev 762) @@ -33,6 +33,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.*; import java.awt.Container; import java.awt.Cursor; import java.beans.PropertyChangeEvent; @@ -181,6 +182,11 @@ } @Override + protected JComponent getComponentToFocus() { + return null; + } + + @Override public void onCloseUI() { } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java 2013-04-10 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java 2013-04-10 16:53:38 UTC (rev 762) @@ -157,6 +157,11 @@ } @Override + protected JComponent getComponentToFocus() { + return getUI().getFile(); + } + + @Override public void onCloseUI() { } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIHandler.java 2013-04-10 15:17:14 UTC (rev 761) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIHandler.java 2013-04-10 16:53:38 UTC (rev 762) @@ -33,6 +33,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.*; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -74,6 +75,11 @@ } @Override + protected JComponent getComponentToFocus() { + return getUI().getSpeciesCombo(); + } + + @Override public void onCloseUI() { if (log.isDebugEnabled()) { log.debug("closing: " + ui);