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>.