January 2016 - Tutti-commits - mailman.cloud.codelutin.com

branch feature/7929_editeur_de_zone updated (c009f80 -> 0f29ae8)
by codelutin.com scm 29 Jan '16

29 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/7929_editeur_de_zone in repository tutti. See http://git.codelutin.com/tutti.git from c009f80 ajout des listeners sur les strates et sous strates (refs #7929) new 00cd88d suprpession des sous strates d'une zone (refs #7929) new ede2fb2 ajout des icones + tri des noeuds dans les arbres (refs #7929) new 08c08a6 sauvegarde du protocol (refs #7929) new 0f29ae8 on pousse les zones dans le modele de protocole (peut etre faire l'inverse...) (refs #7929) The 4 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 0f29ae890ce61c4d136afcd6ad1091cf30cc4dfc Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Jan 29 17:35:38 2016 +0100 on pousse les zones dans le modele de protocole (peut etre faire l'inverse...) (refs #7929) commit 08c08a6124f05fd054c22bfaf8c38dcb359ac40e Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Jan 29 17:12:06 2016 +0100 sauvegarde du protocol (refs #7929) commit ede2fb2b8acf64ad94ad87819800cd4ebdd5b567 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Jan 29 14:49:39 2016 +0100 ajout des icones + tri des noeuds dans les arbres (refs #7929) commit 00cd88dd28c8eaee31674e1943eb332016214290 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Jan 29 11:34:43 2016 +0100 suprpession des sous strates d'une zone (refs #7929) Summary of changes: .../entities/protocol/TuttiProtocols.java | 3 + .../service/ProtocolPersistenceServiceImpl.java | 47 ++++++++++ .../content/protocol/EditProtocolUIHandler.java | 10 ++- .../content/protocol/EditProtocolUIModel.java | 11 ++- .../protocol/actions/SaveProtocolAction.java | 12 ++- .../swing/content/protocol/zones/ZoneEditorUI.jaxx | 6 ++ .../swing/content/protocol/zones/ZoneEditorUI.jcss | 30 ++++++- .../protocol/zones/ZoneEditorUIHandler.java | 78 +++++++++++----- .../content/protocol/zones/ZoneEditorUIModel.java | 98 ++++++++++----------- .../protocol/zones/actions/AddStratasAction.java | 2 +- .../CollapseAvailableStratasTreeAction.java | 20 +++++ .../zones/actions/CollapseZonesTreeAction.java | 20 +++++ .../actions/ExpandAvailableStratasTreeAction.java | 21 +++++ .../zones/actions/ExpandZonesTreeAction.java | 21 +++++ .../zones/actions/RemoveStratasAction.java | 17 ++-- .../protocol/zones/models/StrataUIModel.java | 33 +++++++ .../protocol/zones/models/SubStrataUIModel.java | 14 +++ .../content/protocol/zones/models/ZoneUIModel.java | 50 +++++++++-- .../content/protocol/zones/tree/StrataNode.java | 5 +- .../protocol/zones/tree/StratasTreeModel.java | 44 ++------- .../content/protocol/zones/tree/SubStrataNode.java | 4 +- .../protocol/zones/tree/ZoneEditorNode.java | 33 +++++++ .../zones/tree/ZoneEditorTreeCellRenderer.java | 37 ++++---- .../content/protocol/zones/tree/ZoneNode.java | 5 +- .../protocol/zones/tree/ZonesTreeModel.java | 21 ++++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 3 - .../src/main/resources/icons/action-left.png | Bin 0 -> 345 bytes .../src/main/resources/icons/action-right.png | Bin 0 -> 349 bytes 29 files changed, 482 insertions(+), 165 deletions(-) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/CollapseAvailableStratasTreeAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/CollapseZonesTreeAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/ExpandAvailableStratasTreeAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/ExpandZonesTreeAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorNode.java create mode 100644 tutti-ui-swing/src/main/resources/icons/action-left.png create mode 100644 tutti-ui-swing/src/main/resources/icons/action-right.png -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch feature/7929_editeur_de_zone updated (f259b29 -> c009f80)
by codelutin.com scm 28 Jan '16

28 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/7929_editeur_de_zone in repository tutti. See http://git.codelutin.com/tutti.git from f259b29 creation de zones + déplacement des noeuds (refs #7929) new 8f112f8 création des modeles de strates et sous strates (refs #7929) new c009f80 ajout des listeners sur les strates et sous strates (refs #7929) The 2 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 c009f80feee094d357eee660e214f0fb57aed602 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Jan 28 19:22:03 2016 +0100 ajout des listeners sur les strates et sous strates (refs #7929) commit 8f112f8d85b2647687b21892d79071535c7f4caf Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Jan 28 19:21:56 2016 +0100 création des modeles de strates et sous strates (refs #7929) Summary of changes: .../swing/content/protocol/zones/ZoneEditorUI.jaxx | 1 + .../protocol/zones/ZoneEditorUIHandler.java | 136 +++++++++++--- .../content/protocol/zones/ZoneEditorUIModel.java | 165 +++++++++-------- .../content/protocol/zones/ZonesTreeModel.java | 98 ---------- .../protocol/zones/actions/AddStratasAction.java | 51 ++++-- .../protocol/zones/actions/CreateZoneAction.java | 10 +- .../zones/actions/RemoveStratasAction.java | 58 +++++- .../protocol/zones/models/StrataUIModel.java | 192 ++++++++++++++++++++ .../protocol/zones/models/SubStrataUIModel.java | 108 +++++++++++ .../protocol/zones/{ => models}/ZoneUIModel.java | 44 ++++- .../content/protocol/zones/nodes/StrataNode.java | 20 -- .../protocol/zones/nodes/SubStrataNode.java | 20 -- .../content/protocol/zones/tree/StrataNode.java | 20 ++ .../zones/{ => tree}/StratasTreeModel.java | 75 +++++++- .../content/protocol/zones/tree/SubStrataNode.java | 20 ++ .../{ => tree}/ZoneEditorTreeCellRenderer.java | 16 +- .../protocol/zones/{nodes => tree}/ZoneNode.java | 4 +- .../protocol/zones/tree/ZonesTreeModel.java | 202 +++++++++++++++++++++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- 19 files changed, 955 insertions(+), 287 deletions(-) delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZonesTreeModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/StrataUIModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/SubStrataUIModel.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/{ => models}/ZoneUIModel.java (69%) delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/nodes/StrataNode.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/nodes/SubStrataNode.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/StrataNode.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/{ => tree}/StratasTreeModel.java (57%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/SubStrataNode.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/{ => tree}/ZoneEditorTreeCellRenderer.java (70%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/{nodes => tree}/ZoneNode.java (69%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZonesTreeModel.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

01/02: création des modeles de strates et sous strates (refs #7929)
by codelutin.com scm 28 Jan '16

28 Jan '16

This is an automated email from the git hooks/post-receive script. New commit to branch feature/7929_editeur_de_zone in repository tutti. See http://git.codelutin.com/tutti.git commit 8f112f8d85b2647687b21892d79071535c7f4caf Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Jan 28 19:21:56 2016 +0100 création des modeles de strates et sous strates (refs #7929) --- .../content/protocol/zones/ZonesTreeModel.java | 98 ---------- .../protocol/zones/models/StrataUIModel.java | 192 ++++++++++++++++++++ .../protocol/zones/models/SubStrataUIModel.java | 108 +++++++++++ .../protocol/zones/{ => models}/ZoneUIModel.java | 44 ++++- .../content/protocol/zones/nodes/StrataNode.java | 20 -- .../protocol/zones/nodes/SubStrataNode.java | 20 -- .../content/protocol/zones/tree/StrataNode.java | 20 ++ .../zones/{ => tree}/StratasTreeModel.java | 75 +++++++- .../content/protocol/zones/tree/SubStrataNode.java | 20 ++ .../{ => tree}/ZoneEditorTreeCellRenderer.java | 16 +- .../protocol/zones/{nodes => tree}/ZoneNode.java | 4 +- .../protocol/zones/tree/ZonesTreeModel.java | 202 +++++++++++++++++++++ 12 files changed, 656 insertions(+), 163 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZonesTreeModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZonesTreeModel.java deleted file mode 100644 index b2d3e19..0000000 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZonesTreeModel.java +++ /dev/null @@ -1,98 +0,0 @@ -package fr.ifremer.tutti.ui.swing.content.protocol.zones; - -import com.google.common.base.Preconditions; -import fr.ifremer.tutti.persistence.entities.protocol.Strata; -import fr.ifremer.tutti.ui.swing.content.protocol.zones.nodes.StrataNode; -import fr.ifremer.tutti.ui.swing.content.protocol.zones.nodes.ZoneNode; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import javax.swing.tree.DefaultMutableTreeNode; -import javax.swing.tree.DefaultTreeModel; -import java.util.Collection; -import java.util.Enumeration; -import java.util.HashSet; - -/** - * @author Kevin Morin (Code Lutin) - * @since 4.5 - */ -public class ZonesTreeModel extends DefaultTreeModel { - - /** Logger. */ - private static final Log log = LogFactory.getLog(ZonesTreeModel.class); - - public ZonesTreeModel() { - super(new DefaultMutableTreeNode()); - } - - public void removeZones(Collection<ZoneUIModel> zonesToRemove) { - - DefaultMutableTreeNode root = (DefaultMutableTreeNode) getRoot(); - - Enumeration rootChildren = root.children(); - Collection<DefaultMutableTreeNode> nodesToRemove = new HashSet<>(); - - while (rootChildren.hasMoreElements()) { - - ZoneNode zoneNode = (ZoneNode) rootChildren.nextElement(); - - if (zonesToRemove.contains(zoneNode.getZone())) { - nodesToRemove.add(zoneNode); - } - } - - nodesToRemove.forEach(zoneNode ->removeNodeFromParent(zoneNode)); - } - - public void addZones(Collection<ZoneUIModel> zonesToAdd) { - - DefaultMutableTreeNode root = (DefaultMutableTreeNode) getRoot(); - - zonesToAdd.forEach(zone -> { - - ZoneNode zoneNode = new ZoneNode(zone); - insertNodeInto(zoneNode, root, root.getChildCount()); - - }); - } - - public void setStratas(ZoneUIModel zone, Collection<Strata> stratas) { - - DefaultMutableTreeNode root = (DefaultMutableTreeNode) getRoot(); - - Enumeration rootChildren = root.children(); - - ZoneNode zoneNode = null; - - while (zoneNode == null && rootChildren.hasMoreElements()) { - ZoneNode nextNode = (ZoneNode) rootChildren.nextElement(); - if (zone.equals(nextNode.getZone())) { - zoneNode = nextNode; - } - } - - Preconditions.checkNotNull(zoneNode); - - for (Strata strata : stratas) { - - StrataNode strataNode = new StrataNode(strata); - - if (log.isInfoEnabled()) { - log.info("add strata " + strata.getLocation().getLabel()); - } - - insertNodeInto(strataNode, zoneNode, zoneNode.getChildCount()); - -// newAvailableStratas.get(strata).forEach(substrata -> { -// -// if (substrata != null) { -// SubStrataNode subStrataNode = new SubStrataNode(substrata); -// insertNodeInto(subStrataNode, strataNode, strataNode.getChildCount()); -// } -// -// }); - - } - } -} diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/StrataUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/StrataUIModel.java new file mode 100644 index 0000000..e7a09f8 --- /dev/null +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/StrataUIModel.java @@ -0,0 +1,192 @@ +package fr.ifremer.tutti.ui.swing.content.protocol.zones.models; + +import fr.ifremer.tutti.persistence.entities.protocol.Strata; +import fr.ifremer.tutti.persistence.entities.protocol.Stratas; +import fr.ifremer.tutti.persistence.entities.protocol.SubStrata; +import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation; +import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; +import org.nuiton.util.beans.Binder; +import org.nuiton.util.beans.BinderFactory; + +import java.util.Collection; +import java.util.HashSet; +import java.util.Objects; + +/** + * @author Kevin Morin (Code Lutin) + * @since 4.5 + */ +public class StrataUIModel extends AbstractTuttiBeanUIModel<Strata, StrataUIModel> implements Strata { + + public static final String PROPERTY_ZONE = "zone"; + + protected final Strata delegate = Stratas.newStrata(); + + protected ZoneUIModel zone; + + protected static Binder<StrataUIModel, Strata> toBeanBinder = BinderFactory.newBinder(StrataUIModel.class, Strata.class); + + protected static Binder<Strata, StrataUIModel> fromBeanBinder = BinderFactory.newBinder(Strata.class, StrataUIModel.class); + + public StrataUIModel() { + super(fromBeanBinder, toBeanBinder); + } + + public StrataUIModel(TuttiLocation location) { + this(); + setLocation(location); + } + + @Override + public void addAllSubstrata(Collection<SubStrata> substrata) { + Object oldValue = new HashSet<>(getSubstrata()); + delegate.addAllSubstrata(substrata); + firePropertyChanged(PROPERTY_SUBSTRATA, oldValue, getSubstrata()); + } + + @Override + public void addSubstrata(SubStrata substrata) { + Object oldValue = new HashSet<>(getSubstrata()); + delegate.addSubstrata(substrata); + firePropertyChanged(PROPERTY_SUBSTRATA, oldValue, getSubstrata()); + } + + @Override + public boolean containsAllSubstrata(Collection<SubStrata> substrata) { + return delegate.containsAllSubstrata(substrata); + } + + @Override + public boolean containsSubstrata(SubStrata substrata) { + return delegate.containsSubstrata(substrata); + } + + @Override + public TuttiLocation getLocation() { + return delegate.getLocation(); + } + + @Override + public Collection<SubStrata> getSubstrata() { + return delegate.getSubstrata(); + } + + @Override + public SubStrata getSubstrata(int index) { + return delegate.getSubstrata(index); + } + + @Override + public boolean isSubstrataEmpty() { + return delegate.isSubstrataEmpty(); + } + + @Override + public boolean removeAllSubstrata(Collection<SubStrata> substrata) { + Object oldValue = new HashSet<>(getSubstrata()); + boolean result = delegate.removeAllSubstrata(substrata); + firePropertyChanged(PROPERTY_SUBSTRATA, oldValue, getSubstrata()); + return result; + } + + @Override + public boolean removeSubstrata(SubStrata substrata) { + Object oldValue = new HashSet<>(getSubstrata()); + boolean result = delegate.removeSubstrata(substrata); + firePropertyChanged(PROPERTY_SUBSTRATA, oldValue, getSubstrata()); + return result; + } + + @Override + public void setLocation(TuttiLocation location) { + Object oldValue = getLocation(); + delegate.setLocation(location); + firePropertyChanged(PROPERTY_LOCATION, oldValue, getLocation()); + } + + @Override + public void setSubstrata(Collection<SubStrata> substrata) { + Object oldValue = new HashSet<>(getSubstrata()); + delegate.setSubstrata(substrata); + firePropertyChanged(PROPERTY_SUBSTRATA, oldValue, getSubstrata()); + } + + @Override + public int sizeSubstrata() { + return delegate.sizeSubstrata(); + } + + @Override + public String getId() { + return delegate.getId(); + } + + @Override + public Integer getIdAsInt() { + return delegate.getIdAsInt(); + } + + @Override + public void setId(Integer id) { + Object oldValue = getId(); + delegate.setId(id); + firePropertyChanged(PROPERTY_ID, oldValue, getId()); + } + + @Override + public void setId(String id) { + Object oldValue = getId(); + delegate.setId(id); + firePropertyChanged(PROPERTY_ID, oldValue, getId()); + } + + public String getLabel() { + return getLocation() == null ? null : getLocation().getLabel(); + } + + public ZoneUIModel getZone() { + return zone; + } + + public void setZone(ZoneUIModel zone) { + Object oldValue = getZone(); + this.zone = zone; + firePropertyChange(PROPERTY_ZONE, oldValue, zone); + } + + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; + } + if (obj == this) { + return true; + } + if (!StrataUIModel.class.equals(obj.getClass())) { + return false; + } + if (getId() != null) { + return getId().equals(((StrataUIModel) obj).getId()); + } + if (getLocation() != null) { + return getLocation().equals(((StrataUIModel) obj).getLocation()); + } + return false; + } + + @Override + public int hashCode() { + return Objects.hash(getId(), getLocation()); + } + + @Override + public String toString() { + return getLabel(); + } + + @Override + protected Strata newEntity() { + return Stratas.newStrata(); + } + +} diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/SubStrataUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/SubStrataUIModel.java new file mode 100644 index 0000000..a57aa4c --- /dev/null +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/SubStrataUIModel.java @@ -0,0 +1,108 @@ +package fr.ifremer.tutti.ui.swing.content.protocol.zones.models; + +import fr.ifremer.tutti.persistence.entities.protocol.SubStrata; +import fr.ifremer.tutti.persistence.entities.protocol.SubStratas; +import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation; +import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; +import org.nuiton.util.beans.Binder; +import org.nuiton.util.beans.BinderFactory; + +import java.util.Objects; + +/** + * @author Kevin Morin (Code Lutin) + * @since 4.5 + */ +public class SubStrataUIModel extends AbstractTuttiBeanUIModel<SubStrata, SubStrataUIModel> implements SubStrata { + + protected final SubStrata delegate = SubStratas.newSubStrata(); + + protected static Binder<SubStrataUIModel, SubStrata> toBeanBinder = BinderFactory.newBinder(SubStrataUIModel.class, SubStrata.class); + + protected static Binder<SubStrata, SubStrataUIModel> fromBeanBinder = BinderFactory.newBinder(SubStrata.class, SubStrataUIModel.class); + + public SubStrataUIModel() { + super(fromBeanBinder, toBeanBinder); + } + + public SubStrataUIModel(TuttiLocation location) { + this(); + setLocation(location); + } + + @Override + public TuttiLocation getLocation() { + return delegate.getLocation(); + } + + @Override + public void setLocation(TuttiLocation location) { + Object oldValue = getLocation(); + delegate.setLocation(location); + firePropertyChanged(PROPERTY_LOCATION, oldValue, getLocation()); + } + + @Override + public String getId() { + return delegate.getId(); + } + + @Override + public void setId(Integer id) { + Object oldValue = getId(); + delegate.setId(id); + firePropertyChanged(PROPERTY_ID, oldValue, getId()); + } + + @Override + public void setId(String id) { + Object oldValue = getId(); + delegate.setId(id); + firePropertyChanged(PROPERTY_ID, oldValue, getId()); + } + + @Override + public Integer getIdAsInt() { + return delegate.getIdAsInt(); + } + + public String getLabel() { + return getLocation() == null ? null : getLocation().getLabel(); + } + + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; + } + if (obj == this) { + return true; + } + if (!StrataUIModel.class.equals(obj.getClass())) { + return false; + } + if (getId() != null) { + return getId().equals(((StrataUIModel) obj).getId()); + } + if (getLocation() != null) { + return getLocation().equals(((StrataUIModel) obj).getLocation()); + } + return false; + } + + @Override + public int hashCode() { + return Objects.hash(getId(), getLocation()); + } + + @Override + public String toString() { + return getLabel(); + } + + @Override + protected SubStrata newEntity() { + return SubStratas.newSubStrata(); + } + +} diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/ZoneUIModel.java similarity index 69% rename from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneUIModel.java rename to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/ZoneUIModel.java index e01af7e..6ff1188 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/models/ZoneUIModel.java @@ -1,4 +1,4 @@ -package fr.ifremer.tutti.ui.swing.content.protocol.zones; +package fr.ifremer.tutti.ui.swing.content.protocol.zones.models; import fr.ifremer.tutti.persistence.entities.protocol.Strata; import fr.ifremer.tutti.persistence.entities.protocol.Zone; @@ -30,14 +30,16 @@ public class ZoneUIModel extends AbstractTuttiBeanUIModel<Zone, ZoneUIModel> imp public void addAllStrata(Collection<Strata> strata) { Object oldValue = new HashSet<>(getStrata()); delegate.addAllStrata(strata); - firePropertyChanged(PROPERTY_STRATA, oldValue, strata); + updateStrataZone(strata, this); + firePropertyChanged(PROPERTY_STRATA, oldValue, getStrata()); } @Override public void addStrata(Strata strata) { Object oldValue = new HashSet<>(getStrata()); delegate.addStrata(strata); - firePropertyChanged(PROPERTY_STRATA, oldValue, strata); + updateStrataZone(strata, this); + firePropertyChanged(PROPERTY_STRATA, oldValue, getStrata()); } @Override @@ -65,6 +67,14 @@ public class ZoneUIModel extends AbstractTuttiBeanUIModel<Zone, ZoneUIModel> imp return delegate.getStrata(index); } + /** + * @param strata + * @return the strata from the stratas of the zone which equals the strata in parameters + */ + public Strata getStrata(Strata strata) { + return getStrata().stream().filter(s -> s != null && s.equals(strata)).findFirst().orElse(null); + } + @Override public boolean isStrataEmpty() { return delegate.isStrataEmpty(); @@ -74,7 +84,8 @@ public class ZoneUIModel extends AbstractTuttiBeanUIModel<Zone, ZoneUIModel> imp public boolean removeAllStrata(Collection<Strata> strata) { Object oldValue = new HashSet<>(getStrata()); boolean result = delegate.removeAllStrata(strata); - firePropertyChanged(PROPERTY_STRATA, oldValue, strata); + updateStrataZone(strata, null); + firePropertyChanged(PROPERTY_STRATA, oldValue, getStrata()); return result; } @@ -82,7 +93,8 @@ public class ZoneUIModel extends AbstractTuttiBeanUIModel<Zone, ZoneUIModel> imp public boolean removeStrata(Strata strata) { Object oldValue = new HashSet<>(getStrata()); boolean result = delegate.removeStrata(strata); - firePropertyChanged(PROPERTY_STRATA, oldValue, strata); + updateStrataZone(strata, null); + firePropertyChanged(PROPERTY_STRATA, oldValue, getStrata()); return result; } @@ -96,8 +108,10 @@ public class ZoneUIModel extends AbstractTuttiBeanUIModel<Zone, ZoneUIModel> imp @Override public void setStrata(Collection<Strata> strata) { Object oldValue = new HashSet<>(getStrata()); + updateStrataZone(getStrata(), null); delegate.setStrata(strata); - firePropertyChanged(PROPERTY_STRATA, oldValue, strata); + updateStrataZone(strata, this); + firePropertyChanged(PROPERTY_STRATA, oldValue, getStrata()); } @Override @@ -130,7 +144,25 @@ public class ZoneUIModel extends AbstractTuttiBeanUIModel<Zone, ZoneUIModel> imp } @Override + public String toString() { + return getLabel(); + } + + @Override protected Zone newEntity() { return Zones.newZone(); } + + protected void updateStrataZone(Collection<Strata> stratas, ZoneUIModel zone) { + stratas.stream() + .filter(strata -> strata instanceof StrataUIModel) + .forEach(strata -> ((StrataUIModel) strata).setZone(zone)); + } + + protected void updateStrataZone(Strata strata, ZoneUIModel zone) { + if (strata instanceof StrataUIModel) { + ((StrataUIModel) strata).setZone(zone); + } + } + } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/nodes/StrataNode.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/nodes/StrataNode.java deleted file mode 100644 index 87255bc..0000000 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/nodes/StrataNode.java +++ /dev/null @@ -1,20 +0,0 @@ -package fr.ifremer.tutti.ui.swing.content.protocol.zones.nodes; - -import fr.ifremer.tutti.persistence.entities.protocol.Strata; - -import javax.swing.tree.DefaultMutableTreeNode; - -/** - * @author Kevin Morin (Code Lutin) - * @since 4.5 - */ -public class StrataNode extends DefaultMutableTreeNode { - - public StrataNode(Strata strata) { - super(strata, true); - } - - public Strata getStrata() { - return (Strata) userObject; - } -} diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/nodes/SubStrataNode.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/nodes/SubStrataNode.java deleted file mode 100644 index 0cc705d..0000000 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/nodes/SubStrataNode.java +++ /dev/null @@ -1,20 +0,0 @@ -package fr.ifremer.tutti.ui.swing.content.protocol.zones.nodes; - -import fr.ifremer.tutti.persistence.entities.protocol.SubStrata; - -import javax.swing.tree.DefaultMutableTreeNode; - -/** - * @author Kevin Morin (Code Lutin) - * @since 4.5 - */ -public class SubStrataNode extends DefaultMutableTreeNode { - - public SubStrataNode(SubStrata substrata) { - super(substrata, false); - } - - public SubStrata getSubstrata() { - return (SubStrata) userObject; - } -} diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/StrataNode.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/StrataNode.java new file mode 100644 index 0000000..c4a4f03 --- /dev/null +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/StrataNode.java @@ -0,0 +1,20 @@ +package fr.ifremer.tutti.ui.swing.content.protocol.zones.tree; + +import fr.ifremer.tutti.ui.swing.content.protocol.zones.models.StrataUIModel; + +import javax.swing.tree.DefaultMutableTreeNode; + +/** + * @author Kevin Morin (Code Lutin) + * @since 4.5 + */ +public class StrataNode extends DefaultMutableTreeNode { + + public StrataNode(StrataUIModel strata) { + super(strata, true); + } + + public StrataUIModel getStrata() { + return (StrataUIModel) userObject; + } +} diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/StratasTreeModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/StratasTreeModel.java similarity index 57% rename from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/StratasTreeModel.java rename to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/StratasTreeModel.java index 4a17b0f..b75dd47 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/StratasTreeModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/StratasTreeModel.java @@ -1,9 +1,9 @@ -package fr.ifremer.tutti.ui.swing.content.protocol.zones; +package fr.ifremer.tutti.ui.swing.content.protocol.zones.tree; -import fr.ifremer.tutti.persistence.entities.protocol.Strata; +import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.protocol.SubStrata; -import fr.ifremer.tutti.ui.swing.content.protocol.zones.nodes.StrataNode; -import fr.ifremer.tutti.ui.swing.content.protocol.zones.nodes.SubStrataNode; +import fr.ifremer.tutti.ui.swing.content.protocol.zones.models.StrataUIModel; +import fr.ifremer.tutti.ui.swing.content.protocol.zones.models.SubStrataUIModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -26,7 +26,7 @@ public class StratasTreeModel extends DefaultTreeModel { super(new DefaultMutableTreeNode()); } - public void removeStratas(Collection<Strata> stratasToRemove) { + public void removeStratas(Collection<StrataUIModel> stratasToRemove) { DefaultMutableTreeNode root = (DefaultMutableTreeNode) getRoot(); @@ -66,7 +66,7 @@ public class StratasTreeModel extends DefaultTreeModel { // // } - public void addStratas(Collection<Strata> stratasToAdd) { + public void addStratas(Collection<StrataUIModel> stratasToAdd) { DefaultMutableTreeNode root = (DefaultMutableTreeNode) getRoot(); @@ -78,7 +78,7 @@ public class StratasTreeModel extends DefaultTreeModel { strata.getSubstrata().forEach(substrata -> { if (substrata != null) { - SubStrataNode subStrataNode = new SubStrataNode(substrata); + SubStrataNode subStrataNode = new SubStrataNode((SubStrataUIModel) substrata); insertNodeInto(subStrataNode, strataNode, strataNode.getChildCount()); } @@ -88,14 +88,14 @@ public class StratasTreeModel extends DefaultTreeModel { } - public void addSubStratas(Collection<SubStrata> subStratas, Strata strata) { + public void addSubStratas(Collection<SubStrata> subStratas, StrataUIModel strata) { StrataNode strataNode = findStrataNode(strata); subStratas.forEach(substrata -> { if (substrata != null) { - SubStrataNode subStrataNode = new SubStrataNode(substrata); + SubStrataNode subStrataNode = new SubStrataNode((SubStrataUIModel) substrata); insertNodeInto(subStrataNode, strataNode, strataNode.getChildCount()); } @@ -103,7 +103,46 @@ public class StratasTreeModel extends DefaultTreeModel { } - protected StrataNode findStrataNode(Strata strata) { + public void updateSubStratas(StrataUIModel strata, + Collection<SubStrataUIModel> subStratasToAdd, + Collection<SubStrataUIModel> subStratasToRemove) { + + StrataNode strataNode = findStrataNode(strata); + updateSubStratas(strataNode, subStratasToAdd, subStratasToRemove); + + } + + public void updateSubStratas(StrataNode strataNode, + Collection<SubStrataUIModel> subStratasToAdd, + Collection<SubStrataUIModel> subStratasToRemove) { + + Preconditions.checkNotNull(strataNode); + + for (SubStrataUIModel subStrata : subStratasToRemove) { + + SubStrataNode subStrataNode = findSubStrataNode(subStrata, strataNode); + + if (log.isInfoEnabled()) { + log.info("remove subStrata " + subStrata.getLabel()); + } + + removeNodeFromParent(subStrataNode); + } + + for (SubStrataUIModel subStrata : subStratasToAdd) { + + SubStrataNode subStrataNode = new SubStrataNode(subStrata); + + if (log.isInfoEnabled()) { + log.info("add strata " + subStrata.getLabel()); + } + + insertNodeInto(subStrataNode, strataNode, strataNode.getChildCount()); + + } + } + + protected StrataNode findStrataNode(StrataUIModel strata) { DefaultMutableTreeNode root = (DefaultMutableTreeNode) getRoot(); @@ -120,4 +159,20 @@ public class StratasTreeModel extends DefaultTreeModel { return strataNode; } + + protected SubStrataNode findSubStrataNode(SubStrataUIModel subStrata, StrataNode strataNode) { + + Enumeration strataChildren = strataNode.children(); + + SubStrataNode subStrataNode = null; + + while (subStrataNode == null && strataChildren.hasMoreElements()) { + SubStrataNode nextNode = (SubStrataNode) strataChildren.nextElement(); + if (subStrata.equals(nextNode.getSubstrata())) { + subStrataNode = nextNode; + } + } + + return subStrataNode; + } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/SubStrataNode.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/SubStrataNode.java new file mode 100644 index 0000000..0ce5a2f --- /dev/null +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/SubStrataNode.java @@ -0,0 +1,20 @@ +package fr.ifremer.tutti.ui.swing.content.protocol.zones.tree; + +import fr.ifremer.tutti.ui.swing.content.protocol.zones.models.SubStrataUIModel; + +import javax.swing.tree.DefaultMutableTreeNode; + +/** + * @author Kevin Morin (Code Lutin) + * @since 4.5 + */ +public class SubStrataNode extends DefaultMutableTreeNode { + + public SubStrataNode(SubStrataUIModel substrata) { + super(substrata, false); + } + + public SubStrataUIModel getSubstrata() { + return (SubStrataUIModel) userObject; + } +} diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneEditorTreeCellRenderer.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorTreeCellRenderer.java similarity index 70% rename from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneEditorTreeCellRenderer.java rename to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorTreeCellRenderer.java index a319e9e..97aad64 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneEditorTreeCellRenderer.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorTreeCellRenderer.java @@ -1,11 +1,10 @@ -package fr.ifremer.tutti.ui.swing.content.protocol.zones; +package fr.ifremer.tutti.ui.swing.content.protocol.zones.tree; -import fr.ifremer.tutti.persistence.entities.protocol.Strata; import fr.ifremer.tutti.persistence.entities.protocol.SubStrata; import fr.ifremer.tutti.persistence.entities.protocol.Zone; -import fr.ifremer.tutti.ui.swing.content.protocol.zones.nodes.StrataNode; -import fr.ifremer.tutti.ui.swing.content.protocol.zones.nodes.SubStrataNode; -import fr.ifremer.tutti.ui.swing.content.protocol.zones.nodes.ZoneNode; +import fr.ifremer.tutti.ui.swing.content.protocol.zones.models.StrataUIModel; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import javax.swing.JTree; import javax.swing.tree.DefaultTreeCellRenderer; @@ -17,6 +16,9 @@ import java.awt.Component; */ public class ZoneEditorTreeCellRenderer extends DefaultTreeCellRenderer { + /** Logger. */ + private static final Log log = LogFactory.getLog(ZoneEditorTreeCellRenderer.class); + @Override public Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) { @@ -25,8 +27,8 @@ public class ZoneEditorTreeCellRenderer extends DefaultTreeCellRenderer { String text = ""; if (value instanceof StrataNode) { - Strata strata = ((StrataNode) value).getStrata(); - text = strata.getLocation().getLabel(); + StrataUIModel strata = ((StrataNode) value).getStrata(); + text = strata.getLabel(); } else if (value instanceof SubStrataNode) { SubStrata substrata = ((SubStrataNode) value).getSubstrata(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/nodes/ZoneNode.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneNode.java similarity index 69% rename from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/nodes/ZoneNode.java rename to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneNode.java index 8406978..924fa07 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/nodes/ZoneNode.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneNode.java @@ -1,6 +1,6 @@ -package fr.ifremer.tutti.ui.swing.content.protocol.zones.nodes; +package fr.ifremer.tutti.ui.swing.content.protocol.zones.tree; -import fr.ifremer.tutti.ui.swing.content.protocol.zones.ZoneUIModel; +import fr.ifremer.tutti.ui.swing.content.protocol.zones.models.ZoneUIModel; import javax.swing.tree.DefaultMutableTreeNode; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZonesTreeModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZonesTreeModel.java new file mode 100644 index 0000000..3ee80fe --- /dev/null +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZonesTreeModel.java @@ -0,0 +1,202 @@ +package fr.ifremer.tutti.ui.swing.content.protocol.zones.tree; + +import com.google.common.base.Preconditions; +import fr.ifremer.tutti.ui.swing.content.protocol.zones.models.StrataUIModel; +import fr.ifremer.tutti.ui.swing.content.protocol.zones.models.SubStrataUIModel; +import fr.ifremer.tutti.ui.swing.content.protocol.zones.models.ZoneUIModel; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.DefaultTreeModel; +import java.util.Collection; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashSet; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * @author Kevin Morin (Code Lutin) + * @since 4.5 + */ +public class ZonesTreeModel extends DefaultTreeModel { + + /** Logger. */ + private static final Log log = LogFactory.getLog(ZonesTreeModel.class); + + public ZonesTreeModel() { + super(new DefaultMutableTreeNode()); + } + + public void removeZones(Collection<ZoneUIModel> zonesToRemove) { + + DefaultMutableTreeNode root = (DefaultMutableTreeNode) getRoot(); + + Enumeration rootChildren = root.children(); + Collection<DefaultMutableTreeNode> nodesToRemove = new HashSet<>(); + + while (rootChildren.hasMoreElements()) { + + ZoneNode zoneNode = (ZoneNode) rootChildren.nextElement(); + + if (zonesToRemove.contains(zoneNode.getZone())) { + nodesToRemove.add(zoneNode); + } + } + + nodesToRemove.forEach(zoneNode ->removeNodeFromParent(zoneNode)); + } + + public void addZones(Collection<ZoneUIModel> zonesToAdd) { + + DefaultMutableTreeNode root = (DefaultMutableTreeNode) getRoot(); + + zonesToAdd.forEach(zone -> { + + ZoneNode zoneNode = new ZoneNode(zone); + insertNodeInto(zoneNode, root, root.getChildCount()); + + }); + } + + public void updateStratas(ZoneUIModel zone, + Collection<StrataUIModel> stratasToAdd, + Collection<StrataUIModel> stratasToRemove) { + + ZoneNode zoneNode = findZoneNode(zone); + updateStratas(zoneNode, stratasToAdd, stratasToRemove); + } + + public void updateStratas(ZoneNode zoneNode, + Collection<StrataUIModel> stratasToAdd, + Collection<StrataUIModel> stratasToRemove) { + + Preconditions.checkNotNull(zoneNode); + + for (StrataUIModel strata : stratasToRemove) { + + StrataNode strataNode = findStrataNode(strata, zoneNode); + + if (log.isInfoEnabled()) { + log.info("remove strata " + strata.getLabel()); + } + + removeNodeFromParent(strataNode); + } + + for (StrataUIModel strata : stratasToAdd) { + + StrataNode strataNode = new StrataNode(strata); + + if (log.isInfoEnabled()) { + log.info("add strata " + strata.getLabel()); + } + + insertNodeInto(strataNode, zoneNode, zoneNode.getChildCount()); + + Set<SubStrataUIModel> subStratasToAdd = strata.getSubstrata() + .stream() + .map(subStrata -> (SubStrataUIModel) subStrata) + .collect(Collectors.toSet()); + + updateSubStratas(strataNode, subStratasToAdd, Collections.emptySet()); + } + } + + public void updateSubStratas(StrataUIModel strata, + Collection<SubStrataUIModel> subStratasToAdd, + Collection<SubStrataUIModel> subStratasToRemove) { + + StrataNode strataNode = findStrataNode(strata, strata.getZone()); + updateSubStratas(strataNode, subStratasToAdd, subStratasToRemove); + + } + + public void updateSubStratas(StrataNode strataNode, + Collection<SubStrataUIModel> subStratasToAdd, + Collection<SubStrataUIModel> subStratasToRemove) { + + Preconditions.checkNotNull(strataNode); + + for (SubStrataUIModel subStrata : subStratasToRemove) { + + SubStrataNode subStrataNode = findSubStrataNode(subStrata, strataNode); + + if (log.isInfoEnabled()) { + log.info("remove subStrata " + subStrata.getLabel()); + } + + removeNodeFromParent(subStrataNode); + } + + for (SubStrataUIModel subStrata : subStratasToAdd) { + + SubStrataNode subStrataNode = new SubStrataNode(subStrata); + + if (log.isInfoEnabled()) { + log.info("add strata " + subStrata.getLabel()); + } + + insertNodeInto(subStrataNode, strataNode, strataNode.getChildCount()); + + } + } + + protected ZoneNode findZoneNode(ZoneUIModel zone) { + + DefaultMutableTreeNode root = (DefaultMutableTreeNode) getRoot(); + + Enumeration rootChildren = root.children(); + + ZoneNode zoneNode = null; + + while (zoneNode == null && rootChildren.hasMoreElements()) { + ZoneNode nextNode = (ZoneNode) rootChildren.nextElement(); + if (zone.equals(nextNode.getZone())) { + zoneNode = nextNode; + } + } + + return zoneNode; + } + + protected StrataNode findStrataNode(StrataUIModel strata, ZoneUIModel zone) { + + ZoneNode zoneNode = findZoneNode(zone); + + return findStrataNode(strata, zoneNode); + } + + protected StrataNode findStrataNode(StrataUIModel strata, ZoneNode zoneNode) { + + Enumeration zoneChildren = zoneNode.children(); + + StrataNode strataNode = null; + + while (strataNode == null && zoneChildren.hasMoreElements()) { + StrataNode nextNode = (StrataNode) zoneChildren.nextElement(); + if (strata.equals(nextNode.getStrata())) { + strataNode = nextNode; + } + } + + return strataNode; + } + + protected SubStrataNode findSubStrataNode(SubStrataUIModel subStrata, StrataNode strataNode) { + + Enumeration strataChildren = strataNode.children(); + + SubStrataNode subStrataNode = null; + + while (subStrataNode == null && strataChildren.hasMoreElements()) { + SubStrataNode nextNode = (SubStrataNode) strataChildren.nextElement(); + if (subStrata.equals(nextNode.getSubstrata())) { + subStrataNode = nextNode; + } + } + + return subStrataNode; + } +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7929_editeur_de_zone updated (7d08009 -> f259b29)
by codelutin.com scm 27 Jan '16

27 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/7929_editeur_de_zone in repository tutti. See http://git.codelutin.com/tutti.git discards 7d08009 ajout de l'onglet d'édition des zone (refs #7929) discards 3d32505 ajout des zones au protocole (refs #7929) discards 206c51f use java 1.8 adds 12c408a Clean css adds 9f1d4b6 Ajout de l'import-export des rtp en csv + nettoyage de code (See #6115) adds e80fe02 refactor code (See #6115) adds 8ac45ea Merge branch 'feature/6115_import_export_especes' into 'develop' adds 4edcc48 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds db3a34e [jgitflow-maven-plugin]updating poms for 4.4-rc-1 branch with snapshot versions adds 3cb52f7 Add missing license headers adds 5912871 [jgitflow-maven-plugin]updating poms for branch'release/4.4-rc-1' with non-snapshot versions adds 077a94d [jgitflow-maven-plugin]merging 'release/4.4-rc-1' into 'master' adds b08857b [jgitflow-maven-plugin]merging 'master' into 'develop' adds b714001 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds e9d5fce Démarrer le SoundEngine à l'ouverture du context applicatif et non plus à sos initialisation, sinon on entre en inter-blocage si l'init se déroule mal (par exemple sur le problème de fichier de lock... adds 6dc314c ajouter bouton pour recopier les valeurs a et b saisie dans Mâle vers femelles et Indéterminé. (refs#7937) adds 9e9a052 bug : pour fermer il faut parfois cliquer deux fois sur [Fermer] (refs #7937) adds de83c9d n'activer RTP que si méthode de mensuration renseignée. Donc dans la navigation flèche avant flèche arrière penser à "sauter" les espèces sans méthode de mensuration (fixes #7937) adds 0d01d8d Fixes #7937 Merge branch 'feature/7937' into develop adds 6f87c93 ajout des bips dans la queue du sound engine (fixes #7939) adds f541684 Supprimer une phrase à l'ouverture de la connexion avec le BingFin (Fixes #7938) adds 9e1882b [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 6d8d862 [jgitflow-maven-plugin]updating poms for 4.4-rc2 branch with snapshot versions adds 657e3ad upgrade pom version adds 84a8d56 [jgitflow-maven-plugin]updating poms for branch'release/4.4-rc2' with non-snapshot versions adds ef0be51 [jgitflow-maven-plugin]merging 'release/4.4-rc2' into 'master' adds 9c2cc73 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 24fa7eb [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 786bd8b close UI des ecrans de mensurations quan don quitte les captures + reset des listeners de l'ichtyometre pour etre sur qu'il n'y en a qu'un (fixes #7943) adds 5adb922 Merge branch 'feature/7943' into 'develop' adds abb53af 9 décimales pour a dans les rtp (fixes #7944) adds 3286daf Merge branch 'feature/7944' into 'develop' adds 8385cdd [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds a1fc26f [jgitflow-maven-plugin]updating poms for 4.4-rc3 branch with snapshot versions adds 9f0d29a [jgitflow-maven-plugin]updating poms for branch'release/4.4-rc3' with non-snapshot versions adds ab52755 [jgitflow-maven-plugin]merging 'release/4.4-rc3' into 'master' adds 24a97b1 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 6c0822a [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 595843d use java 1.8 new dedff13 ajout des zones au protocole (refs #7929) new 267fd13 ajout de l'onglet d'édition des zone (refs #7929) new 9ae2970 ajout des strates et sous strates au modèle (refs #7929) new fc7dabe mise a jour suite aux modifs du modele + appel des oncloseui des sous-ui (refs #7929) new 48ded36 noeuds + renderer + modeles d'arbre + modele de zone (refs #7929) new f259b29 creation de zones + déplacement des noeuds (refs #7929) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (7d08009) \ N -- N -- N refs/heads/feature/7929_editeur_de_zone (f259b29) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 7 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 f259b292286588a3fba9141781c2a083180a3ccc Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Jan 27 18:39:17 2016 +0100 creation de zones + déplacement des noeuds (refs #7929) commit 48ded36fc3c1b6808e5e1a49090924f47fd6ed9d Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Jan 27 18:38:05 2016 +0100 noeuds + renderer + modeles d'arbre + modele de zone (refs #7929) commit fc7dabef9e890fbc3ce622df489b83206f39e10c Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Jan 27 18:37:01 2016 +0100 mise a jour suite aux modifs du modele + appel des oncloseui des sous-ui (refs #7929) commit 9ae297036ee7a72aa925b6807f1669c44d5083c5 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Jan 27 18:35:31 2016 +0100 ajout des strates et sous strates au modèle (refs #7929) commit 267fd13a57627c4743dcdaed84308579b34c286c Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Jan 25 11:23:25 2016 +0100 ajout de l'onglet d'édition des zone (refs #7929) commit dedff13b15777fbdbd6672f629a9f8d4a032c702 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Jan 25 11:22:53 2016 +0100 ajout des zones au protocole (refs #7929) commit 595843dd9e742f9f813db51dac15d2ea8dbe398b Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Jan 25 11:22:00 2016 +0100 use java 1.8 Summary of changes: pom.xml | 2 +- .../ifremer/tutti/ichtyometer/feed/FeedReader.java | 6 + .../tutti/persistence/entities/protocol/Rtps.java | 19 +- .../entities/protocol/SpeciesProtocolBean.java | 24 ++ .../java/fr/ifremer/tutti/util/BeepFrequency.java | 24 ++ .../src/main/xmi/tutti-persistence.zargo | Bin 59842 -> 60824 bytes .../protocol/ProtocolImportExportService.java | 156 ++++++------- .../ifremer/tutti/service/protocol/SpeciesRow.java | 102 ++++++++- .../tutti/service/protocol/SpeciesRowModel.java | 103 +++++---- .../protocol/ProtocolImportExportServiceTest.java | 251 ++++++++++++--------- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 3 + .../operation/catches/EditCatchesUIHandler.java | 2 + .../frequency/SpeciesFrequencyUIHandler.java | 2 +- .../protocol/EditProtocolSpeciesTableModel.java | 42 ++++ .../content/protocol/EditProtocolUIHandler.java | 6 +- .../content/protocol/EditProtocolUIModel.java | 44 ++-- .../actions/ExportProtocolSpeciesAction.java | 7 +- .../ui/swing/content/protocol/rtp/RtpButton.java | 38 +++- .../swing/content/protocol/rtp/RtpCellEditor.java | 28 ++- .../content/protocol/rtp/RtpCellRenderer.java | 24 ++ .../ui/swing/content/protocol/rtp/RtpEditorUI.jaxx | 53 +++-- .../ui/swing/content/protocol/rtp/RtpEditorUI.jcss | 21 +- .../content/protocol/rtp/RtpEditorUIHandler.java | 33 ++- .../content/protocol/rtp/RtpEditorUIModel.java | 60 ++++- .../protocol/rtp/actions/CloseRtpAction.java | 24 ++ .../rtp/actions/CopyMaleRtpAction.java} | 25 +- .../protocol/rtp/actions/EditNextRowAction.java | 24 ++ .../rtp/actions/EditPreviousRowAction.java | 24 ++ .../protocol/rtp/actions/SaveRtpAction.java | 24 ++ .../content/protocol/zones/StratasTreeModel.java | 123 ++++++++++ .../protocol/zones/ZoneEditorTreeCellRenderer.java | 45 ++++ .../swing/content/protocol/zones/ZoneEditorUI.jaxx | 22 +- .../swing/content/protocol/zones/ZoneEditorUI.jcss | 8 + .../protocol/zones/ZoneEditorUIHandler.java | 238 +++++++++++-------- .../content/protocol/zones/ZoneEditorUIModel.java | 157 ++++++++----- .../swing/content/protocol/zones/ZoneUIModel.java | 136 +++++++++++ .../content/protocol/zones/ZonesTreeModel.java | 98 ++++++++ .../protocol/zones/actions/AddStratasAction.java | 29 ++- .../protocol/zones/actions/CreateZoneAction.java | 30 +++ .../zones/actions/RemoveStratasAction.java | 2 +- .../content/protocol/zones/nodes/StrataNode.java | 20 ++ .../protocol/zones/nodes/SubStrataNode.java | 20 ++ .../content/protocol/zones/nodes/ZoneNode.java | 20 ++ .../ifremer/tutti/ui/swing/util/SoundEngine.java | 62 ++++- .../fr/ifremer/tutti/ui/swing/util/TuttiUI.java | 7 + .../resources/i18n/tutti-ui-swing_en_GB.properties | 4 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 6 +- 47 files changed, 1690 insertions(+), 508 deletions(-) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporarySpeciesUI.jcss => tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/Rtps.java (70%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{operation/catches/species/actions/ImportPupitriMelagWeightPopupValidateAction.java => protocol/rtp/actions/CopyMaleRtpAction.java} (54%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/StratasTreeModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneEditorTreeCellRenderer.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneUIModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZonesTreeModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/CreateZoneAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/nodes/StrataNode.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/nodes/SubStrataNode.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/nodes/ZoneNode.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 7

branch release/4.4-rc3 deleted (was 9f0d29a)
by codelutin.com scm 26 Jan '16

26 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.4-rc3 in repository tutti. See http://git.codelutin.com/tutti.git was 9f0d29a [jgitflow-maven-plugin]updating poms for branch'release/4.4-rc3' with non-snapshot versions The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

annotated tag tutti-4.4-rc3 created (now 6661995)
by codelutin.com scm 26 Jan '16

26 Jan '16

This is an automated email from the git hooks/post-receive script. New change to annotated tag tutti-4.4-rc3 in repository tutti. See http://git.codelutin.com/tutti.git at 6661995 (tag) tagging ab5275590a943ebdaecf079495fd01892084ef38 (commit) replaces tutti-4.4-rc2 tagged by Maven Release on Tue Jan 26 18:02:22 2016 +0100 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.4-rc3 ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch release/4.4-rc3 updated (a1fc26f -> 9f0d29a)
by codelutin.com scm 26 Jan '16

26 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.4-rc3 in repository tutti. See http://git.codelutin.com/tutti.git from a1fc26f [jgitflow-maven-plugin]updating poms for 4.4-rc3 branch with snapshot versions adds 9f0d29a [jgitflow-maven-plugin]updating poms for branch'release/4.4-rc3' with non-snapshot versions No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (3286daf -> 6c0822a)
by codelutin.com scm 26 Jan '16

26 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 3286daf Merge branch 'feature/7944' into 'develop' new 8385cdd [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds a1fc26f [jgitflow-maven-plugin]updating poms for 4.4-rc3 branch with snapshot versions new 9f0d29a [jgitflow-maven-plugin]updating poms for branch'release/4.4-rc3' with non-snapshot versions new ab52755 [jgitflow-maven-plugin]merging 'release/4.4-rc3' into 'master' new 24a97b1 [jgitflow-maven-plugin]merging 'master' into 'develop' new 6c0822a [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 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 6c0822a8b50b72a2e4ea9272d895898907afa939 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Jan 26 18:02:27 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 24a97b11f579adb12a5fd8ed709d13c67a574cc4 Merge: 8385cdd ab52755 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Jan 26 18:02:26 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 8385cdd1f4b6526d971cad38d5aa180b3d771c00 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Jan 26 18:02:26 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit ab5275590a943ebdaecf079495fd01892084ef38 Merge: ef0be51 9f0d29a Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Jan 26 18:02:19 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.4-rc3' into 'master' commit 9f0d29aeae235a5faa4d2cd26924ce79ab331e23 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Jan 26 17:59:23 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.4-rc3' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

branch master updated (ef0be51 -> ab52755)
by codelutin.com scm 26 Jan '16

26 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See http://git.codelutin.com/tutti.git from ef0be51 [jgitflow-maven-plugin]merging 'release/4.4-rc2' into 'master' adds 9e1882b [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 9c2cc73 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 24fa7eb [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 786bd8b close UI des ecrans de mensurations quan don quitte les captures + reset des listeners de l'ichtyometre pour etre sur qu'il n'y en a qu'un (fixes #7943) adds 5adb922 Merge branch 'feature/7943' into 'develop' adds abb53af 9 décimales pour a dans les rtp (fixes #7944) adds 3286daf Merge branch 'feature/7944' into 'develop' adds a1fc26f [jgitflow-maven-plugin]updating poms for 4.4-rc3 branch with snapshot versions adds 9f0d29a [jgitflow-maven-plugin]updating poms for branch'release/4.4-rc3' with non-snapshot versions adds ab52755 [jgitflow-maven-plugin]merging 'release/4.4-rc3' into 'master' No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- .../java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java | 6 ++++++ tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../content/operation/catches/EditCatchesUIHandler.java | 2 ++ .../catches/species/frequency/SpeciesFrequencyUIHandler.java | 2 +- .../tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jaxx | 12 ++++++------ .../tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jcss | 9 ++++++++- .../main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java | 7 +++++++ 13 files changed, 37 insertions(+), 15 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[ANN] - Tutti 4.4-rc3 released
by codelutin.com Release Notification 26 Jan '16

26 Jan '16

The Tutti team is pleased to announce the tutti-4.4-rc3 release! Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques. Documentation of the project can be found here: https://tutti.codelutin.com Changes ------- Changes in this version include: New features: o [PROTOCOLE] précision des valeurs dans les RTP Issue: 7944. Thanks to Kevin Morin. Resolved by kmorin. Fixed Bugs: o [ERGO] Les sons sont lus plusieurs fois Issue: 7943. Thanks to Kevin Morin. Resolved by kmorin. Downloads --------- For a manual installation, you can download files here: https://forge.codelutin.com/projects/tutti/files * tutti-ichtyometer-4.4-rc3-tools.zip - https://forge.codelutin.com/attachments/download/3636 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0