This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit e21525e96994f4a38a9847d8f48a06eab1474207 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 4 08:34:11 2016 +0100 [ui] Revue de la couleur des nœuds dans l'abre de navigation --- .../navigation/nodes/ClassNavigationTreeNode.java | 8 +++++--- .../longline/ProgramLonglineNavigationTreeNode.java | 19 ++++++++++++++++++- .../longline/SetLonglineNavigationTreeNode.java | 5 +++++ .../referential/ReferentialNavigationTreeNode.java | 5 +++++ .../referential/ReferentialsNavigationTreeNode.java | 4 ++++ .../nodes/seine/ProgramSeineNavigationTreeNode.java | 21 ++++++++++++++++++++- .../nodes/seine/SetSeineNavigationTreeNode.java | 5 +++++ 7 files changed, 62 insertions(+), 5 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/ClassNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/ClassNavigationTreeNode.java index 9262b82..0c8c2d3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/ClassNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/ClassNavigationTreeNode.java @@ -26,9 +26,6 @@ import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTreeModel; import fr.ird.observe.services.dto.IdDto; -import javax.swing.Icon; -import javax.swing.UIManager; - import static org.nuiton.i18n.I18n.t; /** @@ -76,4 +73,9 @@ public abstract class ClassNavigationTreeNode<D extends IdDto> extends Navigatio return "navigation." + getParent().getDataType().getName() + ".sub"; } + @Override + public boolean isOpen() { + // ouvert si le parent est ouvert + return getParent().isOpen(); + } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ProgramLonglineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ProgramLonglineNavigationTreeNode.java index a1e83da..7fa467b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ProgramLonglineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ProgramLonglineNavigationTreeNode.java @@ -29,8 +29,10 @@ import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReference; +import org.apache.commons.collections4.EnumerationUtils; import java.util.Collection; +import java.util.Iterator; /** * Created on 14/11/16. @@ -38,7 +40,7 @@ import java.util.Collection; * @author Tony Chemit - chemit@codelutin.com * @since 5.1 */ -public class ProgramLonglineNavigationTreeNode extends ReferenceNavigationTreeNodeSupport<ProgramDto, ReferentialReference<ProgramDto>> { +public class ProgramLonglineNavigationTreeNode extends ReferenceNavigationTreeNodeSupport<ProgramDto, ReferentialReference<ProgramDto>> implements Iterable<TripLonglineNavigationTreeNode> { public ProgramLonglineNavigationTreeNode(ReferentialReference<ProgramDto> data, Collection<DataReference<TripLonglineDto>> trips) { super(data, true); @@ -49,6 +51,17 @@ public class ProgramLonglineNavigationTreeNode extends ReferenceNavigationTreeNo } @Override + public boolean isOpen() { + // le programme est ouvert si l'une de ses marées est ouverte + for (TripLonglineNavigationTreeNode node : this) { + if (node.isOpen()) { + return true; + } + } + return false; + } + + @Override public void reload() { } @@ -67,4 +80,8 @@ public class ProgramLonglineNavigationTreeNode extends ReferenceNavigationTreeNo protected void populateChilds0(NavigationTreeModel treeModel) { } + @Override + public Iterator<TripLonglineNavigationTreeNode> iterator() { + return EnumerationUtils.toList(children()).iterator(); + } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/SetLonglineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/SetLonglineNavigationTreeNode.java index ec5c033..7ce594c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/SetLonglineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/SetLonglineNavigationTreeNode.java @@ -46,6 +46,11 @@ public class SetLonglineNavigationTreeNode extends ReferenceNavigationTreeNodeSu } @Override + public boolean isOpen() { + return getParent().isOpen(); + } + + @Override public Class<SetLonglineUI> getContentClass() { return SetLonglineUI.class; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/referential/ReferentialNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/referential/ReferentialNavigationTreeNode.java index c248053..bc8e6f6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/referential/ReferentialNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/referential/ReferentialNavigationTreeNode.java @@ -78,4 +78,9 @@ public class ReferentialNavigationTreeNode<D extends ReferentialDto> extends Cla public boolean isLeaf() { return true; } + + @Override + public boolean isOpen() { + return true; + } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/referential/ReferentialsNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/referential/ReferentialsNavigationTreeNode.java index 99ae9a1..2aaa25a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/referential/ReferentialsNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/referential/ReferentialsNavigationTreeNode.java @@ -70,4 +70,8 @@ public class ReferentialsNavigationTreeNode extends StringNavigationTreeNodeSupp return "navigation.referentiel"; } + @Override + public boolean isOpen() { + return true; + } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ProgramSeineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ProgramSeineNavigationTreeNode.java index a4c7208..e30fdb7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ProgramSeineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ProgramSeineNavigationTreeNode.java @@ -29,8 +29,10 @@ import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.seine.TripSeineDto; +import org.apache.commons.collections4.EnumerationUtils; import java.util.Collection; +import java.util.Iterator; /** * Created on 14/11/16. @@ -38,7 +40,7 @@ import java.util.Collection; * @author Tony Chemit - chemit@codelutin.com * @since 5.1 */ -public class ProgramSeineNavigationTreeNode extends ReferenceNavigationTreeNodeSupport<ProgramDto, ReferentialReference<ProgramDto>> { +public class ProgramSeineNavigationTreeNode extends ReferenceNavigationTreeNodeSupport<ProgramDto, ReferentialReference<ProgramDto>> implements Iterable<TripSeineNavigationTreeNode> { public ProgramSeineNavigationTreeNode(ReferentialReference<ProgramDto> data, Collection<DataReference<TripSeineDto>> trips) { super(data, true); @@ -63,8 +65,25 @@ public class ProgramSeineNavigationTreeNode extends ReferenceNavigationTreeNodeS return TripSeinesUI.class; } + + @Override + public boolean isOpen() { + // le programme est ouvert si l'une de ses marées est ouverte + for (TripSeineNavigationTreeNode node : this) { + if (node.isOpen()) { + return true; + } + } + return false; + } + @Override protected void populateChilds0(NavigationTreeModel treeModel) { } + + @Override + public Iterator<TripSeineNavigationTreeNode> iterator() { + return EnumerationUtils.toList(children()).iterator(); + } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/SetSeineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/SetSeineNavigationTreeNode.java index ba8c280..3894ce2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/SetSeineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/SetSeineNavigationTreeNode.java @@ -45,6 +45,11 @@ public class SetSeineNavigationTreeNode extends ReferenceNavigationTreeNodeSuppo } @Override + public boolean isOpen() { + return getParent().isOpen(); + } + + @Override public Class<SetSeineUI> getContentClass() { return SetSeineUI.class; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.