branch develop updated (ea7f951 -> 8f79f13)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from ea7f951 Permettre de configurer les logs chez le client (termine #7455) Merge branch 'feature/7455' into develop new 7a8b9e9 Ajout de logs sur les modifications de coordonnes sur les activites et l'opération de peche (longline) (refs #7431 new faf434f Ajout de logs sur les changements de coordonnées dans les objets métiers (refs #7431) new a782916 Ne plus écouter les changements dans les ui (refs #7341) new 4d9013a Ajout de logs sur le changement des entitées (refs-50 #7431). Merge branch 'feature/7431' into develop new 8f79f13 Move to java 7 The 5 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 8f79f13acf490f448273ebdb9d29df063ce7c1c9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Aug 14 11:00:41 2015 +0200 Move to java 7 commit 4d9013a84b05f4b935c41e140a6823d2ed78d7d4 Merge: ea7f951 a782916 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Aug 14 10:59:49 2015 +0200 Ajout de logs sur le changement des entitées (refs-50 #7431). Merge branch 'feature/7431' into develop commit a782916087dd83c9ee580981ff5ed02714b73fb3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Aug 14 10:59:40 2015 +0200 Ne plus écouter les changements dans les ui (refs #7341) commit faf434f4c5981f2ab32d352921b2426d3d361a6f Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Aug 14 10:59:16 2015 +0200 Ajout de logs sur les changements de coordonnées dans les objets métiers (refs #7431) 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 Summary of changes: .../java/fr/ird/observe/entities/Entities.java | 62 +++++++++++++-- .../entities/longline/ActivityLonglineImpl.java | 35 +++++++- .../observe/entities/longline/SetLonglineImpl.java | 93 +++++++++++++++++++++- .../observe/entities/seine/ActivitySeineImpl.java | 33 +++++++- .../src/main/java/fr/ird/observe/util/Numbers.java | 17 ++++ observe-swing/src/main/filters/log4j.properties | 4 +- .../src/main/filters/observe-log4j.properties | 3 +- .../ird/observe/ui/content/ContentUIHandler.java | 22 +++++ .../impl/longline/SetLonglineUIHandler.java | 25 +++++- .../impl/longline/ActivityLonglineUIHandler.java | 16 +++- .../open/impl/seine/ActivitySeineUIHandler.java | 11 +++ pom.xml | 6 ++ 12 files changed, 310 insertions(+), 17 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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>.
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 faf434f4c5981f2ab32d352921b2426d3d361a6f Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Aug 14 10:59:16 2015 +0200 Ajout de logs sur les changements de coordonnées dans les objets métiers (refs #7431) --- .../java/fr/ird/observe/entities/Entities.java | 62 ++++++++++++++++++++-- .../entities/longline/ActivityLonglineImpl.java | 20 ++++--- .../observe/entities/longline/SetLonglineImpl.java | 47 ++++++++-------- .../observe/entities/seine/ActivitySeineImpl.java | 14 ++--- .../src/main/java/fr/ird/observe/util/Numbers.java | 17 ++++++ observe-swing/src/main/filters/log4j.properties | 4 +- .../src/main/filters/observe-log4j.properties | 4 +- 7 files changed, 115 insertions(+), 53 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java b/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java index f69517c..f31b317 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java @@ -22,10 +22,18 @@ package fr.ird.observe.entities; * #L% */ +import com.google.common.base.Joiner; +import com.google.common.base.Predicate; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import fr.ird.observe.ObserveDAOHelper; import fr.ird.observe.ObserveEntityEnum; +import fr.ird.observe.util.Numbers; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaId; @@ -43,6 +51,9 @@ import java.util.Map; */ public class Entities { + /** Logger. */ + private static final Log log = LogFactory.getLog(Entities.class); + public static final ObserveEntityEnum[] REFERENCE_COMMON_ENTITIES = new ObserveEntityEnum[]{ ObserveEntityEnum.VesselSizeCategory, @@ -289,8 +300,7 @@ public class Entities { ObserveEntityEnum.TripLongline }; - public static final ObserveEntityEnum[] ALL_ENTITIES = - ObserveEntityEnum.values(); + public static final ObserveEntityEnum[] ALL_ENTITIES = ObserveEntityEnum.values(); /** * @param klass le type d'entite a tester @@ -353,16 +363,58 @@ public class Entities { public static <E extends TopiaEntity> String getTableName(E entity) { ObserveEntityEnum entityEnum = ObserveEntityEnum.valueOf(entity); - return entityEnum.dbSchemaName()+"."+entityEnum.dbTableName(); + return entityEnum.dbSchemaName() + "." + entityEnum.dbTableName(); } public static boolean isSeineId(String id) { - return id.contains("Seine"); + return id.contains("Seine"); } public static boolean isLonglineId(String id) { - return id.contains("Longline"); + return id.contains("Longline"); + } + + public static void printDebugInformations(String propertyName, Object instance, Integer value) { + printDebugInformations0(propertyName, instance, Numbers.IS_INTEGER_CHANGED_TO_ZERO_OR_NULL, value); + } + + public static void printDebugInformations(String propertyName, Object instance, Float value) { + printDebugInformations0(propertyName, instance, Numbers.IS_FLOAT_CHANGED_TO_ZERO_OR_NULL, value); } + private static <O> void printDebugInformations0(String propertyName, Object instance, Predicate<O> nullPredicate, O value) { + if (log.isDebugEnabled()) { + String debugInformations = String.format("[%s] %s changed to %s", instance, propertyName, value); + if (nullPredicate.apply(value)) { + StackTraceElement[] stackTraceElements = new Throwable().getStackTrace(); + List<StackTraceElement> stackTraceElementList = Lists.newArrayList(stackTraceElements); + // on retire les deux premiers appels (printDebugInformations et printDebugInformations0) + stackTraceElementList.remove(0); + stackTraceElementList.remove(0); + String stackTrace = Joiner.on("\n\t").join(Iterables.filter(Arrays.asList(stackTraceElements), new StackTraceElementPredicate())); + debugInformations += "\n\t" + stackTrace; + } + log.debug(debugInformations); + } + + } + + private static class StackTraceElementPredicate implements Predicate<StackTraceElement> { + + static final ImmutableSet<String> matchingPatterns = ImmutableSet.of("org.nuiton.","fr.ird"); + + @Override + public boolean apply(StackTraceElement input) { + String className = input.getClassName(); + boolean keep = false; + for (String matchingPattern : matchingPatterns) { + if (className.contains(matchingPattern)) { + keep=true; + break; + } + } + return keep; + } + } } 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 3624037..0fcfc73 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,23 +23,20 @@ package fr.ird.observe.entities.longline; */ import com.google.common.base.MoreObjects; +import fr.ird.observe.entities.Entities; 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; import java.util.List; +import java.util.Objects; 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"; /** @@ -114,8 +111,8 @@ public class ActivityLonglineImpl extends ActivityLonglineAbstract { @Override public synchronized void setQuadrant(Integer quadrant) { - if (log.isDebugEnabled()) { - log.debug(String.format("[%s] Quadrant changed to %s", this, quadrant)); + if (!Objects.equals(this.quadrant, quadrant)){ + Entities.printDebugInformations(PROPERTY_QUADRANT, this, quadrant); } Integer old = this.quadrant; this.quadrant = quadrant; @@ -138,16 +135,17 @@ 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)); + if (!Objects.equals(this.latitude, latitude)) { + Entities.printDebugInformations(PROPERTY_LATITUDE, 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)); + if (!Objects.equals(this.longitude, longitude)) { + Entities.printDebugInformations(PROPERTY_LONGITUDE, this, longitude); } super.setLongitude(longitude); } 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 357f616..006448c 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 @@ -23,20 +23,17 @@ package fr.ird.observe.entities.longline; */ import com.google.common.base.MoreObjects; +import fr.ird.observe.entities.Entities; 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; +import java.util.Objects; 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() { @@ -53,8 +50,8 @@ public class SetLonglineImpl extends SetLonglineAbstract { } public void setSettingStartQuadrant(Integer settingStartQuadrant) { - if (log.isDebugEnabled()) { - log.debug(String.format("[%s] settingStartQuadrant changed to %s", this, settingStartQuadrant)); + if (!Objects.equals(getSettingStartQuadrant(), settingStartQuadrant)) { + Entities.printDebugInformations(PROPERTY_SETTING_START_QUADRANT, this, settingStartQuadrant); } fireOnPostWrite(PROPERTY_SETTING_START_QUADRANT, null, settingStartQuadrant); } @@ -64,8 +61,8 @@ public class SetLonglineImpl extends SetLonglineAbstract { } public void setSettingEndQuadrant(Integer settingEndQuadrant) { - if (log.isDebugEnabled()) { - log.debug(String.format("[%s] settingEndQuadrant changed to %s", this, settingEndQuadrant)); + if (!Objects.equals(getSettingEndQuadrant(), settingEndQuadrant)) { + Entities.printDebugInformations(PROPERTY_SETTING_END_QUADRANT, this, settingEndQuadrant); } fireOnPostWrite(PROPERTY_SETTING_END_QUADRANT, null, settingEndQuadrant); } @@ -75,8 +72,8 @@ public class SetLonglineImpl extends SetLonglineAbstract { } public void setHaulingStartQuadrant(Integer haulingStartQuadrant) { - if (log.isDebugEnabled()) { - log.debug(String.format("[%s] haulingStartQuadrant changed to %s", this, haulingStartQuadrant)); + if (!Objects.equals(getHaulingStartQuadrant(), haulingStartQuadrant)) { + Entities.printDebugInformations(PROPERTY_HAULING_START_QUADRANT, this, haulingStartQuadrant); } fireOnPostWrite(PROPERTY_HAULING_START_QUADRANT, null, haulingStartQuadrant); } @@ -86,56 +83,56 @@ public class SetLonglineImpl extends SetLonglineAbstract { } public void setHaulingEndQuadrant(Integer haulingEndQuadrant) { - if (log.isDebugEnabled()) { - log.debug(String.format("[%s] haulingEndQuadrant changed to %s", this, haulingEndQuadrant)); + if (!Objects.equals(getHaulingEndQuadrant(), haulingEndQuadrant)) { + Entities.printDebugInformations(PROPERTY_HAULING_END_QUADRANT, 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)); + if (!Objects.equals(this.settingStartLongitude, settingStartLongitude)) { + Entities.printDebugInformations(PROPERTY_SETTING_START_LONGITUDE, 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)); + if (!Objects.equals(this.settingStartLatitude, settingStartLatitude)) { + Entities.printDebugInformations(PROPERTY_SETTING_START_LATITUDE, 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)); + if (!Objects.equals(this.settingEndLatitude, settingEndLatitude)) { + Entities.printDebugInformations(PROPERTY_SETTING_END_LATITUDE, 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)); + if (!Objects.equals(this.settingEndLongitude, settingEndLongitude)) { + Entities.printDebugInformations(PROPERTY_SETTING_END_LONGITUDE, 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)); + if (!Objects.equals(this.haulingStartLongitude, haulingStartLongitude)) { + Entities.printDebugInformations(PROPERTY_HAULING_START_LONGITUDE, 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)); + if (!Objects.equals(this.haulingStartLatitude, haulingStartLatitude)) { + Entities.printDebugInformations(PROPERTY_HAULING_START_LATITUDE, this, haulingStartLatitude); } super.setHaulingStartLatitude(haulingStartLatitude); } 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 03ec623..9241a8c 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 @@ -22,6 +22,7 @@ package fr.ird.observe.entities.seine; import com.google.common.base.MoreObjects; +import fr.ird.observe.entities.Entities; import fr.ird.observe.entities.OpenableEntity; import fr.ird.observe.entities.constants.seine.SchoolType; import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine; @@ -32,6 +33,7 @@ import org.apache.commons.logging.LogFactory; import java.util.Arrays; import java.util.List; +import java.util.Objects; import static org.nuiton.i18n.I18n.n; @@ -122,8 +124,8 @@ public class ActivitySeineImpl extends ActivitySeineAbstract { @Override public void setQuadrant(Integer quadrant) { - if (log.isDebugEnabled()) { - log.debug(String.format("[%s] Quadrant changed to %s", this, quadrant)); + if (!Objects.equals(this.quadrant, quadrant)) { + Entities.printDebugInformations(PROPERTY_QUADRANT, this, quadrant); } Integer old = this.quadrant; // fireOnPreWrite(PROPERTY_QUADRANT, old, quadrant); @@ -204,16 +206,16 @@ 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)); + if (!Objects.equals(this.latitude, latitude)) { + Entities.printDebugInformations(PROPERTY_LATITUDE, 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)); + if (!Objects.equals(this.longitude, longitude)) { + Entities.printDebugInformations(PROPERTY_LONGITUDE, this, longitude); } super.setLongitude(longitude); } diff --git a/observe-entities/src/main/java/fr/ird/observe/util/Numbers.java b/observe-entities/src/main/java/fr/ird/observe/util/Numbers.java index 54a22b8..8a921ce 100644 --- a/observe-entities/src/main/java/fr/ird/observe/util/Numbers.java +++ b/observe-entities/src/main/java/fr/ird/observe/util/Numbers.java @@ -22,6 +22,7 @@ package fr.ird.observe.util; * #L% */ +import com.google.common.base.Predicate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -36,6 +37,22 @@ import java.math.MathContext; */ public class Numbers { + public static final Predicate<Float> IS_FLOAT_CHANGED_TO_ZERO_OR_NULL = new Predicate<Float>() { + + @Override + public boolean apply(Float input) { + return input == null || Math.abs(round3Digits(input)) < 0.001; + } + }; + + public static final Predicate<Integer> IS_INTEGER_CHANGED_TO_ZERO_OR_NULL = new Predicate<Integer>() { + + @Override + public boolean apply(Integer input) { + return input == null || input == 0; + } + }; + /** Logger. */ private static final Log log = LogFactory.getLog(Numbers.class); diff --git a/observe-swing/src/main/filters/log4j.properties b/observe-swing/src/main/filters/log4j.properties index 480b2f6..849c93f 100644 --- a/observe-swing/src/main/filters/log4j.properties +++ b/observe-swing/src/main/filters/log4j.properties @@ -41,9 +41,7 @@ log4j.appender.file.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %5p [%t] ( 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.entities.Entities=DEBUG log4j.logger.fr.ird.observe.validation.field=WARN log4j.logger.fr.ird.observe.ui.tree=INFO diff --git a/observe-swing/src/main/filters/observe-log4j.properties b/observe-swing/src/main/filters/observe-log4j.properties index a91c8dc..88e89d2 100644 --- a/observe-swing/src/main/filters/observe-log4j.properties +++ b/observe-swing/src/main/filters/observe-log4j.properties @@ -41,9 +41,7 @@ log4j.appender.file.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %5p [%t] ( 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.entities.Entities=DEBUG log4j.logger.fr.ird.observe.validation.field=WARN log4j.logger.fr.ird.observe.ui.tree=INFO -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 a782916087dd83c9ee580981ff5ed02714b73fb3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Aug 14 10:59:40 2015 +0200 Ne plus écouter les changements dans les ui (refs #7341) --- .../ird/observe/ui/content/ContentUIHandler.java | 45 ++++++++++------------ .../impl/longline/SetLonglineUIHandler.java | 35 ++++++++--------- .../impl/longline/ActivityLonglineUIHandler.java | 23 ++++++----- .../open/impl/seine/ActivitySeineUIHandler.java | 16 ++++---- 4 files changed, 57 insertions(+), 62 deletions(-) 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 48207fd..87d4411 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,7 +21,6 @@ */ 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; @@ -69,8 +68,6 @@ 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; @@ -859,25 +856,25 @@ public abstract class ContentUIHandler<E extends TopiaEntity> { } - 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())); - } - - } - - } - - } +// 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 4a2a4e8..102ccf2 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,7 +22,6 @@ 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; @@ -104,29 +103,29 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLongline> { } }; - private final LogPropertyChanges logCoordinatesChanges; +// 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); +// 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); +// this.logCoordinatesChanges = new LogPropertyChanges(COORDINATES_PROPERTIES); } @Override @@ -183,8 +182,8 @@ 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); +// getBean().removePropertyChangeListener(logCoordinatesChanges); +// getBean().addPropertyChangeListener(logCoordinatesChanges); } 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 2dea40f..59094f0 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,7 +22,6 @@ 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; @@ -71,18 +70,18 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity } - static ImmutableSet<String> COORDINATES_PROPERTIES = ImmutableSet.of(ActivityLongline.PROPERTY_QUADRANT, - ActivityLongline.PROPERTY_LATITUDE, - ActivityLongline.PROPERTY_LONGITUDE); +// static ImmutableSet<String> COORDINATES_PROPERTIES = ImmutableSet.of(ActivityLongline.PROPERTY_QUADRANT, +// ActivityLongline.PROPERTY_LATITUDE, +// ActivityLongline.PROPERTY_LONGITUDE); - private LogPropertyChanges logCoordinatesChanges; +// 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); +// this.logCoordinatesChanges = new LogPropertyChanges(COORDINATES_PROPERTIES); } @Override @@ -133,12 +132,12 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity return ContentMode.READ; } - @Override - public void initUI() throws Exception { - super.initUI(); - getBean().removePropertyChangeListener(logCoordinatesChanges); - getBean().addPropertyChangeListener(logCoordinatesChanges); - } +// @Override +// public void initUI() throws Exception { +// super.initUI(); +// getBean().removePropertyChangeListener(logCoordinatesChanges); +// getBean().addPropertyChangeListener(logCoordinatesChanges); +// } @Override public void openUI() throws Exception { 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 187d5d2..4ad839f 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,7 +21,6 @@ */ 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; @@ -72,6 +71,7 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei // Compute valid state of tab from the error table protected final TableModelListener computeTabValidStateListener = new TableModelListener() { + @Override public void tableChanged(TableModelEvent e) { @@ -81,11 +81,11 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei } }; - static ImmutableSet<String> COORDINATES_PROPERTIES = ImmutableSet.of(ActivitySeine.PROPERTY_QUADRANT, - ActivitySeine.PROPERTY_LATITUDE, - ActivitySeine.PROPERTY_LONGITUDE); +// static ImmutableSet<String> COORDINATES_PROPERTIES = ImmutableSet.of(ActivitySeine.PROPERTY_QUADRANT, +// ActivitySeine.PROPERTY_LATITUDE, +// ActivitySeine.PROPERTY_LONGITUDE); - private LogPropertyChanges logCoordinatesChanges; +// private LogPropertyChanges logCoordinatesChanges; public ActivitySeineUIHandler(ActivitySeineUI ui) { @@ -93,7 +93,7 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei DataContextType.Route, DataContextType.ActivitySeine, n("observe.activitySeine.message.not.open")); - this.logCoordinatesChanges = new LogPropertyChanges(COORDINATES_PROPERTIES); +// this.logCoordinatesChanges = new LogPropertyChanges(COORDINATES_PROPERTIES); } @Override @@ -162,8 +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); +// 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>.
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 4d9013a84b05f4b935c41e140a6823d2ed78d7d4 Merge: ea7f951 a782916 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Aug 14 10:59:49 2015 +0200 Ajout de logs sur le changement des entitées (refs-50 #7431). Merge branch 'feature/7431' into develop .../java/fr/ird/observe/entities/Entities.java | 62 +++++++++++++-- .../entities/longline/ActivityLonglineImpl.java | 35 +++++++- .../observe/entities/longline/SetLonglineImpl.java | 93 +++++++++++++++++++++- .../observe/entities/seine/ActivitySeineImpl.java | 33 +++++++- .../src/main/java/fr/ird/observe/util/Numbers.java | 17 ++++ observe-swing/src/main/filters/log4j.properties | 4 +- .../src/main/filters/observe-log4j.properties | 3 +- .../ird/observe/ui/content/ContentUIHandler.java | 22 +++++ .../impl/longline/SetLonglineUIHandler.java | 25 +++++- .../impl/longline/ActivityLonglineUIHandler.java | 16 +++- .../open/impl/seine/ActivitySeineUIHandler.java | 11 +++ 11 files changed, 304 insertions(+), 17 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 8f79f13acf490f448273ebdb9d29df063ce7c1c9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Aug 14 11:00:41 2015 +0200 Move to java 7 --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index d230ffd..ae606be 100644 --- a/pom.xml +++ b/pom.xml @@ -133,6 +133,12 @@ <!-- Site configuration --> <locales>fr</locales> + <javaVersion>1.7</javaVersion> + <!--<maven.compiler.source>${javaVersion}</maven.compiler.source>--> + <!--<maven.compiler.target>${javaVersion}</maven.compiler.target>--> + <signatureArtifactId>java17</signatureArtifactId> + <signatureVersion>1.0</signatureVersion> + </properties> <repositories> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm