branch develop updated (68f7958 -> 28d9da7)
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 68f7958 fix launcher archive configuration new 28d9da7 fix NPE (refs #6538) The 1 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 28d9da7396d108a717741e220c3a06a17baa9c96 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Feb 3 11:46:51 2015 +0100 fix NPE (refs #6538) Summary of changes: .../operation/catches/EditCatchesUIHandler.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 28d9da7396d108a717741e220c3a06a17baa9c96 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Feb 3 11:46:51 2015 +0100 fix NPE (refs #6538) --- .../operation/catches/EditCatchesUIHandler.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java index aaa009e..4956bd0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java @@ -26,6 +26,7 @@ import com.google.common.base.Function; import com.google.common.collect.Sets; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; +import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; @@ -410,14 +411,19 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi @Override public void propertyChange(PropertyChangeEvent evt) { EditCatchesUIModel model = (EditCatchesUIModel) evt.getSource(); - boolean tremieCarrouselFieldsVisisble = model.getFishingOperation().getVessel() != null - && model.getFishingOperation().getVessel().getId().equals(getConfig().getTremieCarousselVesselId()); + FishingOperation fishingOperation = model.getFishingOperation(); + if (fishingOperation != null) { - Element labelElement = svgDocument.getElementById(property + "Label"); - labelElement.setAttribute("visibility", tremieCarrouselFieldsVisisble ? "visible" : "hidden"); + boolean tremieCarrouselFieldsVisisble = fishingOperation.getVessel() != null + && fishingOperation.getVessel().getId().equals(getConfig().getTremieCarousselVesselId()); - Element valueElement = svgDocument.getElementById(property + "Value"); - valueElement.setAttribute("visibility", tremieCarrouselFieldsVisisble ? "visible" : "hidden"); + Element labelElement = svgDocument.getElementById(property + "Label"); + labelElement.setAttribute("visibility", tremieCarrouselFieldsVisisble ? "visible" : "hidden"); + + Element valueElement = svgDocument.getElementById(property + "Value"); + valueElement.setAttribute("visibility", tremieCarrouselFieldsVisisble ? "visible" : "hidden"); + + } } }); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm