[Observe-commits] 01/05: Ajout de logs sur les modifications de coordonnes sur les activites et l'opération de peche (longline) (refs #7431

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 7a8b9e96d3b1ee90c84d8ce04fa2cd973360298c Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 13 20:47:11 2015 +0200 Ajout de logs sur les modifications de coordonnes sur les activites et l'opération de peche (longline) (refs #7431 --- .../entities/longline/ActivityLonglineImpl.java | 37 ++++++++- .../observe/entities/longline/SetLonglineImpl.java | 96 +++++++++++++++++++++- .../observe/entities/seine/ActivitySeineImpl.java | 31 ++++++- .../src/main/filters/observe-log4j.properties | 1 + .../ird/observe/ui/content/ContentUIHandler.java | 25 ++++++ .../impl/longline/SetLonglineUIHandler.java | 26 +++++- .../impl/longline/ActivityLonglineUIHandler.java | 17 +++- .../open/impl/seine/ActivitySeineUIHandler.java | 11 +++ 8 files changed, 237 insertions(+), 7 deletions(-) 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 dd84045..3624037 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 @@ -22,9 +22,12 @@ package fr.ird.observe.entities.longline; * #L% */ +import com.google.common.base.MoreObjects; import fr.ird.observe.entities.OpenableEntity; import fr.ird.observe.entities.referentiel.longline.VesselActivityLongline; import fr.ird.type.CoordinateHelper; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.util.DateUtil; import java.util.Date; @@ -34,6 +37,9 @@ public class ActivityLonglineImpl extends ActivityLonglineAbstract { private static final long serialVersionUID = 1L; + /** Logger. */ + private static final Log log = LogFactory.getLog(ActivityLonglineImpl.class); + private static final String VESSEL_ACTIVITY_ID_FOR_SET = "fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1239832686138#0.1"; /** @@ -107,7 +113,10 @@ public class ActivityLonglineImpl extends ActivityLonglineAbstract { } @Override - public void setQuadrant(Integer quadrant) { + public synchronized void setQuadrant(Integer quadrant) { + if (log.isDebugEnabled()) { + log.debug(String.format("[%s] Quadrant changed to %s", this, quadrant)); + } Integer old = this.quadrant; this.quadrant = quadrant; fireOnPostWrite(PROPERTY_QUADRANT, old, quadrant); @@ -127,4 +136,30 @@ public class ActivityLonglineImpl extends ActivityLonglineAbstract { } + @Override + public synchronized void setLatitude(Float latitude) { + if (log.isDebugEnabled()) { + log.debug(String.format("[%s] Latitude changed to %s", this, latitude)); + } + super.setLatitude(latitude); + } + + @Override + public synchronized void setLongitude(Float longitude) { + if (log.isDebugEnabled()) { + log.debug(String.format("[%s] Longitude changed to %s", this, longitude)); + } + super.setLongitude(longitude); + } + + @Override + public String toString() { + return MoreObjects.toStringHelper(this) + .add("date", getDate()) + .add("time", getTime()) + .add("quadrant", quadrant) + .add("latitude", longitude) + .add("longitude", longitude) + .toString(); + } } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/SetLonglineImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/SetLonglineImpl.java index f67b2ee..357f616 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/SetLonglineImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/SetLonglineImpl.java @@ -22,7 +22,10 @@ package fr.ird.observe.entities.longline; * #L% */ +import com.google.common.base.MoreObjects; import fr.ird.type.CoordinateHelper; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.util.DateUtil; import java.util.Date; @@ -31,6 +34,9 @@ public class SetLonglineImpl extends SetLonglineAbstract { private static final long serialVersionUID = 1L; + /** Logger. */ + private static final Log log = LogFactory.getLog(SetLonglineImpl.class); + @Override public void initCoordinates() { @@ -39,7 +45,7 @@ public class SetLonglineImpl extends SetLonglineAbstract { setHaulingStartQuadrant(getHaulingStartQuadrant()); setHaulingEndQuadrant(getHaulingEndQuadrant()); - + } public Integer getSettingStartQuadrant() { @@ -47,6 +53,9 @@ public class SetLonglineImpl extends SetLonglineAbstract { } public void setSettingStartQuadrant(Integer settingStartQuadrant) { + if (log.isDebugEnabled()) { + log.debug(String.format("[%s] settingStartQuadrant changed to %s", this, settingStartQuadrant)); + } fireOnPostWrite(PROPERTY_SETTING_START_QUADRANT, null, settingStartQuadrant); } @@ -55,6 +64,9 @@ public class SetLonglineImpl extends SetLonglineAbstract { } public void setSettingEndQuadrant(Integer settingEndQuadrant) { + if (log.isDebugEnabled()) { + log.debug(String.format("[%s] settingEndQuadrant changed to %s", this, settingEndQuadrant)); + } fireOnPostWrite(PROPERTY_SETTING_END_QUADRANT, null, settingEndQuadrant); } @@ -63,6 +75,9 @@ public class SetLonglineImpl extends SetLonglineAbstract { } public void setHaulingStartQuadrant(Integer haulingStartQuadrant) { + if (log.isDebugEnabled()) { + log.debug(String.format("[%s] haulingStartQuadrant changed to %s", this, haulingStartQuadrant)); + } fireOnPostWrite(PROPERTY_HAULING_START_QUADRANT, null, haulingStartQuadrant); } @@ -71,10 +86,71 @@ public class SetLonglineImpl extends SetLonglineAbstract { } public void setHaulingEndQuadrant(Integer haulingEndQuadrant) { + if (log.isDebugEnabled()) { + log.debug(String.format("[%s] haulingEndQuadrant changed to %s", this, haulingEndQuadrant)); + } fireOnPostWrite(PROPERTY_HAULING_END_QUADRANT, null, haulingEndQuadrant); } @Override + public void setSettingStartLongitude(Float settingStartLongitude) { + if (log.isDebugEnabled()) { + log.debug(String.format("[%s] settingStartLongitude changed to %s", this, settingStartLongitude)); + } + super.setSettingStartLongitude(settingStartLongitude); + } + + @Override + public void setSettingStartLatitude(Float settingStartLatitude) { + if (log.isDebugEnabled()) { + log.debug(String.format("[%s] settingStartLatitude changed to %s", this, settingStartLatitude)); + } + super.setSettingStartLatitude(settingStartLatitude); + } + + @Override + public void setSettingEndLatitude(Float settingEndLatitude) { + if (log.isDebugEnabled()) { + log.debug(String.format("[%s] settingEndLatitude changed to %s", this, settingEndLatitude)); + } + super.setSettingEndLatitude(settingEndLatitude); + } + + @Override + public void setSettingEndLongitude(Float settingEndLongitude) { + if (log.isDebugEnabled()) { + log.debug(String.format("[%s] settingEndLongitude changed to %s", this, settingEndLongitude)); + } + super.setSettingEndLongitude(settingEndLongitude); + } + + @Override + public void setHaulingStartLongitude(Float haulingStartLongitude) { + if (log.isDebugEnabled()) { + log.debug(String.format("[%s] haulingStartLongitude changed to %s", this, haulingStartLongitude)); + } + super.setHaulingStartLongitude(haulingStartLongitude); + } + + @Override + public void setHaulingStartLatitude(Float haulingStartLatitude) { + if (log.isDebugEnabled()) { + log.debug(String.format("[%s] haulingStartLatitude changed to %s", this, haulingStartLatitude)); + } + super.setHaulingStartLatitude(haulingStartLatitude); + } + + @Override + public Float getHaulingEndLongitude() { + return super.getHaulingEndLongitude(); + } + + @Override + public Float getHaulingEndLatitude() { + return super.getHaulingEndLatitude(); + } + + @Override public Date getSettingStartDate() { return settingStartTimeStamp == null ? null : DateUtil.getDay(settingStartTimeStamp); } @@ -257,4 +333,22 @@ public class SetLonglineImpl extends SetLonglineAbstract { // just fire the given value fireOnPostWrite(PROPERTY_BAITS_COMPOSITION_PROPORTION_SUM, 0, sum); } + + @Override + public String toString() { + return MoreObjects.toStringHelper(this) + .add("haulingStartLatitude", getHaulingStartLatitude()) + .add("haulingStartLongitude", getHaulingStartLongitude()) + .add("haulingStartQuadrant", getHaulingStartQuadrant()) + .add("haulingEndLatitude", getHaulingEndLatitude()) + .add("haulingEndLongitude", getHaulingEndLongitude()) + .add("haulingEndQuadrant", getHaulingEndQuadrant()) + .add("settingStartLatitude", getSettingStartLatitude()) + .add("settingStartLongitude", getSettingStartLongitude()) + .add("settingStartQuadrant", getSettingStartQuadrant()) + .add("settingEndLatitude", getSettingEndLatitude()) + .add("settingEndLongitude", getSettingEndLongitude()) + .add("settingEndQuadrant", getSettingEndQuadrant()) + .toString(); + } } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java index 7093c52..03ec623 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java @@ -21,6 +21,7 @@ */ package fr.ird.observe.entities.seine; +import com.google.common.base.MoreObjects; import fr.ird.observe.entities.OpenableEntity; import fr.ird.observe.entities.constants.seine.SchoolType; import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine; @@ -121,8 +122,8 @@ public class ActivitySeineImpl extends ActivitySeineAbstract { @Override public void setQuadrant(Integer quadrant) { - if (log.isInfoEnabled()) { - log.info("New quadrant value: "+quadrant); + if (log.isDebugEnabled()) { + log.debug(String.format("[%s] Quadrant changed to %s", this, quadrant)); } Integer old = this.quadrant; // fireOnPreWrite(PROPERTY_QUADRANT, old, quadrant); @@ -201,6 +202,32 @@ public class ActivitySeineImpl extends ActivitySeineAbstract { } + @Override + public synchronized void setLatitude(Float latitude) { + if (log.isDebugEnabled()) { + log.debug(String.format("[%s] Latitude changed to %s", this, latitude)); + } + super.setLatitude(latitude); + } + + @Override + public synchronized void setLongitude(Float longitude) { + if (log.isDebugEnabled()) { + log.debug(String.format("[%s] Longitude changed to %s", this, longitude)); + } + super.setLongitude(longitude); + } + + @Override + public String toString() { + return MoreObjects.toStringHelper(this) + .add("time", getTime()) + .add("quadrant", quadrant) + .add("latitude", longitude) + .add("longitude", longitude) + .toString(); + } + static { n("observe.common.quadrant"); } diff --git a/observe-swing/src/main/filters/observe-log4j.properties b/observe-swing/src/main/filters/observe-log4j.properties index 2bea956..a91c8dc 100644 --- a/observe-swing/src/main/filters/observe-log4j.properties +++ b/observe-swing/src/main/filters/observe-log4j.properties @@ -42,6 +42,7 @@ log4j.logger.fr.ird.observe=INFO log4j.logger.fr.ird.observe.db.impl.DataContext=WARN log4j.logger.fr.ird.observe.db.impl.DataService=WARN log4j.logger.fr.ird.observe.entities.longline.ActivityLonglineImpl=DEBUG +log4j.logger.fr.ird.observe.entities.longline.SetLonglineImpl=DEBUG log4j.logger.fr.ird.observe.entities.seine.ActivitySeineImpl=DEBUG log4j.logger.fr.ird.observe.validation.field=WARN diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java index 05f636a..48207fd 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java @@ -21,6 +21,7 @@ */ package fr.ird.observe.ui.content; +import com.google.common.collect.ImmutableSet; import fr.ird.observe.BinderService; import fr.ird.observe.DataService; import fr.ird.observe.DecoratorService; @@ -68,6 +69,8 @@ import javax.swing.JOptionPane; import javax.swing.JToolBar; import javax.swing.UIManager; import java.awt.Component; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.List; @@ -855,4 +858,26 @@ public abstract class ContentUIHandler<E extends TopiaEntity> { quadrantBG.add(editor.getQuadrant4()); } + + protected static class LogPropertyChanges implements PropertyChangeListener { + + private final ImmutableSet<String> propertyNames; + + public LogPropertyChanges(ImmutableSet<String> propertyNames) { + this.propertyNames = propertyNames; + } + + @Override + public void propertyChange(PropertyChangeEvent evt) { + + if (propertyNames.contains(evt.getPropertyName())) { + if (log.isInfoEnabled()) { + log.info(String.format("Property %s changed (%s --> %s)", evt.getPropertyName(), evt.getOldValue(), evt.getNewValue())); + } + + } + + } + + } } diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java index 54f8c65..4a2a4e8 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java @@ -22,6 +22,7 @@ package fr.ird.observe.ui.content.impl.longline; * #L% */ +import com.google.common.collect.ImmutableSet; import fr.ird.observe.DataService; import fr.ird.observe.ObserveDAOHelper; import fr.ird.observe.db.DataContext; @@ -73,6 +74,7 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLongline> { // Compute valid state of tab from the error table protected final TableModelListener computeTabValidStateListener = new TableModelListener() { + @Override public void tableChanged(TableModelEvent e) { @@ -84,6 +86,7 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLongline> { // Change toogle target visible on all TimeEditors protected final PropertyChangeListener onToogleTimeEditorSliderChangedListener = new PropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent evt) { Boolean newValue = (Boolean) evt.getNewValue(); @@ -93,6 +96,7 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLongline> { // Change toogle target visible on all TimeEditors protected final PropertyChangeListener onCoordinateFormatChangedListener = new PropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent evt) { CoordinateFormat newValue = (CoordinateFormat) evt.getNewValue(); @@ -100,12 +104,29 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLongline> { } }; + private final LogPropertyChanges logCoordinatesChanges; + protected boolean toogleTimeEditorSliderIsChanging; protected boolean coordinateFormatChangedIsChanging; + static ImmutableSet<String> COORDINATES_PROPERTIES = ImmutableSet.of( + SetLongline.PROPERTY_HAULING_START_LONGITUDE, + SetLongline.PROPERTY_HAULING_START_LATITUDE, + SetLongline.PROPERTY_HAULING_START_QUADRANT, + SetLongline.PROPERTY_SETTING_START_LONGITUDE, + SetLongline.PROPERTY_SETTING_START_LATITUDE, + SetLongline.PROPERTY_SETTING_START_QUADRANT, + SetLongline.PROPERTY_HAULING_END_LONGITUDE, + SetLongline.PROPERTY_HAULING_END_LATITUDE, + SetLongline.PROPERTY_HAULING_END_QUADRANT, + SetLongline.PROPERTY_SETTING_END_LONGITUDE, + SetLongline.PROPERTY_SETTING_END_LATITUDE, + SetLongline.PROPERTY_SETTING_END_QUADRANT); + public SetLonglineUIHandler(SetLonglineUI ui) { super(ui, DataContextType.ActivityLongline, DataContextType.SetLongline); + this.logCoordinatesChanges = new LogPropertyChanges(COORDINATES_PROPERTIES); } @Override @@ -162,10 +183,11 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLongline> { getUi().getHaulingStartCoordinates().getModel().addPropertyChangeListener(CoordinatesEditorModel.PROPERTY_FORMAT, onCoordinateFormatChangedListener); getUi().getHaulingEndCoordinates().getModel().addPropertyChangeListener(CoordinatesEditorModel.PROPERTY_FORMAT, onCoordinateFormatChangedListener); + getBean().removePropertyChangeListener(logCoordinatesChanges); + getBean().addPropertyChangeListener(logCoordinatesChanges); } - @Override public void openUI() throws Exception { @@ -539,7 +561,7 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLongline> { } - protected void onCoordinateFormatChanged(CoordinateFormat newValue) { + protected synchronized void onCoordinateFormatChanged(CoordinateFormat newValue) { if (!coordinateFormatChangedIsChanging) { 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 ea04a32..2dea40f 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 @@ -22,6 +22,7 @@ package fr.ird.observe.ui.content.open.impl.longline; * #L% */ +import com.google.common.collect.ImmutableSet; import fr.ird.observe.DataService; import fr.ird.observe.ObserveDAOHelper; import fr.ird.observe.ObserveTechnicalException; @@ -70,11 +71,18 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity } + static ImmutableSet<String> COORDINATES_PROPERTIES = ImmutableSet.of(ActivityLongline.PROPERTY_QUADRANT, + ActivityLongline.PROPERTY_LATITUDE, + ActivityLongline.PROPERTY_LONGITUDE); + + private LogPropertyChanges logCoordinatesChanges; + public ActivityLonglineUIHandler(ActivityLonglineUI ui) { super(ui, DataContextType.TripLongline, DataContextType.ActivityLongline, n("observe.activityLongline.message.not.open")); + this.logCoordinatesChanges = new LogPropertyChanges(COORDINATES_PROPERTIES); } @Override @@ -126,6 +134,13 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity } @Override + public void initUI() throws Exception { + super.initUI(); + getBean().removePropertyChangeListener(logCoordinatesChanges); + getBean().addPropertyChangeListener(logCoordinatesChanges); + } + + @Override public void openUI() throws Exception { super.openUI(); @@ -384,7 +399,7 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity wasUpdated = getDataService().updateEndDate(getDataSource(), tripId); } catch (DataSourceException e) { - throw new ObserveTechnicalException("Could not update end date",e); + throw new ObserveTechnicalException("Could not update end date", e); } if (wasUpdated) { diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java index 933982b..187d5d2 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java @@ -21,6 +21,7 @@ */ package fr.ird.observe.ui.content.open.impl.seine; +import com.google.common.collect.ImmutableSet; import fr.ird.observe.DataService; import fr.ird.observe.ObserveDAOHelper; import fr.ird.observe.db.DataContext; @@ -80,11 +81,19 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei } }; + static ImmutableSet<String> COORDINATES_PROPERTIES = ImmutableSet.of(ActivitySeine.PROPERTY_QUADRANT, + ActivitySeine.PROPERTY_LATITUDE, + ActivitySeine.PROPERTY_LONGITUDE); + + private LogPropertyChanges logCoordinatesChanges; + + public ActivitySeineUIHandler(ActivitySeineUI ui) { super(ui, DataContextType.Route, DataContextType.ActivitySeine, n("observe.activitySeine.message.not.open")); + this.logCoordinatesChanges = new LogPropertyChanges(COORDINATES_PROPERTIES); } @Override @@ -153,6 +162,8 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei // listen messages to see if required to add getUi().getErrorTableModel().addTableModelListener(computeTabValidStateListener); + getBean().removePropertyChangeListener(logCoordinatesChanges); + getBean().addPropertyChangeListener(logCoordinatesChanges); } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.