This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 9af21bd659ac08520e9b3016f91c1b13d0212483 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 15 19:08:34 2015 +0200 refs #6971 Rendre accessible l'ajout de calée uniquement si possible (LL) --- .../src/main/java/fr/ird/observe/entities/Activity.java | 2 ++ .../observe/entities/longline/ActivityLonglineImpl.java | 17 +++++++++++++++++ .../content/open/impl/longline/ActivityLonglineUI.css | 2 +- .../open/impl/longline/ActivityLonglineUIHandler.java | 6 ++++++ 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/Activity.java b/observe-entities/src/main/java/fr/ird/observe/entities/Activity.java index 8f88168..77540f7 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/Activity.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/Activity.java @@ -34,4 +34,6 @@ public interface Activity extends TopiaEntity{ void initCoordinates(); + boolean isSetOperation(); + } //Activity diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java index ead78ad..73c28d8 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java @@ -23,6 +23,7 @@ package fr.ird.observe.entities.longline; */ import fr.ird.observe.entities.OpenableEntity; +import fr.ird.observe.entities.referentiel.longline.VesselActivityLongline; import fr.ird.type.CoordinateHelper; import org.nuiton.util.DateUtil; @@ -33,6 +34,8 @@ public class ActivityLonglineImpl extends ActivityLonglineAbstract { private static final long serialVersionUID = 1L; + private static final String VESSEL_ACTIVITY_ID_FOR_SET = "fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1239832686138#0.1"; + /** * La valeur du quadrant (utilisé uniquement dans l'interface graphique) : * en base on conserve cette information dans les coordonnées {@link #longitude} @@ -110,4 +113,18 @@ public class ActivityLonglineImpl extends ActivityLonglineAbstract { fireOnPostWrite(PROPERTY_QUADRANT, old, quadrant); } + /** @return {@code true} si l'activite concerne une calée */ + @Override + public boolean isSetOperation() { + return vesselActivityLongline != null && VESSEL_ACTIVITY_ID_FOR_SET.equals(vesselActivityLongline.getTopiaId()); + } + + @Override + public void setVesselActivityLongline(VesselActivityLongline vesselActivityLongline) { + + super.setVesselActivityLongline(vesselActivityLongline); + fireOnPostWrite("setOperation", null, isSetOperation()); + + } + } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css index 2fcd1da..97bb4b3 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUI.css @@ -99,5 +99,5 @@ actionIcon:add; text:"observe.action.add.setLongline"; toolTipText:"observe.action.add.setLongline.tip"; - enabled:{model.isValid() && bean.getSetLongline() == null}; + enabled:{model.isValid() && bean.isSetOperation() && bean.getSetLongline() == null}; } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java index 0817e39..5e575d1 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java @@ -59,6 +59,12 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity /** Logger */ static private Log log = LogFactory.getLog(ActivityLonglineUIHandler.class); + static { + + n("observe.common.latitude"); + n("observe.common.longitude"); + + } public ActivityLonglineUIHandler(ActivityLonglineUI ui) { super(ui, DataContextType.TripLongline, -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.