branch develop updated (2bdb052 -> fa0a49c)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 2bdb052 [LL] Formulaire Composition détaillée / onglet "Détail Avançon" : Quelques améliorations (Fixes #6769) Merge branch 'feature/6769' into develop new 96c9189 Clean code + create set if possible (PS) new 4710a85 Clean code + create set if possible (LL) new fa0a49c [LL/PS] amélioration sur l'écran activité (Fixes #6834) Merge branch 'feature/6834' into develop The 3 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 fa0a49c7ecd953ca041a661e9f95362367ccedf6 Merge: 2bdb052 4710a85 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 25 18:19:00 2016 +0200 [LL/PS] amélioration sur l'écran activité (Fixes #6834) Merge branch 'feature/6834' into develop commit 4710a85678729e0e4124c678b5183b4aad68e1df Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 25 18:18:57 2016 +0200 Clean code + create set if possible (LL) commit 96c9189f788145d2ee2706d291b65a5a4aa75ffc Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 25 18:12:33 2016 +0200 Clean code + create set if possible (PS) Summary of changes: .../impl/longline/ActivityLonglineUIHandler.java | 28 ++++++++++------------ .../open/impl/seine/ActivitySeineUIHandler.java | 23 +++++++----------- .../loadors/ActivityLonglineNodeChildLoador.java | 9 +++---- 3 files changed, 26 insertions(+), 34 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 observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 96c9189f788145d2ee2706d291b65a5a4aa75ffc Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 25 18:12:33 2016 +0200 Clean code + create set if possible (PS) --- .../open/impl/seine/ActivitySeineUIHandler.java | 23 +++++++++------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java index 880f0b3..999bfb8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java @@ -42,6 +42,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; +import javax.swing.SwingUtilities; import javax.swing.event.TableModelListener; import java.util.HashSet; import java.util.Set; @@ -61,19 +62,11 @@ class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySeineDto> // Compute valid state of tab from the error table protected final TableModelListener computeTabValidStateListener; -// static ImmutableSet<String> COORDINATES_PROPERTIES = ImmutableSet.of(ActivitySeine.PROPERTY_QUADRANT, -// ActivitySeine.PROPERTY_LATITUDE, -// ActivitySeine.PROPERTY_LONGITUDE); - -// private LogPropertyChanges logCoordinatesChanges; - - ActivitySeineUIHandler(ActivitySeineUI ui) { super(ui, DataContextType.Route, DataContextType.ActivitySeine, n("observe.storage.activitySeine.message.not.open")); -// this.logCoordinatesChanges = new LogPropertyChanges(COORDINATES_PROPERTIES); computeTabValidStateListener = e -> { SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource(); @@ -166,8 +159,6 @@ class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySeineDto> // listen messages to see if required to add getUi().getErrorTableModel().addTableModelListener(computeTabValidStateListener); -// getBean().removePropertyChangeListener(logCoordinatesChanges); -// getBean().addPropertyChangeListener(logCoordinatesChanges); } @Override @@ -292,15 +283,20 @@ class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySeineDto> obtainChildPosition(bean); - // ouverture de l'activité après création if (notPersisted) { + // ouverture de l'activité après création getOpenDataManager().openActivitySeine(getSelectedParentId(), bean.getId()); + + if (bean.getReasonForNoFishing() == null) { + // création de l'opération de pêche + SwingUtilities.invokeLater(() -> getUi().getAddSet().doClick()); + } + } return true; } - @Override protected int getOpenablePosition(String parentId, ActivitySeineDto bean) { return getActivitySeineService().getActivitySeinePositionInRoute(parentId, bean.getId()); @@ -337,9 +333,8 @@ class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySeineDto> Set<ReferentialReference<VesselActivitySeineDto>> activities = getDataSource().getReferentialReferences(VesselActivitySeineDto.class); for (ReferentialReference<VesselActivitySeineDto> vesselActivity : activities) { + //FIXME Il serait mieux d'utiliser le topiaId if (ActivitySeineDto.ACTIVITY_FIN_DE_PECHE.equals(vesselActivity.getPropertyValue(VesselActivitySeineDto.PROPERTY_CODE))) { - // String label = getDecoratorService().decorate(VesselActivitySeineDto.class.getSimpleName(), -// vesselActivity); return getDecoratorService().getReferentialReferenceDecorator(VesselActivitySeineDto.class).toString(vesselActivity); } } -- 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 observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 4710a85678729e0e4124c678b5183b4aad68e1df Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 25 18:18:57 2016 +0200 Clean code + create set if possible (LL) --- .../impl/longline/ActivityLonglineUIHandler.java | 28 ++++++++++------------ .../loadors/ActivityLonglineNodeChildLoador.java | 9 +++---- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java index 22f927f..1931971 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java @@ -28,6 +28,7 @@ import fr.ird.observe.application.swing.db.constants.DataContextType; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIModel; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIHandler; +import fr.ird.observe.application.swing.ui.tree.loadors.ActivityLonglineNodeChildLoador; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.ActivityLonglineHelper; @@ -38,6 +39,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; +import javax.swing.SwingUtilities; + import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; @@ -54,23 +57,17 @@ class ActivityLonglineUIHandler extends ContentOpenableUIHandler<ActivityLonglin static { + //FIXME Remove this n("observe.common.latitude"); n("observe.common.longitude"); } -// 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.storage.activityLongline.message.not.open")); -// this.logCoordinatesChanges = new LogPropertyChanges(COORDINATES_PROPERTIES); } @Override @@ -139,13 +136,6 @@ class ActivityLonglineUIHandler extends ContentOpenableUIHandler<ActivityLonglin return ContentMode.READ; } -// @Override -// public void initUI() { -// super.initUI(); -// getBean().removePropertyChangeListener(logCoordinatesChanges); -// getBean().addPropertyChangeListener(logCoordinatesChanges); -// } - @Override public void openUI() { super.openUI(); @@ -190,7 +180,7 @@ class ActivityLonglineUIHandler extends ContentOpenableUIHandler<ActivityLonglin if (log.isDebugEnabled()) { log.debug(" long - lat = " + bean.getLongitude() + - " - " + bean.getLatitude()); + " - " + bean.getLatitude()); } finalizeOpenUI(mode, create); @@ -261,9 +251,15 @@ class ActivityLonglineUIHandler extends ContentOpenableUIHandler<ActivityLonglin obtainChildPosition(bean); - // ouverture de l'activité après création if (notPersisted) { + // ouverture de l'activité après création getOpenDataManager().openActivityLongline(getSelectedParentId(), bean.getId()); + + if (ActivityLonglineNodeChildLoador.FISHING_OPERATION_ID.equals(bean.getVesselActivityLongline().getId())) { + + // création de l'opération de pêche + SwingUtilities.invokeLater(() -> getUi().getAddSet().doClick()); + } } return true; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java index b0b4ad2..0987095 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java @@ -31,8 +31,6 @@ import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.EncounterDto; import fr.ird.observe.services.dto.longline.SensorUsedDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.tree.NavTreeBridge; @@ -50,12 +48,15 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<Cla private static final long serialVersionUID = 1L; + public final static String FISHING_OPERATION_ID = + "fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1239832686138#0.1"; // operation de peche + private final static ImmutableSet<String> ENCOUNTERS_ID = ImmutableSet.of( - "fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1239832686138#0.1", // operation de peche + FISHING_OPERATION_ID, // operation de peche "fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1239832686138#0.4" // rencontre interaction ); private final static ImmutableSet<String> SENSOR_USED_ID = ImmutableSet.of( - "fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1239832686138#0.1", // operation de peche + FISHING_OPERATION_ID, // operation de peche "fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1239832686138#0.3" // station oceanographique ); -- 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 observe. See https://gitlab.nuiton.org/codelutin/observe.git commit fa0a49c7ecd953ca041a661e9f95362367ccedf6 Merge: 2bdb052 4710a85 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 25 18:19:00 2016 +0200 [LL/PS] amélioration sur l'écran activité (Fixes #6834) Merge branch 'feature/6834' into develop .../impl/longline/ActivityLonglineUIHandler.java | 28 ++++++++++------------ .../open/impl/seine/ActivitySeineUIHandler.java | 23 +++++++----------- .../loadors/ActivityLonglineNodeChildLoador.java | 9 +++---- 3 files changed, 26 insertions(+), 34 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm