branch feature/7631 created (now 0a0e88e)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7631 in repository tutti. See http://git.codelutin.com/tutti.git at 0a0e88e on attend que la swing session ait restauré l'etat de la combo des operations pour selectionner la première (fixes #7631) This branch includes the following new commits: new 0a0e88e on attend que la swing session ait restauré l'etat de la combo des operations pour selectionner la première (fixes #7631) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 0a0e88e0e1c24250b7b112ce64609621089af986 Author: Kevin Morin <morin@codelutin.com> Date: Fri Dec 11 18:07:45 2015 +0100 on attend que la swing session ait restauré l'etat de la combo des operations pour selectionner la première (fixes #7631) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7631 in repository tutti. See http://git.codelutin.com/tutti.git commit 0a0e88e0e1c24250b7b112ce64609621089af986 Author: Kevin Morin <morin@codelutin.com> Date: Fri Dec 11 18:07:45 2015 +0100 on attend que la swing session ait restauré l'etat de la combo des operations pour selectionner la première (fixes #7631) --- .../content/home/actions/EditCatchesAction.java | 9 +++++++- .../operation/FishingOperationsUIHandler.java | 26 ++++++++++------------ 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/EditCatchesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/EditCatchesAction.java index 1487652..ac083d9 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/EditCatchesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/EditCatchesAction.java @@ -23,12 +23,14 @@ package fr.ifremer.tutti.ui.swing.content.home.actions; */ import com.google.common.base.Preconditions; +import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.ValidationService; import fr.ifremer.tutti.ui.swing.TuttiScreen; -import fr.ifremer.tutti.ui.swing.content.actions.AbstractChangeScreenAction; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; +import fr.ifremer.tutti.ui.swing.content.actions.AbstractChangeScreenAction; import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUI; import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI; +import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -71,6 +73,11 @@ public class EditCatchesAction extends AbstractChangeScreenAction { public void run() { FishingOperationsUI currentBoby = (FishingOperationsUI) getHandler().getCurrentBody(); + + BeanFilterableComboBox<FishingOperation> comboBox = currentBoby.getFishingOperationComboBox(); + FishingOperation selectedOperation = comboBox.getData().get(0); + currentBoby.getModel().setSelectedFishingOperation(selectedOperation); + EditFishingOperationUI fishingOperationTabContent = currentBoby.getFishingOperationTabContent(); JComponent componentToFocus = fishingOperationTabContent.getHandler().getComponentToFocus(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java index eee3ec6..9ed875d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java @@ -29,9 +29,9 @@ import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.TuttiUIContext; -import fr.ifremer.tutti.ui.swing.content.operation.fishing.actions.EditFishingOperationAction; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; +import fr.ifremer.tutti.ui.swing.content.operation.fishing.actions.EditFishingOperationAction; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiTabContainerUIHandler; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; @@ -194,19 +194,17 @@ public class FishingOperationsUIHandler extends AbstractTuttiTabContainerUIHandl } }); - FishingOperation selectedOperation = null; - for (FishingOperation fishingOperation : fishingOperations) { - if (selectedOperation == null || - fishingOperation.getGearShootingStartDate() - .after(selectedOperation.getGearShootingStartDate()) - && fishingOperation.getFishingOperationNumber() - > selectedOperation.getFishingOperationNumber() - ) { - selectedOperation = fishingOperation; - } - } - - model.setSelectedFishingOperation(selectedOperation); +// FishingOperation selectedOperation = null; +// for (FishingOperation fishingOperation : fishingOperations) { +// if (selectedOperation == null || +// fishingOperation.getGearShootingStartDate() +// .after(selectedOperation.getGearShootingStartDate()) +// && fishingOperation.getFishingOperationNumber() +// > selectedOperation.getFishingOperationNumber() +// ) { +// selectedOperation = fishingOperation; +// } +// } getContext().addPropertyChangeListener(TuttiUIContext.PROPERTY_HIDE_BODY, new PropertyChangeListener() { @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm