This is an automated email from the git hooks/post-receive script. New commit to branch feature/list_screen_buttons in repository observe. See http://git.codelutin.com/observe.git commit 29eacd66a1cc3c5287cf30cb96e4ab7f3e2e57db Author: Kevin Morin <morin@codelutin.com> Date: Fri Nov 6 10:27:43 2015 +0100 dans l'arbre, mettre en noir le programme quand il est ouvert --- .../main/java/fr/ird/observe/ObserveOpenDataManager.java | 3 ++- .../observe/ui/tree/AbstractObserveTreeCellRenderer.java | 13 +++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveOpenDataManager.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveOpenDataManager.java index b809275..109e7c9 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveOpenDataManager.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveOpenDataManager.java @@ -225,7 +225,8 @@ public class ObserveOpenDataManager extends AbstractSerializableBean implements } public boolean isOpen(String openableId) { - return isOpenTripSeine(openableId) + return isOpenProgram(openableId) + || isOpenTripSeine(openableId) || isOpenRoute(openableId) || isOpenActivitySeine(openableId) || isOpenTripLongline(openableId) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java index 1ce8320..17dd3dc 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/AbstractObserveTreeCellRenderer.java @@ -22,19 +22,19 @@ package fr.ird.observe.ui.tree; import com.google.common.base.Preconditions; +import fr.ird.observe.ObserveOpenDataManager; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.ObserveSwingDataSource; -import fr.ird.observe.services.dto.ReferenceDto; -import fr.ird.observe.ui.DecoratorService; -import fr.ird.observe.business.db.DataContext; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.OpenableDto; +import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.ui.DecoratorService; import fr.ird.observe.ui.content.impl.seine.FloatingObjectUI; import fr.ird.observe.ui.content.impl.seine.SetSeineUI; import fr.ird.observe.ui.content.open.impl.longline.ActivityLonglineUI; @@ -326,14 +326,15 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel log.trace("[" + node + "] Content class to use : " + contentClass); log.trace("[" + node + "] Parent Content class to use : " + parentContentClass); } - DataContext dataContext = ObserveSwingApplicationContext.get().getDataContext(); + + ObserveOpenDataManager openDataManager = ObserveSwingApplicationContext.get().getOpenDataManager(); + String nodeId = node.getId(); if (ProgramDto.class.equals(contentClass)) { // on grise le program si aucune marée ouverte sur ce programme - String p = dataContext.getOpenProgramId(); - if (p != null && p.equals(nodeId)) { + if (openDataManager.isOpenProgram(nodeId)) { return openColor; } return closeColor; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.