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 a001a2c6e37b059a1ba4f9d0cc0014ae51207fa7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 26 17:56:21 2016 +0200 Ajouter le nombre de marées par programme et le nombre de routes par marée --- .../renderer/AbstractObserveTreeCellRenderer.java | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/renderer/AbstractObserveTreeCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/renderer/AbstractObserveTreeCellRenderer.java index ea51ba6..6fd8a1c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/renderer/AbstractObserveTreeCellRenderer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/renderer/AbstractObserveTreeCellRenderer.java @@ -36,9 +36,12 @@ import fr.ird.observe.application.swing.ui.content.open.impl.seine.TripSeineUI; import fr.ird.observe.application.swing.ui.tree.ObserveDataProvider; import fr.ird.observe.application.swing.ui.tree.node.DataReferenceNodeSupport; import fr.ird.observe.application.swing.ui.tree.node.ObserveNode; +import fr.ird.observe.application.swing.ui.tree.node.ProgramLonglineNode; +import fr.ird.observe.application.swing.ui.tree.node.ProgramSeineNode; import fr.ird.observe.application.swing.ui.tree.node.ReferentialReferenceNodeSupport; import fr.ird.observe.application.swing.ui.tree.node.SetLonglineNode; import fr.ird.observe.application.swing.ui.tree.node.SetSeineNode; +import fr.ird.observe.application.swing.ui.tree.node.TripSeineNode; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.OpenableDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; @@ -116,8 +119,6 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel @Override public ObserveDataProvider getDataProvider() { ObserveDataProvider provider = (ObserveDataProvider) super.getDataProvider(); -// Objects.requireNonNull(provider); -// //FIXME ? why if (provider == null) { ObserveSwingDataSource source = ObserveSwingApplicationContext.get().getDataSourcesManager().getMainDataSource(); if (source != null) { @@ -223,12 +224,7 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel } else if (RouteDto.class.equals(containerClass)) { // remonte sur une route : donc activitys path = ActivitySeineDto.class.getName(); - } -// else if (ActivitySeine.class.equals(containerClass)) { -// // remonte sur une activity : donc observedSystem -// path = ObservedSystemDto.class.getName(); -// } - else { + } else { // dans le cas d'un sub, il n'y a pas de suffixe possible suffix = ""; path = containerClass.getName() + ".sub"; @@ -285,12 +281,10 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel if (node instanceof SetLonglineNode) { return t(ObserveI18nDecoratorHelper.getTypeI18nKey(((SetLonglineNode) node).getEntity().getType())); -// return t("observe.tree.setLongline"); } if (node instanceof SetSeineNode) { return t(ObserveI18nDecoratorHelper.getTypeI18nKey(((SetSeineNode) node).getEntity().getType())); -// return t("observe.tree.setSeine"); } if (node instanceof DataReferenceNodeSupport) { @@ -302,7 +296,11 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel Decorator<?> decorator = getDecoratorService().getDataReferenceDecorator((Class) beanType); - return decorator.toString(entity); + String result = decorator.toString(entity); + if (node instanceof TripSeineNode) { + result += " (" + ((TripSeineNode) node).getRouteCount() + ")"; + } + return result; } if (node instanceof ReferentialReferenceNodeSupport) { @@ -314,7 +312,11 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel Decorator<?> decorator = getDecoratorService().getReferentialReferenceDecorator((Class) beanType); - return decorator.toString(entity); + String result = decorator.toString(entity); + if (node instanceof ProgramSeineNode || node instanceof ProgramLonglineNode) { + result += " (" + node.getChildCount() + ")"; + } + return result; } throw new IllegalStateException("Don't know how to render node: " + node); @@ -388,9 +390,7 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel ObserveNode openableNode; openableNode = getFirstOpenableNode(node); if (log.isDebugEnabled()) { - log.debug("openable node " + - Arrays.toString(openableNode.getPath()) + " for " + - Arrays.toString(node.getPath())); + log.debug("openable node " + openableNode + " for " + Arrays.toString(node.getPath())); } if (openableNode != null) { Boolean open = openableNode.isOpen(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.