This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 93a4470d9e7ef8a84a0b66ba7047bf5de13cf866 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 7 14:48:38 2016 +0100 Ajout d'un clic droit/ajouter sur le tableau LL de définition des templates de section (Fixes #8847) --- .../content/impl/longline/LonglineDetailCompositionUI.jaxx | 2 ++ .../content/impl/longline/LonglineDetailCompositionUI.jcss | 12 ++++++++++++ .../impl/longline/LonglineDetailCompositionUIHandler.java | 9 +++++++++ .../longline/LonglineDetailCompositionUIInitializer.java | 11 +++++++---- .../main/resources/i18n/application-swing_en_GB.properties | 4 ++++ .../main/resources/i18n/application-swing_es_ES.properties | 4 ++++ .../main/resources/i18n/application-swing_fr_FR.properties | 4 ++++ 7 files changed, 42 insertions(+), 4 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUI.jaxx index a373263..f0a574c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUI.jaxx @@ -83,6 +83,8 @@ </BeanValidator> <JPopupMenu id='sectionTemplatesPopup'> + <JMenuItem id='insertBeforeSelectedSectionTemplate' onActionPerformed='getHandler().insertBeforeSelectedSectionTemplate()'/> + <JMenuItem id='insertAfterSelectedSectionTemplate' onActionPerformed='getHandler().insertAfterSelectedSectionTemplate()'/> <JMenuItem id='deleteSelectedSectionTemplate' onActionPerformed='getHandler().deleteSelectedSectionTemplate()'/> </JPopupMenu> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUI.jcss index 4bc3373..f24e5bd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUI.jcss @@ -45,6 +45,18 @@ selected:{model.isCanGenerate()}; } +#insertBeforeSelectedSectionTemplate { + text: "observe.content.longlineDetailComposition.action.insertBeforeSelectedSectionTemplate"; + toolTipText: "observe.content.longlineDetailComposition.action.insertBeforeSelectedSectionTemplate.tip"; + actionIcon: insert-before; +} + +#insertAfterSelectedSectionTemplate { + text: "observe.content.longlineDetailComposition.action.insertAfterSelectedSectionTemplate"; + toolTipText: "observe.content.longlineDetailComposition.action.insertAfterSelectedSectionTemplate.tip"; + actionIcon: insert-after; +} + #deleteSelectedSectionTemplate { text: "observe.content.longlineDetailComposition.action.deleteSelectedSectionTemplate"; toolTipText: "observe.content.longlineDetailComposition.action.deleteSelectedSectionTemplate.tip"; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java index c2d56f8..0508bf9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java @@ -635,6 +635,15 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong } + public void insertBeforeSelectedSectionTemplate() { + getSectionTemplatesTableModel().insertBeforeSelectedRow(); + } + + public void insertAfterSelectedSectionTemplate() { + getSectionTemplatesTableModel().insertAfterSelectedRow(); + } + + public void deleteSelectedSectionTemplate() { SectionTemplatesTableModel tableModel = getSectionTemplatesTableModel(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIInitializer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIInitializer.java index 48f4594..5e456b5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIInitializer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIInitializer.java @@ -22,13 +22,13 @@ package fr.ird.observe.application.swing.ui.content.impl.longline; * #L% */ -import fr.ird.observe.services.dto.longline.SectionTemplate; -import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.ContentUIInitializer; import fr.ird.observe.application.swing.ui.util.table.AutotSelectRowAndShowPopupActionSupport; import fr.ird.observe.application.swing.ui.util.table.EditableTableModelSupport; +import fr.ird.observe.services.dto.longline.SectionTemplate; +import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; import org.jdesktop.swingx.autocomplete.ComboBoxCellEditor; import org.nuiton.decorator.Decorator; @@ -197,9 +197,8 @@ public class LonglineDetailCompositionUIInitializer extends ContentUIInitializer // init branchlineDetail tab BranchlineUI compositionUI = ui.getBranchlineDetailUI(); -// compositionUI.init(); Container parent = ui.getBranchlineDetailPanel(); - parent .removeAll(); + parent.removeAll(); parent.add(compositionUI.getBody()); } @@ -224,6 +223,8 @@ public class LonglineDetailCompositionUIInitializer extends ContentUIInitializer EditableTableModelSupport model = (EditableTableModelSupport) getTable().getModel(); + boolean canInsertBefore = model.isEmpty() || model.getSelectedRowIndex() > 0; + boolean canInsertAfter = true; boolean canDelete = !model.isSelectionEmpty(); if (canDelete) { @@ -235,6 +236,8 @@ public class LonglineDetailCompositionUIInitializer extends ContentUIInitializer } ui.getDeleteSelectedSectionTemplate().setEnabled(canDelete); + ui.getInsertBeforeSelectedSectionTemplate().setEnabled(canInsertBefore); + ui.getInsertAfterSelectedSectionTemplate().setEnabled(canInsertAfter); } diff --git a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties index 584f3fd..6857797 100644 --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -947,12 +947,16 @@ observe.content.longlineDetailComposition.action.insertAfterSelectedBranchline=I observe.content.longlineDetailComposition.action.insertAfterSelectedBranchline.tip=Insert after selected branchline observe.content.longlineDetailComposition.action.insertAfterSelectedSection=Insert after observe.content.longlineDetailComposition.action.insertAfterSelectedSection.tip=Insert after selected section +observe.content.longlineDetailComposition.action.insertAfterSelectedSectionTemplate=Insert after +observe.content.longlineDetailComposition.action.insertAfterSelectedSectionTemplate.tip=Insert after selected section observe.content.longlineDetailComposition.action.insertBeforeSelectedBasket=Insert before observe.content.longlineDetailComposition.action.insertBeforeSelectedBasket.tip=Insert before selected basket observe.content.longlineDetailComposition.action.insertBeforeSelectedBranchline=Insert before observe.content.longlineDetailComposition.action.insertBeforeSelectedBranchline.tip=Insert before selected branchline observe.content.longlineDetailComposition.action.insertBeforeSelectedSection=Insert before observe.content.longlineDetailComposition.action.insertBeforeSelectedSection.tip=Insert before selected section +observe.content.longlineDetailComposition.action.insertBeforeSelectedSectionTemplate=Insert before +observe.content.longlineDetailComposition.action.insertBeforeSelectedSectionTemplate.tip=Insert before selected section template observe.content.longlineDetailComposition.baskets=Baskets observe.content.longlineDetailComposition.basketsTable.floatline1Length=Floatline 1 length (m) observe.content.longlineDetailComposition.basketsTable.floatline1Length.tip=Floatline 1 length (m) diff --git a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties index bc08238..d51f134 100644 --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -947,12 +947,16 @@ observe.content.longlineDetailComposition.action.insertAfterSelectedBranchline=I observe.content.longlineDetailComposition.action.insertAfterSelectedBranchline.tip=Insertar después del arponcillo seleccionado observe.content.longlineDetailComposition.action.insertAfterSelectedSection=Insertar después observe.content.longlineDetailComposition.action.insertAfterSelectedSection.tip=Insertar después de la sección seleccionada +observe.content.longlineDetailComposition.action.insertAfterSelectedSectionTemplate=Insertar después +observe.content.longlineDetailComposition.action.insertAfterSelectedSectionTemplate.tip=Insertar después de la sección template seleccionada observe.content.longlineDetailComposition.action.insertBeforeSelectedBasket=Insertar antes observe.content.longlineDetailComposition.action.insertBeforeSelectedBasket.tip=Insertar antes de la cesta seleccionada observe.content.longlineDetailComposition.action.insertBeforeSelectedBranchline=Insertar antes observe.content.longlineDetailComposition.action.insertBeforeSelectedBranchline.tip=Insertar antes del arponcillo seleccionado observe.content.longlineDetailComposition.action.insertBeforeSelectedSection=Insertar antes observe.content.longlineDetailComposition.action.insertBeforeSelectedSection.tip=Insertar antes de la sección seleccionada +observe.content.longlineDetailComposition.action.insertBeforeSelectedSectionTemplate=Insertar antes +observe.content.longlineDetailComposition.action.insertBeforeSelectedSectionTemplate.tip=Insertar antes de la sección template seleccionada observe.content.longlineDetailComposition.baskets=Cestas observe.content.longlineDetailComposition.basketsTable.floatline1Length=Orinque 1 (m) observe.content.longlineDetailComposition.basketsTable.floatline1Length.tip=Longitud Orinque 1 (m) diff --git a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties index 529b960..f0e5fac 100644 --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -947,12 +947,16 @@ observe.content.longlineDetailComposition.action.insertAfterSelectedBranchline=I observe.content.longlineDetailComposition.action.insertAfterSelectedBranchline.tip=Insérer après l'avançon sélectionné observe.content.longlineDetailComposition.action.insertAfterSelectedSection=Insérer après observe.content.longlineDetailComposition.action.insertAfterSelectedSection.tip=Insérer après la section sélectionnée +observe.content.longlineDetailComposition.action.insertAfterSelectedSectionTemplate=Insérer après +observe.content.longlineDetailComposition.action.insertAfterSelectedSectionTemplate.tip=Insérer après la template de section sélectionnée observe.content.longlineDetailComposition.action.insertBeforeSelectedBasket=Insérer avant observe.content.longlineDetailComposition.action.insertBeforeSelectedBasket.tip=Insérer avant le panier sélectionné observe.content.longlineDetailComposition.action.insertBeforeSelectedBranchline=Insérer avant observe.content.longlineDetailComposition.action.insertBeforeSelectedBranchline.tip=Insérer avant l'avançon sélectionné observe.content.longlineDetailComposition.action.insertBeforeSelectedSection=Insérer avant observe.content.longlineDetailComposition.action.insertBeforeSelectedSection.tip=Insérer avant la section sélectionnée +observe.content.longlineDetailComposition.action.insertBeforeSelectedSectionTemplate=Insérer avant +observe.content.longlineDetailComposition.action.insertBeforeSelectedSectionTemplate.tip=Insérer avant la template de section sélectionnée observe.content.longlineDetailComposition.baskets=Paniers observe.content.longlineDetailComposition.basketsTable.floatline1Length=Orin 1 (m) observe.content.longlineDetailComposition.basketsTable.floatline1Length.tip=Longueur Orin 1 (m) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.