February 2019 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop-7.x] On trip forms we should not be able to display map's tab in create mode - Closes #1240
by Tony CHEMIT 27 Feb '19

27 Feb '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 04e31f4a by tchemit at 2019-02-27T12:23:25Z On trip forms we should not be able to display map's tab in create mode - Closes #1240 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUI.jcss Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jcss ===================================== @@ -98,6 +98,10 @@ _propertyName: {TripLonglineDto.PROPERTY_END_DATE}; } +#mapTab { + enabled:{!model.isCreatingMode()} +} + #reopen { _toolTipText:{t("observe.common.TripDto.action.reopen.tip")}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUI.jcss ===================================== @@ -133,6 +133,10 @@ NumberEditor { _notBlocking:true; } +#mapTab { + enabled:{!model.isCreatingMode()} +} + #reopen { _toolTipText:{t("observe.common.TripDto.action.reopen.tip")}; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/04e31f4a664f64ff3238c9140ac… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/04e31f4a664f64ff3238c9140ac… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Improve select tree - Closes #1239
by Tony CHEMIT 25 Feb '19

25 Feb '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e708a186 by tchemit at 2019-02-25T13:08:23Z Improve select tree - Closes #1239 - - - - - 15 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTree.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTreeCellRenderer.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ProgramSelectionTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ReferenceSelectionTreeNodeSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ReferentialSelectionTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ReferentialsSelectionTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/RootSelectionTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/SelectionTreeNodeSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/TripLonglineSelectionTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/TripSeineSelectionTreeNode.java - + client-core/src/main/resources/icons/checkBox.png - + client-core/src/main/resources/icons/checkBoxIndeterminateSelected.png - + client-core/src/main/resources/icons/checkBoxSelected.png - client-core/src/main/resources/observe-ui.properties Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java ===================================== @@ -61,6 +61,7 @@ public abstract class ObserveKeyStrokes { public static final KeyStroke KEY_STROKE_RELOAD_DEFAULT_CONFIGURATION = KeyStroke.getKeyStroke(KeyEvent.VK_R, InputEvent.ALT_MASK | InputEvent.SHIFT_MASK); public static final KeyStroke KEY_STROKE_ESCAPE = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0); public static final KeyStroke KEY_STROKE_ENTER = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0); + public static final KeyStroke KEY_STROKE_SPACE = KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, 0); public static final KeyStroke KEY_STROKE_NAVIGATION_CONFIGURE = KeyStroke.getKeyStroke("ctrl pressed F1"); public static final KeyStroke KEY_STROKE_SHOW_SEINE = KeyStroke.getKeyStroke("ctrl pressed F2"); public static final KeyStroke KEY_STROKE_SHOW_LONGLINE = KeyStroke.getKeyStroke("ctrl pressed F3"); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTree.java ===================================== @@ -56,9 +56,11 @@ public class SelectionTree extends JXTree { public void installUI() { + getInputMap().put(ObserveKeyStrokes.KEY_STROKE_SPACE,"none"); InputMap inputMap = getInputMap(WHEN_IN_FOCUSED_WINDOW); ActionMap actionMap = getActionMap(); inputMap.put(ObserveKeyStrokes.KEY_STROKE_ENTER, "select/unselect"); + inputMap.put(ObserveKeyStrokes.KEY_STROKE_SPACE, "select/unselect"); actionMap.put("select/unselect", new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { @@ -80,8 +82,11 @@ public class SelectionTree extends JXTree { InputMap inputMap = getInputMap(WHEN_IN_FOCUSED_WINDOW); ActionMap actionMap = getActionMap(); + getInputMap().put(ObserveKeyStrokes.KEY_STROKE_SPACE,"none"); + oppositeTree.getInputMap().put(ObserveKeyStrokes.KEY_STROKE_SPACE,"none"); inputMap.put(ObserveKeyStrokes.KEY_STROKE_ENTER, "select/unselect"); + inputMap.put(ObserveKeyStrokes.KEY_STROKE_SPACE, "select/unselect"); actionMap.put("select/unselect", new AbstractAction() { @Override ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTreeCellRenderer.java ===================================== @@ -31,9 +31,11 @@ import javax.swing.Icon; import javax.swing.JCheckBox; import javax.swing.JPanel; import javax.swing.JTree; +import javax.swing.UIManager; import java.awt.BorderLayout; import java.awt.Component; import java.awt.Dimension; +import java.util.Objects; /** * Created on 14/11/16. @@ -45,6 +47,8 @@ public class SelectionTreeCellRenderer extends DefaultXTreeCellRenderer { private final JPanel panel; private final JCheckBox selected; + private final Icon unselectedIcon; + private Icon partialIcon; protected SelectionTreeCellRenderer() { selected = new JCheckBox(); @@ -52,6 +56,11 @@ public class SelectionTreeCellRenderer extends DefaultXTreeCellRenderer { panel.setOpaque(false); panel.add(selected, BorderLayout.WEST); panel.add(this, BorderLayout.CENTER); + partialIcon = Objects.requireNonNull(UIManager.getIcon("checkbox.partial")); + unselectedIcon = Objects.requireNonNull(UIManager.getIcon("checkbox.empty")); + selected.setIcon(unselectedIcon); + Icon selectedIcon = Objects.requireNonNull(UIManager.getIcon("checkbox.selected")); + selected.setSelectedIcon(selectedIcon); } public Icon getIcon(SelectionTreeNodeSupport node) { @@ -69,7 +78,9 @@ public class SelectionTreeCellRenderer extends DefaultXTreeCellRenderer { } else if (node instanceof TripLonglineSelectionTreeNode) { setToolTipText(((TripLonglineSelectionTreeNode) node).getToolTipText()); } - selected.setSelected(node.isSelected()); + boolean selected = node.isSelected(); + this.selected.setSelected(selected); + this.selected.setIcon(selected || !node.isPartialSelected() ? unselectedIcon : partialIcon); panel.setPreferredSize(new Dimension(getPreferredSize().width + 20, getPreferredSize().height + 2)); return panel; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ProgramSelectionTreeNode.java ===================================== @@ -29,6 +29,7 @@ import fr.ird.observe.dto.data.ps.common.TripSeineReference; import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.dto.referential.common.ProgramDto; import fr.ird.observe.dto.referential.common.ProgramReference; +import fr.ird.observe.navigation.model.edit.ObserveEditModel; import org.apache.commons.collections4.EnumerationUtils; import java.util.Collection; @@ -65,10 +66,12 @@ public class ProgramSelectionTreeNode extends ReferenceSelectionTreeNodeSupport< @Override public boolean isOpen() { - return Objects.equals(ObserveSwingApplicationContext.get().getNavigationEdit().getLongline().getProgram().getId(),toString()) - || Objects.equals(ObserveSwingApplicationContext.get().getNavigationEdit().getSeine().getProgram().getId(),toString()); + ObserveEditModel navigationEdit = getNavigationEditModel(); + return Objects.equals(navigationEdit.getLongline().getProgram().getId(), toString()) + || Objects.equals(navigationEdit.getSeine().getProgram().getId(), toString()); } + @Override public Iterator<TripSelectionTreeNodeSupport<?, ?>> iterator() { return (Iterator) EnumerationUtils.toList(super.children()).iterator(); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ReferenceSelectionTreeNodeSupport.java ===================================== @@ -26,8 +26,11 @@ import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.IdHelper; import fr.ird.observe.dto.reference.DtoReference; +import fr.ird.observe.navigation.model.edit.ObserveEditModel; import org.nuiton.decorator.Decorator; +import java.util.Enumeration; + /** * Created on 18/11/16. * @@ -69,4 +72,26 @@ public abstract class ReferenceSelectionTreeNodeSupport<D extends IdDto, R exten public void setSelected(boolean selected) { this.selected = selected; } + + @Override + public boolean isPartialSelected() { + if (isSelected()) { + return false; + } + if (isLeaf()) { + return false; + } + Enumeration<SelectionTreeNodeSupport> children = children(); + while (children.hasMoreElements()) { + SelectionTreeNodeSupport nodeSupport = children.nextElement(); + if (nodeSupport.isSelected()) { + return true; + } + } + return false; + } + + ObserveEditModel getNavigationEditModel() { + return ObserveSwingApplicationContext.get().getNavigationEdit(); + } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ReferentialSelectionTreeNode.java ===================================== @@ -66,6 +66,11 @@ public class ReferentialSelectionTreeNode<D extends ReferentialDto> extends Sele return selected; } + @Override + public boolean isPartialSelected() { + return false; + } + @Override public void setSelected(boolean selected) { this.selected = selected; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ReferentialsSelectionTreeNode.java ===================================== @@ -100,6 +100,19 @@ public class ReferentialsSelectionTreeNode extends SelectionTreeNodeSupport<Stri return true; } + @Override + public boolean isPartialSelected() { + if (isSelected()) { + return false; + } + for (ReferentialSelectionTreeNode<?> nodeSupport : this) { + if (nodeSupport.isSelected()) { + return true; + } + } + return false; + } + public ImmutableList<Class<? extends ReferentialDto>> getSelected() { ImmutableList.Builder<Class<? extends ReferentialDto>> builder = ImmutableList.builder(); for (ReferentialSelectionTreeNode<?> nodeSupport : this) { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/RootSelectionTreeNode.java ===================================== @@ -74,6 +74,11 @@ public class RootSelectionTreeNode extends SelectionTreeNodeSupport<Void> implem // rien a faire } + @Override + public boolean isPartialSelected() { + return false; + } + public ReferentialsSelectionTreeNode[] getReferentialsNodes() { ReferentialsSelectionTreeNode[] result = new ReferentialsSelectionTreeNode[3]; result[0] = (ReferentialsSelectionTreeNode) getChildAt(getChildCount() - 3); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/SelectionTreeNodeSupport.java ===================================== @@ -42,6 +42,8 @@ public abstract class SelectionTreeNodeSupport<O> extends DefaultMutableTreeNode public abstract boolean isOpen(); + public abstract boolean isPartialSelected(); + public abstract String getId(); public abstract String getText(); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/TripLonglineSelectionTreeNode.java ===================================== @@ -44,7 +44,7 @@ public class TripLonglineSelectionTreeNode extends TripSelectionTreeNodeSupport< @Override public boolean isOpen() { - return Objects.equals(ObserveSwingApplicationContext.get().getNavigationEdit().getLongline().getTrip().getId(), getId()); + return Objects.equals(getNavigationEditModel().getLongline().getTrip().getId(), getId()); } @Override ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/TripSeineSelectionTreeNode.java ===================================== @@ -44,7 +44,7 @@ public class TripSeineSelectionTreeNode extends TripSelectionTreeNodeSupport<Tri @Override public boolean isOpen() { - return Objects.equals(ObserveSwingApplicationContext.get().getNavigationEdit().getSeine().getTrip().getId(), getId()); + return Objects.equals(getNavigationEditModel().getSeine().getTrip().getId(), getId()); } @Override ===================================== client-core/src/main/resources/icons/checkBox.png ===================================== Binary files /dev/null and b/client-core/src/main/resources/icons/checkBox.png differ ===================================== client-core/src/main/resources/icons/checkBoxIndeterminateSelected.png ===================================== Binary files /dev/null and b/client-core/src/main/resources/icons/checkBoxIndeterminateSelected.png differ ===================================== client-core/src/main/resources/icons/checkBoxSelected.png ===================================== Binary files /dev/null and b/client-core/src/main/resources/icons/checkBoxSelected.png differ ===================================== client-core/src/main/resources/observe-ui.properties ===================================== @@ -65,6 +65,11 @@ icon.navigation.data.ll.observation.ActivityLonglineObs-16=navigation/ird/route1 icon.navigation.data.ll.observation.SetLonglineObs-16=navigation/ird/set16.png icon.navigation.data.ll.observation.CatchLonglineObs-16=navigation/ird/floatingObject16.png icon.navigation.data.ll.observation.TdrObs-16=navigation/ird/floatingObject16.png + +icon.checkbox.empty=checkBox.png +icon.checkbox.partial=checkBoxIndeterminateSelected.png +icon.checkbox.selected=checkBoxSelected.png + # icones d'action sur les editeurs numeriques #icon.action.numbereditor-showpopup=action-numbereditor-showpopup.png #icon.action.numbereditor-reset=action-numbereditor-reset.png View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e708a186b02f699d0bc607297a8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e708a186b02f699d0bc607297a8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Improve select tree - C:oses #1239
by Tony CHEMIT 25 Feb '19

25 Feb '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 718bcc1c by tchemit at 2019-02-25T13:01:36Z Improve select tree - C:oses #1239 - - - - - 15 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTree.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTreeCellRenderer.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ProgramSelectionTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ReferenceSelectionTreeNodeSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ReferentialSelectionTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ReferentialsSelectionTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/RootSelectionTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/SelectionTreeNodeSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/TripLonglineSelectionTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/TripSeineSelectionTreeNode.java - + client-core/src/main/resources/icons/checkBox.png - + client-core/src/main/resources/icons/checkBoxIndeterminateSelected.png - + client-core/src/main/resources/icons/checkBoxSelected.png - client-core/src/main/resources/observe-ui.properties Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java ===================================== @@ -61,6 +61,7 @@ public abstract class ObserveKeyStrokes { public static final KeyStroke KEY_STROKE_RELOAD_DEFAULT_CONFIGURATION = KeyStroke.getKeyStroke(KeyEvent.VK_R, InputEvent.ALT_MASK | InputEvent.SHIFT_MASK); public static final KeyStroke KEY_STROKE_ESCAPE = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0); public static final KeyStroke KEY_STROKE_ENTER = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0); + public static final KeyStroke KEY_STROKE_SPACE = KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, 0); public static final KeyStroke KEY_STROKE_NAVIGATION_CONFIGURE = KeyStroke.getKeyStroke("ctrl pressed F1"); public static final KeyStroke KEY_STROKE_SHOW_SEINE = KeyStroke.getKeyStroke("ctrl pressed F2"); public static final KeyStroke KEY_STROKE_SHOW_LONGLINE = KeyStroke.getKeyStroke("ctrl pressed F3"); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTree.java ===================================== @@ -56,9 +56,11 @@ public class SelectionTree extends JXTree { public void installUI() { + getInputMap().put(ObserveKeyStrokes.KEY_STROKE_SPACE,"none"); InputMap inputMap = getInputMap(WHEN_IN_FOCUSED_WINDOW); ActionMap actionMap = getActionMap(); inputMap.put(ObserveKeyStrokes.KEY_STROKE_ENTER, "select/unselect"); + inputMap.put(ObserveKeyStrokes.KEY_STROKE_SPACE, "select/unselect"); actionMap.put("select/unselect", new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { @@ -80,8 +82,11 @@ public class SelectionTree extends JXTree { InputMap inputMap = getInputMap(WHEN_IN_FOCUSED_WINDOW); ActionMap actionMap = getActionMap(); + getInputMap().put(ObserveKeyStrokes.KEY_STROKE_SPACE,"none"); + oppositeTree.getInputMap().put(ObserveKeyStrokes.KEY_STROKE_SPACE,"none"); inputMap.put(ObserveKeyStrokes.KEY_STROKE_ENTER, "select/unselect"); + inputMap.put(ObserveKeyStrokes.KEY_STROKE_SPACE, "select/unselect"); actionMap.put("select/unselect", new AbstractAction() { @Override ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTreeCellRenderer.java ===================================== @@ -31,9 +31,11 @@ import javax.swing.Icon; import javax.swing.JCheckBox; import javax.swing.JPanel; import javax.swing.JTree; +import javax.swing.UIManager; import java.awt.BorderLayout; import java.awt.Component; import java.awt.Dimension; +import java.util.Objects; /** * Created on 14/11/16. @@ -45,6 +47,8 @@ public class SelectionTreeCellRenderer extends DefaultXTreeCellRenderer { private final JPanel panel; private final JCheckBox selected; + private final Icon unselectedIcon; + private Icon partialIcon; protected SelectionTreeCellRenderer() { selected = new JCheckBox(); @@ -52,6 +56,11 @@ public class SelectionTreeCellRenderer extends DefaultXTreeCellRenderer { panel.setOpaque(false); panel.add(selected, BorderLayout.WEST); panel.add(this, BorderLayout.CENTER); + partialIcon = Objects.requireNonNull(UIManager.getIcon("checkbox.partial")); + unselectedIcon = Objects.requireNonNull(UIManager.getIcon("checkbox.empty")); + selected.setIcon(unselectedIcon); + Icon selectedIcon = Objects.requireNonNull(UIManager.getIcon("checkbox.selected")); + selected.setSelectedIcon(selectedIcon); } public Icon getIcon(SelectionTreeNodeSupport node) { @@ -69,7 +78,9 @@ public class SelectionTreeCellRenderer extends DefaultXTreeCellRenderer { } else if (node instanceof TripLonglineSelectionTreeNode) { setToolTipText(((TripLonglineSelectionTreeNode) node).getToolTipText()); } - selected.setSelected(node.isSelected()); + boolean selected = node.isSelected(); + this.selected.setSelected(selected); + this.selected.setIcon(selected || !node.isPartialSelected() ? unselectedIcon : partialIcon); panel.setPreferredSize(new Dimension(getPreferredSize().width + 20, getPreferredSize().height + 2)); return panel; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ProgramSelectionTreeNode.java ===================================== @@ -29,6 +29,7 @@ import fr.ird.observe.dto.data.ps.common.TripSeineReference; import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.dto.referential.common.ProgramDto; import fr.ird.observe.dto.referential.common.ProgramReference; +import fr.ird.observe.navigation.model.edit.ObserveEditModel; import org.apache.commons.collections4.EnumerationUtils; import java.util.Collection; @@ -65,10 +66,12 @@ public class ProgramSelectionTreeNode extends ReferenceSelectionTreeNodeSupport< @Override public boolean isOpen() { - return Objects.equals(ObserveSwingApplicationContext.get().getNavigationEdit().getLongline().getProgram().getId(),toString()) - || Objects.equals(ObserveSwingApplicationContext.get().getNavigationEdit().getSeine().getProgram().getId(),toString()); + ObserveEditModel navigationEdit = getNavigationEditModel(); + return Objects.equals(navigationEdit.getLongline().getProgram().getId(), toString()) + || Objects.equals(navigationEdit.getSeine().getProgram().getId(), toString()); } + @Override public Iterator<TripSelectionTreeNodeSupport<?, ?>> iterator() { return (Iterator) EnumerationUtils.toList(super.children()).iterator(); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ReferenceSelectionTreeNodeSupport.java ===================================== @@ -26,8 +26,11 @@ import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.IdHelper; import fr.ird.observe.dto.reference.DtoReference; +import fr.ird.observe.navigation.model.edit.ObserveEditModel; import org.nuiton.decorator.Decorator; +import java.util.Enumeration; + /** * Created on 18/11/16. * @@ -69,4 +72,26 @@ public abstract class ReferenceSelectionTreeNodeSupport<D extends IdDto, R exten public void setSelected(boolean selected) { this.selected = selected; } + + @Override + public boolean isPartialSelected() { + if (isSelected()) { + return false; + } + if (isLeaf()) { + return false; + } + Enumeration<SelectionTreeNodeSupport> children = children(); + while (children.hasMoreElements()) { + SelectionTreeNodeSupport nodeSupport = children.nextElement(); + if (nodeSupport.isSelected()) { + return true; + } + } + return false; + } + + ObserveEditModel getNavigationEditModel() { + return ObserveSwingApplicationContext.get().getNavigationEdit(); + } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ReferentialSelectionTreeNode.java ===================================== @@ -66,6 +66,11 @@ public class ReferentialSelectionTreeNode<D extends ReferentialDto> extends Sele return selected; } + @Override + public boolean isPartialSelected() { + return false; + } + @Override public void setSelected(boolean selected) { this.selected = selected; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ReferentialsSelectionTreeNode.java ===================================== @@ -100,6 +100,19 @@ public class ReferentialsSelectionTreeNode extends SelectionTreeNodeSupport<Stri return true; } + @Override + public boolean isPartialSelected() { + if (isSelected()) { + return false; + } + for (ReferentialSelectionTreeNode<?> nodeSupport : this) { + if (nodeSupport.isSelected()) { + return true; + } + } + return false; + } + public ImmutableList<Class<? extends ReferentialDto>> getSelected() { ImmutableList.Builder<Class<? extends ReferentialDto>> builder = ImmutableList.builder(); for (ReferentialSelectionTreeNode<?> nodeSupport : this) { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/RootSelectionTreeNode.java ===================================== @@ -74,6 +74,11 @@ public class RootSelectionTreeNode extends SelectionTreeNodeSupport<Void> implem // rien a faire } + @Override + public boolean isPartialSelected() { + return false; + } + public ReferentialsSelectionTreeNode[] getReferentialsNodes() { ReferentialsSelectionTreeNode[] result = new ReferentialsSelectionTreeNode[3]; result[0] = (ReferentialsSelectionTreeNode) getChildAt(getChildCount() - 3); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/SelectionTreeNodeSupport.java ===================================== @@ -42,6 +42,8 @@ public abstract class SelectionTreeNodeSupport<O> extends DefaultMutableTreeNode public abstract boolean isOpen(); + public abstract boolean isPartialSelected(); + public abstract String getId(); public abstract String getText(); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/TripLonglineSelectionTreeNode.java ===================================== @@ -44,7 +44,7 @@ public class TripLonglineSelectionTreeNode extends TripSelectionTreeNodeSupport< @Override public boolean isOpen() { - return Objects.equals(ObserveSwingApplicationContext.get().getNavigationEdit().getLongline().getTrip().getId(), getId()); + return Objects.equals(getNavigationEditModel().getLongline().getTrip().getId(), getId()); } @Override ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/TripSeineSelectionTreeNode.java ===================================== @@ -44,7 +44,7 @@ public class TripSeineSelectionTreeNode extends TripSelectionTreeNodeSupport<Tri @Override public boolean isOpen() { - return Objects.equals(ObserveSwingApplicationContext.get().getNavigationEdit().getSeine().getTrip().getId(), getId()); + return Objects.equals(getNavigationEditModel().getSeine().getTrip().getId(), getId()); } @Override ===================================== client-core/src/main/resources/icons/checkBox.png ===================================== Binary files /dev/null and b/client-core/src/main/resources/icons/checkBox.png differ ===================================== client-core/src/main/resources/icons/checkBoxIndeterminateSelected.png ===================================== Binary files /dev/null and b/client-core/src/main/resources/icons/checkBoxIndeterminateSelected.png differ ===================================== client-core/src/main/resources/icons/checkBoxSelected.png ===================================== Binary files /dev/null and b/client-core/src/main/resources/icons/checkBoxSelected.png differ ===================================== client-core/src/main/resources/observe-ui.properties ===================================== @@ -65,6 +65,11 @@ icon.navigation.data.ll.observation.ActivityLonglineObs-16=navigation/ird/route1 icon.navigation.data.ll.observation.SetLonglineObs-16=navigation/ird/set16.png icon.navigation.data.ll.observation.CatchLonglineObs-16=navigation/ird/floatingObject16.png icon.navigation.data.ll.observation.TdrObs-16=navigation/ird/floatingObject16.png + +icon.checkbox.empty=checkBox.png +icon.checkbox.partial=checkBoxIndeterminateSelected.png +icon.checkbox.selected=checkBoxSelected.png + # icones d'action sur les editeurs numeriques #icon.action.numbereditor-showpopup=action-numbereditor-showpopup.png #icon.action.numbereditor-reset=action-numbereditor-reset.png View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/718bcc1c7009f075bb40f32dd60… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/718bcc1c7009f075bb40f32dd60… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe :: Pom
by Tony CHEMIT 20 Feb '19

20 Feb '19

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 7cb1289f by 166231 at 2019-02-20T13:11:30Z Site checkin for project ObServe :: Pom - - - - - 5 changed files: - administration-web.html - architecture-logicielle.html - index.html - install-serverPG.html - install.html Changes: ===================================== administration-web.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190218" /> + <meta name="Date-Revision-yyyymmdd" content="20190220" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation de lapplication web</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a>»</li> <li class="active ">Installation de lapplication web</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2019-02-18</li> - <li id="projectVersion" class="pull-right">|Version: 7.0.4</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2019-02-20</li> + <li id="projectVersion" class="pull-right">|Version: 7.0.5</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -101,7 +101,7 @@ <pre class="source"> /var/local/observeweb/{contextPath} |-- databases.yml # configuration des bases de données |-- log - | `-- observeweb-7.0.4.log # logs de l'application + | `-- observeweb-7.0.5.log # logs de l'application |-- observeweb-log4j2.xml # configuration des logs |-- temp # répertoire temporaire `-- users.yml # configuration des utilisateurs ===================================== architecture-logicielle.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190218" /> + <meta name="Date-Revision-yyyymmdd" content="20190220" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Architecture logicielle dObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a>»</li> <li class="active ">Architecture logicielle dObServe</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2019-02-18</li> - <li id="projectVersion" class="pull-right">|Version: 7.0.4</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2019-02-20</li> + <li id="projectVersion" class="pull-right">|Version: 7.0.5</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== index.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190218" /> + <meta name="Date-Revision-yyyymmdd" content="20190220" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – ObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a>»</li> <li class="active ">ObServe</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2019-02-18</li> - <li id="projectVersion" class="pull-right">|Version: 7.0.4</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2019-02-20</li> + <li id="projectVersion" class="pull-right">|Version: 7.0.5</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== install-serverPG.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190218" /> + <meta name="Date-Revision-yyyymmdd" content="20190220" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation du serveur Obstuna</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a>»</li> <li class="active ">Installation du serveur Obstuna</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2019-02-18</li> - <li id="projectVersion" class="pull-right">|Version: 7.0.4</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2019-02-20</li> + <li id="projectVersion" class="pull-right">|Version: 7.0.5</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== install.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190218" /> + <meta name="Date-Revision-yyyymmdd" content="20190220" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation dObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a>»</li> <li class="active ">Installation dObServe</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2019-02-18</li> - <li id="projectVersion" class="pull-right">|Version: 7.0.4</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2019-02-20</li> + <li id="projectVersion" class="pull-right">|Version: 7.0.5</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7cb1289fbf7f0a258b8954a41f9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7cb1289fbf7f0a258b8954a41f9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Revert "[LL] Composition globale : non contrôle de la somme des proportions - Closes #1236"
by Tony CHEMIT 20 Feb '19

20 Feb '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 100ff1ea by tchemit at 2019-02-20T12:51:06Z Revert "[LL] Composition globale : non contrôle de la somme des proportions - Closes #1236" This reverts commit 4002d967 - - - - - 8 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/BaitsCompositionLogbookUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/BranchlinesCompositionLogbookUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/FloatlinesCompositionLogbookUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/HooksCompositionLogbookUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/BaitsCompositionObsUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/BranchlinesCompositionObsUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/FloatlinesCompositionObsUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/HooksCompositionObsUI.jaxx Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/BaitsCompositionLogbookUI.jaxx ===================================== @@ -58,7 +58,6 @@ beanClass='fr.ird.observe.dto.data.ll.logbook.SetLonglineLogbookGlobalCompositionDto' errorTableModel='{getErrorTableModel()}'> <field name="baitsComposition" component="editorPanel"/> - <field name="baitsCompositionProportionSum" component="proportionSum"/> </BeanValidator>  ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/BranchlinesCompositionLogbookUI.jaxx ===================================== @@ -57,7 +57,6 @@ beanClass='fr.ird.observe.dto.data.ll.logbook.SetLonglineLogbookGlobalCompositionDto' errorTableModel='{getErrorTableModel()}'> <field name="branchlinesComposition" component="editorPanel"/> - <field name="branchlinesCompositionProportionSum" component="proportionSum"/> </BeanValidator>  ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/FloatlinesCompositionLogbookUI.jaxx ===================================== @@ -57,7 +57,6 @@ beanClass='fr.ird.observe.dto.data.ll.logbook.SetLonglineLogbookGlobalCompositionDto' errorTableModel='{getErrorTableModel()}'> <field name="floatlinesComposition" component="editorPanel"/> - <field name="floatlinesCompositionProportionSum" component="proportionSum"/> </BeanValidator>  ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/HooksCompositionLogbookUI.jaxx ===================================== @@ -58,7 +58,6 @@ beanClass='fr.ird.observe.dto.data.ll.logbook.SetLonglineLogbookGlobalCompositionDto' errorTableModel='{getErrorTableModel()}'> <field name="hooksComposition" component="editorPanel"/> - <field name="hooksCompositionProportionSum" component="proportionSum"/> </BeanValidator>  ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/BaitsCompositionObsUI.jaxx ===================================== @@ -58,7 +58,6 @@ beanClass='fr.ird.observe.dto.data.ll.observation.SetLonglineObsGlobalCompositionDto' errorTableModel='{getErrorTableModel()}'> <field name="baitsComposition" component="editorPanel"/> - <field name="baitsCompositionProportionSum" component="proportionSum"/> </BeanValidator>  ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/BranchlinesCompositionObsUI.jaxx ===================================== @@ -57,7 +57,6 @@ beanClass='fr.ird.observe.dto.data.ll.observation.SetLonglineObsGlobalCompositionDto' errorTableModel='{getErrorTableModel()}'> <field name="branchlinesComposition" component="editorPanel"/> - <field name="branchlinesCompositionProportionSum" component="proportionSum"/> </BeanValidator>  ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/FloatlinesCompositionObsUI.jaxx ===================================== @@ -57,7 +57,6 @@ beanClass='fr.ird.observe.dto.data.ll.observation.SetLonglineObsGlobalCompositionDto' errorTableModel='{getErrorTableModel()}'> <field name="floatlinesComposition" component="editorPanel"/> - <field name="floatlinesCompositionProportionSum" component="proportionSum"/> </BeanValidator>  ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/HooksCompositionObsUI.jaxx ===================================== @@ -58,7 +58,6 @@ beanClass='fr.ird.observe.dto.data.ll.observation.SetLonglineObsGlobalCompositionDto' errorTableModel='{getErrorTableModel()}'> <field name="hooksComposition" component="editorPanel"/> - <field name="hooksCompositionProportionSum" component="proportionSum"/> </BeanValidator>  View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/100ff1ea016f5414e7005ac2f80… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/100ff1ea016f5414e7005ac2f80… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/7.0.5
by Tony CHEMIT 20 Feb '19

20 Feb '19

Tony CHEMIT deleted branch release/7.0.5 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v7.0.5
by Tony CHEMIT 20 Feb '19

20 Feb '19

Tony CHEMIT pushed new tag v7.0.5 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/v7.0.5 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][release/7.0.5] [jgitflow-maven-plugin]updating poms for branch'release/7.0.5' with non-snapshot versions[skip ci]
by Tony CHEMIT 20 Feb '19

20 Feb '19

Tony CHEMIT pushed to branch release/7.0.5 at ultreiaio / ird-observe Commits: 262eb4c7 by tchemit at 2019-02-20T12:31:47Z [jgitflow-maven-plugin]updating poms for branch'release/7.0.5' with non-snapshot versions[skip ci] - - - - - 16 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.5-SNAPSHOT</version> + <version>7.0.5</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.5-SNAPSHOT</version> + <version>7.0.5</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.5-SNAPSHOT</version> + <version>7.0.5</version> </parent> <artifactId>client-runner</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.5-SNAPSHOT</version> + <version>7.0.5</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.5-SNAPSHOT</version> + <version>7.0.5</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.5-SNAPSHOT</version> + <version>7.0.5</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.5-SNAPSHOT</version> + <version>7.0.5</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.5-SNAPSHOT</version> + <version>7.0.5</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.5-SNAPSHOT</version> + <version>7.0.5</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.5-SNAPSHOT</version> + <version>7.0.5</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.5-SNAPSHOT</version> + <version>7.0.5</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.5-SNAPSHOT</version> + <version>7.0.5</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.5-SNAPSHOT</version> + <version>7.0.5</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.5-SNAPSHOT</version> + <version>7.0.5</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.5-SNAPSHOT</version> + <version>7.0.5</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.5-SNAPSHOT</version> + <version>7.0.5</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/262eb4c7544dd062f58fd688bed… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/262eb4c7544dd062f58fd688bed… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master-7.x] 10 commits: [jgitflow-maven-plugin]updating poms for 7.0.5-SNAPSHOT development[skip ci]
by Tony CHEMIT 20 Feb '19

20 Feb '19

Tony CHEMIT pushed to branch master-7.x at ultreiaio / ird-observe Commits: 4aecbee1 by tchemit at 2019-02-18T10:02:12Z [jgitflow-maven-plugin]updating poms for 7.0.5-SNAPSHOT development[skip ci] - - - - - 0690ec80 by tchemit at 2019-02-18T10:09:04Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 2d250881 by tchemit at 2019-02-18T10:09:05Z [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - bbe2d82b by tchemit at 2019-02-18T10:09:05Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 35aae06f by tchemit at 2019-02-19T11:19:47Z [PS] Formulaire FOB : les contrôles de saisie ne sont pas appliqués - Closes #1234 - - - - - 46c0980f by tchemit at 2019-02-19T15:25:59Z [LL] Composition globale : non contrôle de la somme des proportions - Closes #1236 - - - - - f8d6ef63 by tchemit at 2019-02-19T16:31:43Z Equipement bateau, bug sur suppression de caractéristique - Closes #1232 - - - - - 803fa23f by tchemit at 2019-02-20T09:57:10Z [LL] Composition globale : non contrôle de la somme des proportions - Closes #1236 - - - - - 262eb4c7 by tchemit at 2019-02-20T12:31:47Z [jgitflow-maven-plugin]updating poms for branch'release/7.0.5' with non-snapshot versions[skip ci] - - - - - aee3a6b9 by tchemit at 2019-02-20T12:39:43Z [jgitflow-maven-plugin]merging 'release/7.0.5' into 'master-7.x' - - - - - 30 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesCompositionUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/FloatlinesCompositionUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/HooksCompositionUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesSeineUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/dcp/FloatingObjectPartsTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/dcp/FloatingObjectPartsTreeTable.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/dcp/FloatingObjectPartsTreeTableModel.java - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineGlobalCompositionDto-update-baitsComposition-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineGlobalCompositionDto-update-branchlinesComposition-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineGlobalCompositionDto-update-floatlinesComposition-error-validation.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f2b67ccc3c64e7c5955f8b032e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f2b67ccc3c64e7c5955f8b032e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/7.0.5' with non-snapshot versions[skip ci]
by Tony CHEMIT 20 Feb '19

20 Feb '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 262eb4c7 by tchemit at 2019-02-20T12:31:47Z [jgitflow-maven-plugin]updating poms for branch'release/7.0.5' with non-snapshot versions[skip ci] - - - - - aee3a6b9 by tchemit at 2019-02-20T12:39:43Z [jgitflow-maven-plugin]merging 'release/7.0.5' into 'master-7.x' - - - - - f2ea368e by tchemit at 2019-02-20T12:39:46Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 11b86658 by tchemit at 2019-02-20T12:39:46Z [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - b2978f38 by tchemit at 2019-02-20T12:39:47Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/8c069d7dbe4c9288b6ea22f5d7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/8c069d7dbe4c9288b6ea22f5d7… You're receiving this email because of your account on gitlab.com.

1 0