- Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] 3 commits: use last pom
by Tony CHEMIT Dec. 21, 2017

Dec. 21, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a1972b3f by Tony CHEMIT at 2017-12-21T23:50:56+01:00 use last pom - - - - - 585362bc by Tony CHEMIT at 2017-12-21T23:51:09+01:00 start to clean simple form ui - - - - - 88c02b77 by Tony CHEMIT at 2017-12-22T00:15:43+01:00 use next toolkit - - - - - 6 changed files: - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/BranchlineUI.jcss - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/SetLonglineGlobalCompositionObsUI.jcss - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/SetLonglineObsUI.jcss - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/FloatingObjectUI.jcss - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/SetSeineUI.jcss - pom.xml Changes: ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/BranchlineUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/BranchlineUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/BranchlineUI.jcss @@ -37,75 +37,44 @@ #depthRecorder { horizontalTextPosition:{JLabel.LEFT}; - _propertyName:{BranchlineDto.PROPERTY_DEPTH_RECORDER}; - selected:{BooleanUtils.isTrue(bean.getDepthRecorder())}; } #hookLost { horizontalTextPosition:{JLabel.LEFT}; - _propertyName:{BranchlineDto.PROPERTY_HOOK_LOST}; - selected:{BooleanUtils.isTrue(bean.getHookLost())}; } #traceCutOff { horizontalTextPosition:{JLabel.LEFT}; - _propertyName:{BranchlineDto.PROPERTY_TRACE_CUT_OFF}; - selected:{BooleanUtils.isTrue(bean.getTraceCutOff())}; } #timer { horizontalTextPosition:{JLabel.LEFT}; - _propertyName:{BranchlineDto.PROPERTY_TIMER}; - selected:{BooleanUtils.isTrue(bean.getTimer())}; } #timeSinceContact { enabled:{BooleanUtils.isTrue(bean.getTimer())}; - propertyTime:{BranchlineDto.PROPERTY_TIME_SINCE_CONTACT}; - time:{model.getTimeSinceContact()}; - bean:{model}; showTimeEditorSlider:false; } #timerTimeOnBoard { enabled:{BooleanUtils.isTrue(bean.getTimer())}; - date:{bean.getTimerTimeOnBoard()}; showTimeEditorSlider:false; - propertyDate: {BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD}; -} - -#topType { - property:{BranchlineDto.PROPERTY_TOP_TYPE}; - selectedItem:{bean.getTopType()}; -} - -#tracelineType { - property:{BranchlineDto.PROPERTY_TRACELINE_TYPE}; - selectedItem:{bean.getTracelineType()}; } #weightedSwivel { horizontalTextPosition:{JLabel.LEFT}; - _propertyName:{BranchlineDto.PROPERTY_WEIGHTED_SWIVEL}; - selected:{BooleanUtils.isTrue(bean.getWeightedSwivel())}; } #swivelWeight { enabled:{BooleanUtils.isTrue(bean.getWeightedSwivel())}; - property:{BranchlineDto.PROPERTY_SWIVEL_WEIGHT}; - numberValue:{bean.getSwivelWeight()}; } #weightedSnap { horizontalTextPosition:{JLabel.LEFT}; - _propertyName:{BranchlineDto.PROPERTY_WEIGHTED_SNAP}; - selected:{BooleanUtils.isTrue(bean.getWeightedSnap())}; } #snapWeight { enabled:{BooleanUtils.isTrue(bean.getWeightedSnap())}; - property:{BranchlineDto.PROPERTY_SNAP_WEIGHT}; - numberValue:{bean.getSnapWeight()}; } /* ***************************************************************************** */ @@ -115,33 +84,3 @@ #hookAndBaitTab { properties:{BranchlineUIModel.HOOK_AND_BAIT_TAB_PROPERTIES}; } - -#hookType { - property:{BranchlineDto.PROPERTY_HOOK_TYPE}; - selectedItem:{bean.getHookType()}; -} - -#hookSize { - property:{BranchlineDto.PROPERTY_HOOK_SIZE}; - selectedItem:{bean.getHookSize()}; -} - -#hookOffset { - property:{BranchlineDto.PROPERTY_HOOK_OFFSET}; - numberValue:{bean.getHookOffset()}; -} - -#baitSettingStatus { - property:{BranchlineDto.PROPERTY_BAIT_SETTING_STATUS}; - selectedItem:{bean.getBaitSettingStatus()}; -} - -#baitHaulingStatus { - property:{BranchlineDto.PROPERTY_BAIT_HAULING_STATUS}; - selectedItem:{bean.getBaitHaulingStatus()}; -} - -#baitType { - property:{BranchlineDto.PROPERTY_BAIT_TYPE}; - selectedItem:{bean.getBaitType()}; -} ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/SetLonglineGlobalCompositionObsUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/SetLonglineGlobalCompositionObsUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/SetLonglineGlobalCompositionObsUI.jcss @@ -44,9 +44,6 @@ } #mitigationType { - bean:{bean}; - property: {SetLonglineGlobalCompositionObsDto.PROPERTY_MITIGATION_TYPE}; - selected:{(Collection)bean.getMitigationType()}; showListLabel: true; universeLabel:{t("observe.common.SetLonglineGlobalCompositionObsDto.availableMitigationType")}; selectedLabel:{t("observe.common.SetLonglineGlobalCompositionObsDto.selectedMitigationType")}; ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/SetLonglineObsUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/SetLonglineObsUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/longline/SetLonglineObsUI.jcss @@ -36,43 +36,21 @@ } #homeId { - property: {SetLonglineObsDto.PROPERTY_HOME_ID}; resetTip:"observe.common.SetLonglineObsDto.action.reset.homeId.tip"; } -#number { - property: {SetLonglineObsDto.PROPERTY_NUMBER}; - numberValue:{bean.getNumber()}; -} - -#settingStartTimeStamp { - date:{bean.getSettingStartTimeStamp()}; - propertyDate: {SetLonglineObsDto.PROPERTY_SETTING_START_TIME_STAMP}; -} - #settingStartCoordinates { propertyLatitude:{SetLonglineObsDto.PROPERTY_SETTING_START_LATITUDE}; propertyLongitude:{SetLonglineObsDto.PROPERTY_SETTING_START_LONGITUDE}; propertyQuadrant:{SetLonglineObsDto.PROPERTY_SETTING_START_QUADRANT}; - latitude:{bean.getSettingStartLatitude()}; - longitude:{bean.getSettingStartLongitude()}; - quadrant:{bean.getSettingStartQuadrant()}; - _validationContext:{"settingStart"}; -} - -#settingEndTimeStamp { - date:{bean.getSettingEndTimeStamp()}; - propertyDate: {SetLonglineObsDto.PROPERTY_SETTING_END_TIME_STAMP}; + property:settingStart; } #settingEndCoordinates { propertyLatitude:{SetLonglineObsDto.PROPERTY_SETTING_END_LATITUDE}; propertyLongitude:{SetLonglineObsDto.PROPERTY_SETTING_END_LONGITUDE}; propertyQuadrant:{SetLonglineObsDto.PROPERTY_SETTING_END_QUADRANT}; - latitude:{bean.getSettingEndLatitude()}; - longitude:{bean.getSettingEndLongitude()}; - quadrant:{bean.getSettingEndQuadrant()}; - _validationContext:{"settingEnd"}; + property:settingEnd; } /* ***************************************************************************** */ @@ -83,115 +61,43 @@ properties:{SetLonglineObsUIModel.SETTING_CARACTERISTIC_TAB_PROPERTIES}; } -#settingVesselSpeed { - property:{SetLonglineObsDto.PROPERTY_SETTING_VESSEL_SPEED}; - numberValue:{bean.getSettingVesselSpeed()}; -} - #shooterUsed { horizontalTextPosition:{JLabel.LEFT}; - _propertyName:{SetLonglineObsDto.PROPERTY_SHOOTER_USED}; - selected:{BooleanUtils.isTrue(bean.getShooterUsed())}; } #shooterSpeed { enabled:{BooleanUtils.isTrue(bean.getShooterUsed())}; - property:{SetLonglineObsDto.PROPERTY_SHOOTER_SPEED}; - numberValue:{bean.getShooterSpeed()}; } -#settingShape { - property:{SetLonglineObsDto.PROPERTY_SETTING_SHAPE}; - selectedItem:{bean.getSettingShape()}; -} #weightedSwivel { horizontalTextPosition:{JLabel.LEFT}; - _propertyName:{SetLonglineObsDto.PROPERTY_WEIGHTED_SWIVEL}; - selected:{BooleanUtils.isTrue(bean.getWeightedSwivel())}; } #swivelWeight { enabled:{BooleanUtils.isTrue(bean.getWeightedSwivel())}; - property:{SetLonglineObsDto.PROPERTY_SWIVEL_WEIGHT}; - numberValue:{bean.getSwivelWeight()}; } #weightedSnap { horizontalTextPosition:{JLabel.LEFT}; - _propertyName:{SetLonglineObsDto.PROPERTY_WEIGHTED_SNAP}; - selected:{BooleanUtils.isTrue(bean.getWeightedSnap())}; } #snapWeight { enabled:{BooleanUtils.isTrue(bean.getWeightedSnap())}; - property:{SetLonglineObsDto.PROPERTY_SNAP_WEIGHT}; - numberValue:{bean.getSnapWeight()}; -} - -#lineType { - property:{SetLonglineObsDto.PROPERTY_LINE_TYPE}; - selectedItem:{bean.getLineType()}; -} - -#maxDepthTargeted { - property:{SetLonglineObsDto.PROPERTY_MAX_DEPTH_TARGETED}; - numberValue:{bean.getMaxDepthTargeted()}; } #monitored { horizontalTextPosition:{JLabel.LEFT}; - _propertyName:{SetLonglineObsDto.PROPERTY_MONITORED}; - selected:{BooleanUtils.isTrue(bean.getMonitored())}; } #lightsticksType { - property:{SetLonglineObsDto.PROPERTY_LIGHTSTICKS_TYPE}; - selectedItem:{bean.getLightsticksType()}; enabled:{bean.getLightsticksPerBasketCount() !=null && bean.getLightsticksPerBasketCount() > 0}; } #lightsticksColor { - property:{SetLonglineObsDto.PROPERTY_LIGHTSTICKS_COLOR}; - selectedItem:{bean.getLightsticksColor()}; enabled:{bean.getLightsticksPerBasketCount() !=null && bean.getLightsticksPerBasketCount() > 0}; } -#timeBetweenHooks { - property:{SetLonglineObsDto.PROPERTY_TIME_BETWEEN_HOOKS}; - numberValue:{bean.getTimeBetweenHooks()}; -} - -#lightsticksPerBasketCount { - property:{SetLonglineObsDto.PROPERTY_LIGHTSTICKS_PER_BASKET_COUNT}; - numberValue:{bean.getLightsticksPerBasketCount()}; -} - -#basketsPerSectionCount { - property:{SetLonglineObsDto.PROPERTY_BASKETS_PER_SECTION_COUNT}; - numberValue:{bean.getBasketsPerSectionCount()}; -} - -#totalBasketsCount { - property:{SetLonglineObsDto.PROPERTY_TOTAL_BASKETS_COUNT}; - numberValue:{bean.getTotalBasketsCount()}; -} - -#branchlinesPerBasketCount { - property:{SetLonglineObsDto.PROPERTY_BRANCHLINES_PER_BASKET_COUNT}; - numberValue:{bean.getBranchlinesPerBasketCount()}; -} - -#totalSectionsCount { - property:{SetLonglineObsDto.PROPERTY_TOTAL_SECTIONS_COUNT}; - numberValue:{bean.getTotalSectionsCount()}; -} - -#totalHooksCount { - property:{SetLonglineObsDto.PROPERTY_TOTAL_HOOKS_COUNT}; - numberValue:{bean.getTotalHooksCount()}; -} - /* ***************************************************************************** */ /* HAULING TAB **************************************************************** */ /* ***************************************************************************** */ @@ -200,42 +106,16 @@ properties:{SetLonglineObsUIModel.HAULING_TAB_PROPERTIES}; } -#haulingDirectionSameAsSetting { - booleanValue:{bean.getHaulingDirectionSameAsSetting()}; - _propertyName: {SetLonglineObsDto.PROPERTY_HAULING_DIRECTION_SAME_AS_SETTING}; -} - -#haulingStartTimeStamp { - date:{bean.getHaulingStartTimeStamp()}; - propertyDate: {SetLonglineObsDto.PROPERTY_HAULING_START_TIME_STAMP}; -} - #haulingStartCoordinates { propertyLatitude:{SetLonglineObsDto.PROPERTY_HAULING_START_LATITUDE}; propertyLongitude:{SetLonglineObsDto.PROPERTY_HAULING_START_LONGITUDE}; propertyQuadrant:{SetLonglineObsDto.PROPERTY_HAULING_START_QUADRANT}; - latitude:{bean.getHaulingStartLatitude()}; - longitude:{bean.getHaulingStartLongitude()}; - quadrant:{bean.getHaulingStartQuadrant()}; - _validationContext:{"haulingStart"}; -} - -#haulingEndTimeStamp { - date:{bean.getHaulingEndTimeStamp()}; - propertyDate: {SetLonglineObsDto.PROPERTY_HAULING_END_TIME_STAMP}; + property:haulingStart; } #haulingEndCoordinates { propertyLatitude:{SetLonglineObsDto.PROPERTY_HAULING_END_LATITUDE}; propertyLongitude:{SetLonglineObsDto.PROPERTY_HAULING_END_LONGITUDE}; propertyQuadrant:{SetLonglineObsDto.PROPERTY_HAULING_END_QUADRANT}; - latitude:{bean.getHaulingEndLatitude()}; - longitude:{bean.getHaulingEndLongitude()}; - quadrant:{bean.getHaulingEndQuadrant()}; - _validationContext:{"haulingEnd"}; -} - -#haulingBreaks { - property:{SetLonglineObsDto.PROPERTY_HAULING_BREAKS}; - numberValue:{bean.getHaulingBreaks()}; + property:haulingEnd; } ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/FloatingObjectUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/FloatingObjectUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/FloatingObjectUI.jcss @@ -53,8 +53,6 @@ BeanComboBox { } #objectOperation { - property:{FloatingObjectDto.PROPERTY_OBJECT_OPERATION}; - selectedItem:{bean.getObjectOperation()}; enabled:{model.isCreatingMode()}; } @@ -93,7 +91,6 @@ BeanComboBox { } #supportVesselName { - property:{FloatingObjectDto.PROPERTY_SUPPORT_VESSEL_NAME}; resetTip:"observe.common.DataDto.action.reset.supportVesselName.tip"; } ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/SetSeineUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/SetSeineUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/seine/SetSeineUI.jcss @@ -36,8 +36,6 @@ } #startTime { - propertyDate:{SetSeineDto.PROPERTY_START_TIME}; - date:{bean.getStartTime()}; dateEditable:false; } @@ -45,37 +43,18 @@ propertyDate: {SetSeineDto.PROPERTY_END_PURSING_TIME_STAMP}; propertyDayDate: {SetSeineDto.PROPERTY_END_PURSING_DATE}; propertyTimeDate: {SetSeineDto.PROPERTY_END_PURSING_TIME}; - date:{bean.getEndPursingTimeStamp()}; } #endSetTimeStamp { propertyDate: {SetSeineDto.PROPERTY_END_SET_TIME_STAMP}; propertyDayDate: {SetSeineDto.PROPERTY_END_SET_DATE}; propertyTimeDate: {SetSeineDto.PROPERTY_END_SET_TIME}; - date:{bean.getEndSetTimeStamp()}; -} - -#reasonForNullSet { - property:{SetSeineDto.PROPERTY_REASON_FOR_NULL_SET}; - selectedItem:{bean.getReasonForNullSet()}; } #supportVesselName { - _propertyName:{SetSeineDto.PROPERTY_SUPPORT_VESSEL_NAME}; - property:{SetSeineDto.PROPERTY_SUPPORT_VESSEL_NAME}; resetTip:"observe.common.DataDto.action.reset.supportVesselName.tip"; } -#targetDiscarded { - _propertyName:{SetSeineDto.PROPERTY_TARGET_DISCARDED}; - booleanValue:{bean.getTargetDiscarded()}; -} - -#nonTargetDiscarded { - _propertyName:{SetSeineDto.PROPERTY_NON_TARGET_DISCARDED}; - booleanValue:{bean.getNonTargetDiscarded()}; -} - #schoolTypeLabel { actionIcon:info; toolTipText:"observe.common.SetSeineDto.message.information.schoolType"; @@ -90,41 +69,6 @@ border:{new TitledBorder(null, t("observe.common.SetSeineDto.sonarUsedAvantSet", 1, 0, getFont()))}; } -#schoolThickness { - property:{SetSeineDto.PROPERTY_SCHOOL_THICKNESS}; - numberValue:{bean.getSchoolThickness()}; -} - -#schoolMeanDepth { - property:{SetSeineDto.PROPERTY_SCHOOL_MEAN_DEPTH}; - numberValue:{bean.getSchoolMeanDepth()}; -} - -#schoolTopDepth { - property:{SetSeineDto.PROPERTY_SCHOOL_TOP_DEPTH}; - numberValue:{bean.getSchoolTopDepth()}; -} - -#currentMeasureDepth { - property:{SetSeineDto.PROPERTY_CURRENT_MEASURE_DEPTH}; - numberValue:{bean.getCurrentMeasureDepth()}; -} - -#currentSpeed { - property:{SetSeineDto.PROPERTY_CURRENT_SPEED}; - numberValue:{bean.getCurrentSpeed()}; -} - -#currentDirection { - property:{SetSeineDto.PROPERTY_CURRENT_DIRECTION}; - numberValue:{bean.getCurrentDirection()}; -} - -#maxGearDepth { - property:{SetSeineDto.PROPERTY_MAX_GEAR_DEPTH}; - numberValue:{bean.getMaxGearDepth()}; -} - #delete { _toolTipText:{t("observe.action.delete.set.tip")}; } ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>2017.9</version> + <version>2017.10</version> </parent> <artifactId>ird-observe</artifactId> @@ -144,8 +144,7 @@  <observe.model.version>6.904</observe.model.version> - <lib.version.java4all.toolkit>2.0-alpha-2-SNAPSHOT</lib.version.java4all.toolkit> - <lib.version.java4all.jaxx>3.0-alpha-23-SNAPSHOT</lib.version.java4all.jaxx> + <lib.version.java4all.toolkit>2.0-alpha-2</lib.version.java4all.toolkit>  <license.licenseName>gpl_v3</license.licenseName> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/baec96e5059068c2a48461457c… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/baec96e5059068c2a48461457c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] remove a lot of not clever code (yes it's mine...), we have nearly done all to…
by Tony CHEMIT Dec. 21, 2017

Dec. 21, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: baec96e5 by Tony CHEMIT at 2017-12-21T20:48:04+01:00 remove a lot of not clever code (yes it's mine...), we have nearly done all to do on oepn data ui (at laaaaast pff) - - - - - 25 changed files: - client/src/main/java/fr/ird/observe/client/ds/editor/form/MoveDataHelper.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/ActivityLonglineObsUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/TripLonglineUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/RouteUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/TripSeineUIModel.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/CommonOpenDataListFormUI.jcss - − client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/OpenDataListFormUIMoveMultipleTripActionSupport.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/ActivityLonglineObsListUI.jaxx - client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/ActivityLonglineObsListUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/TripLonglineListUI.jaxx - client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/TripLonglineListUIModel.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/actions/OpenDataListFormUICreateActivityLonglineObs.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/actions/OpenDataListFormUIMoveMultipleActivityLonglineObs.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/actions/OpenDataListFormUIMoveMultipleTripLongline.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/ActivitySeineListUI.jaxx - client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/ActivitySeineListUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/RouteListUI.jaxx - client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/RouteListUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/TripSeineListUI.jaxx - client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/TripSeineListUIModel.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/actions/OpenDataListFormUICreateActivitySeine.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/actions/OpenDataListFormUIMoveMultipleActivitySeine.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/actions/OpenDataListFormUIMoveMultipleRoute.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/actions/OpenDataListFormUIMoveMultipleTripSeine.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/MoveDataHelper.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/MoveDataHelper.java +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/MoveDataHelper.java @@ -22,6 +22,7 @@ package fr.ird.observe.client.ds.editor.form; * #L% */ +import fr.ird.observe.client.ClientApplicationContext; import fr.ird.observe.client.ObserveClientApplicationContext; import fr.ird.observe.client.ds.editor.tree.navigation.NavigationTree; import fr.ird.observe.client.ds.editor.tree.navigation.nodes.NavigationTreeNodeSupport; @@ -30,7 +31,6 @@ import fr.ird.observe.client.ds.editor.tree.navigation.nodes.longline.TripLongli import fr.ird.observe.client.ds.editor.tree.navigation.nodes.seine.RouteSeineNavigationTreeNode; import fr.ird.observe.client.ds.editor.tree.navigation.nodes.seine.TripSeineListNavigationTreeNode; import fr.ird.observe.client.ds.editor.tree.navigation.nodes.seine.TripSeineNavigationTreeNode; -import fr.ird.observe.client.main.MainUI; import fr.ird.observe.client.util.DecoratedNodeEntity; import fr.ird.observe.dto.IdHelper; import fr.ird.observe.dto.data.longline.TripLonglineReference; @@ -38,15 +38,14 @@ import fr.ird.observe.dto.data.seine.RouteReference; import fr.ird.observe.dto.data.seine.TripSeineReference; import fr.ird.observe.dto.decoration.decorators.DataReferenceDecorator; import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator; -import fr.ird.observe.dto.referential.GearType; +import fr.ird.observe.dto.referential.ProgramDto; import fr.ird.observe.dto.referential.ProgramReference; +import fr.ird.observe.spi.application.ObserveApplicationDataContext; -import javax.swing.JOptionPane; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; -import java.util.Optional; - -import static org.nuiton.i18n.I18n.t; +import java.util.Set; /** * Created by tchemit on 26/11/17. @@ -55,135 +54,101 @@ import static org.nuiton.i18n.I18n.t; */ public class MoveDataHelper { - public static Optional<String> chooseNewTripLongline(MainUI ui, NavigationTreeNodeSupport oldParentNode) { - - NavigationTreeNodeSupport programNode = oldParentNode.getParent(); - String oldTripLonglineId = oldParentNode.getId(); - int tripLonglineNb = programNode.getChildCount(); + public static void moveTrips(NavigationTree treeHelper, String newParentId, Set<String> dataIds, List<Integer> positions, NavigationTreeNodeSupport oldParentNode) { ObserveClientApplicationContext applicationContext = ObserveClientApplicationContext.get(); - DataReferenceDecorator<TripLonglineReference> decorator = applicationContext.getDataReferenceDecorator(TripLonglineReference.class, null); + ObserveApplicationDataContext openDataManager = applicationContext.getApplicationDataContext(); - //on crée un tableau avec une marée en moins car on ne propose pas la marée actuelle - DecoratedNodeEntity[] decoratedTripLonglines = new DecoratedNodeEntity[tripLonglineNb - 1]; + NavigationTreeNodeSupport rootNode = treeHelper.getRootNode(); + NavigationTreeNodeSupport newProgramNode = treeHelper.getChild(rootNode, newParentId); - int j = 0; - for (int i = 0; i < tripLonglineNb; i++) { + Iterator<String> iterator = dataIds.iterator(); + for (Integer position : positions) { - TripLonglineNavigationTreeNode tripLonglineNode = (TripLonglineNavigationTreeNode) programNode.getChildAt(i); + String tripId = iterator.next(); + NavigationTreeNodeSupport tripNode = treeHelper.getChild(oldParentNode, tripId); + boolean wasOpen = tripNode.isOpen(); + treeHelper.removeNode(tripNode); - String tripLonglineId = tripLonglineNode.getId(); + if (wasOpen) { + openDataManager.close(ProgramDto.class); + openDataManager.open(ProgramDto.class, newParentId); + } + + NavigationTreeNodeSupport newTripNode = treeHelper.getChild(newProgramNode, tripId); + + if (newTripNode == null) { - if (!oldTripLonglineId.equals(tripLonglineId)) { - decoratedTripLonglines[j++] = DecoratedNodeEntity.newDecoratedNodeEntity(tripLonglineNode, decorator); + // create it + treeHelper.insertNode(newProgramNode, tripNode, position); } } - Object decoratedTripLongline = JOptionPane.showInputDialog(ui, - t("observe.action.choose.tripLongline.message"), - t("observe.action.choose.tripLongline.title"), - JOptionPane.QUESTION_MESSAGE, - null, - decoratedTripLonglines, - null); - return Optional.ofNullable(decoratedTripLongline != null ? ((DecoratedNodeEntity) decoratedTripLongline).getId() : null); + treeHelper.reloadNode(oldParentNode, true); + treeHelper.reloadNode(newProgramNode, true); + treeHelper.selectNode(newProgramNode); + } - public static Optional<String> chooseNewRoute(MainUI ui, NavigationTreeNodeSupport oldParentNode) { + public static DecoratedNodeEntity[] getTripLonglineParentCandidates(FormUI ui, String parentId) { - NavigationTreeNodeSupport routesNode = oldParentNode.getParent(); - String oldRouteId = oldParentNode.getId(); - int routeNb = routesNode.getChildCount(); + NavigationTree treeHelper = ui.getDataSourceUI().getTree(); - ObserveClientApplicationContext applicationContext = ObserveClientApplicationContext.get(); - DataReferenceDecorator<RouteReference> decorator = applicationContext.getDecoratorService().getDataReferenceDecorator(RouteReference.class); + NavigationTreeNodeSupport rootNode = treeHelper.getRootNode(); - //on crée un tableau avec une route en moins car on ne propose pas la route actuel - DecoratedNodeEntity[] decoratedRoutes = new DecoratedNodeEntity[routeNb - 1]; + List<DecoratedNodeEntity> result = new ArrayList<>(); - int j = 0; - for (int i = 0; i < routeNb; i++) { + ReferentialReferenceDecorator<ProgramReference> programDecorator = ui.getMainUI().getApplicationContext().getDecoratorService().getReferentialReferenceDecorator(ProgramReference.class); - RouteSeineNavigationTreeNode routeNode = (RouteSeineNavigationTreeNode) routesNode.getChildAt(i); + for (int i = 0, n = rootNode.getChildCount(); i < n; i++) { - String routeId = routeNode.getId(); + NavigationTreeNodeSupport programNode = (NavigationTreeNodeSupport) rootNode.getChildAt(i); + String programId = programNode.getId(); - if (!oldRouteId.equals(routeId)) { - decoratedRoutes[j++] = DecoratedNodeEntity.newDecoratedNodeEntity(routeNode, decorator); + if (programId != null && IdHelper.isProgramId(programId) && !parentId.equals(programId)) { + if (programNode instanceof TripLonglineListNavigationTreeNode) { + TripLonglineListNavigationTreeNode node = (TripLonglineListNavigationTreeNode) programNode; + result.add(DecoratedNodeEntity.newDecoratedNodeEntity(node, programDecorator)); + } } } - - Object decoratedRoute = JOptionPane.showInputDialog(ui, - t("observe.action.choose.route.message"), - t("observe.action.choose.route.title"), - JOptionPane.QUESTION_MESSAGE, - null, - decoratedRoutes, - null); - - return Optional.ofNullable(decoratedRoute != null ? ((DecoratedNodeEntity) decoratedRoute).getId() : null); + return result.toArray(new DecoratedNodeEntity[result.size()]); } - public static Optional<String> chooseNewProgram(MainUI mainUI, GearType gearType, String oldProgramId) { + public static DecoratedNodeEntity[] getTripSeineParentCandidates(FormUI ui, String parentId) { - NavigationTree treeHelper = mainUI.getDataSourceEditor().getTree(); + NavigationTree treeHelper = ui.getDataSourceUI().getTree(); - // racine NavigationTreeNodeSupport rootNode = treeHelper.getRootNode(); - //on crée un tableau avec un programme en moins car on ne propose pas le programme actuel - List<DecoratedNodeEntity> decoratedProgramList = new ArrayList<>(); + List<DecoratedNodeEntity> result = new ArrayList<>(); - ReferentialReferenceDecorator<ProgramReference> programDecorator = ObserveClientApplicationContext.get().getDecoratorService().getReferentialReferenceDecorator(ProgramReference.class); + ReferentialReferenceDecorator<ProgramReference> programDecorator = ui.getMainUI().getApplicationContext().getDecoratorService().getReferentialReferenceDecorator(ProgramReference.class); for (int i = 0, n = rootNode.getChildCount(); i < n; i++) { NavigationTreeNodeSupport programNode = (NavigationTreeNodeSupport) rootNode.getChildAt(i); String programId = programNode.getId(); - // si le noeud programme n'est pas le même que le parent actuel - // si le noeud est bien un noeud de programme - if (programId != null && IdHelper.isProgramId(programId) && !oldProgramId.equals(programId)) { - - if (programNode instanceof TripSeineListNavigationTreeNode && GearType.seine == gearType) { - + if (programId != null && IdHelper.isProgramId(programId) && !parentId.equals(programId)) { + if (programNode instanceof TripSeineListNavigationTreeNode) { TripSeineListNavigationTreeNode node = (TripSeineListNavigationTreeNode) programNode; - decoratedProgramList.add(DecoratedNodeEntity.newDecoratedNodeEntity(node, programDecorator)); - - } else if (programNode instanceof TripLonglineListNavigationTreeNode && GearType.longline == gearType) { - - TripLonglineListNavigationTreeNode node = (TripLonglineListNavigationTreeNode) programNode; - decoratedProgramList.add(DecoratedNodeEntity.newDecoratedNodeEntity(node, programDecorator)); - + result.add(DecoratedNodeEntity.newDecoratedNodeEntity(node, programDecorator)); } - } } - - DecoratedNodeEntity[] decoratedPrograms = - decoratedProgramList.toArray(new DecoratedNodeEntity[decoratedProgramList.size()]); - - DecoratedNodeEntity decoratedProgram = (DecoratedNodeEntity) JOptionPane.showInputDialog(mainUI, - t("observe.action.choose.program.message"), - t("observe.action.choose.program.title"), - JOptionPane.QUESTION_MESSAGE, - null, - decoratedPrograms, - null); - - return Optional.ofNullable(decoratedProgram == null ? null : decoratedProgram.getId()); + return result.toArray(new DecoratedNodeEntity[result.size()]); } - public static Optional<String> chooseNewTripSeine(MainUI mainUI, NavigationTreeNodeSupport oldTripSeineNode) { - NavigationTreeNodeSupport programNode = oldTripSeineNode.getParent(); - String oldTripSeineId = oldTripSeineNode.getId(); + public static DecoratedNodeEntity[] getRouteParentCandidates(String parentId, NavigationTreeNodeSupport oldParentNode) { + + NavigationTreeNodeSupport programNode = oldParentNode.getParent(); int tripSeineNb = programNode.getChildCount(); - ObserveClientApplicationContext applicationContext = ObserveClientApplicationContext.get(); - DataReferenceDecorator<TripSeineReference> decorator = applicationContext.getDecoratorService().getDataReferenceDecorator(TripSeineReference.class); + ClientApplicationContext applicationContext = ClientApplicationContext.get(); + DataReferenceDecorator decorator = applicationContext.getDecoratorService().getDataReferenceDecorator(TripSeineReference.class); - //on crée un tableau avec une marée en moins car on ne propose pas la marée actuel - DecoratedNodeEntity[] decoratedTripSeines = new DecoratedNodeEntity[tripSeineNb - 1]; + DecoratedNodeEntity[] result = new DecoratedNodeEntity[tripSeineNb - 1]; int j = 0; for (int i = 0; i < tripSeineNb; i++) { @@ -192,18 +157,52 @@ public class MoveDataHelper { String tripSeineId = tripSeineNode.getId(); - if (!oldTripSeineId.equals(tripSeineId)) { - decoratedTripSeines[j++] = DecoratedNodeEntity.newDecoratedNodeEntity(tripSeineNode, decorator); + if (!parentId.equals(tripSeineId)) { + result[j++] = DecoratedNodeEntity.newDecoratedNodeEntity(tripSeineNode, decorator); } } + return result; + } + - Object decoratedTripSeine = JOptionPane.showInputDialog(mainUI, - t("observe.action.choose.tripSeine.message"), - t("observe.action.choose.tripSeine.title"), - JOptionPane.QUESTION_MESSAGE, - null, - decoratedTripSeines, - null); - return Optional.ofNullable(decoratedTripSeine != null ? ((DecoratedNodeEntity) decoratedTripSeine).getId() : null); + public static DecoratedNodeEntity[] getActivitySeineParentCandidates(String parentId, NavigationTreeNodeSupport oldParentNode) { + NavigationTreeNodeSupport routesNode = oldParentNode.getParent(); + int routeNb = routesNode.getChildCount(); + + ObserveClientApplicationContext applicationContext = ObserveClientApplicationContext.get(); + DataReferenceDecorator<RouteReference> decorator = applicationContext.getDecoratorService().getDataReferenceDecorator(RouteReference.class); + + DecoratedNodeEntity[] result = new DecoratedNodeEntity[routeNb - 1]; + + int j = 0; + for (int i = 0; i < routeNb; i++) { + RouteSeineNavigationTreeNode routeNode = (RouteSeineNavigationTreeNode) routesNode.getChildAt(i); + String routeId = routeNode.getId(); + if (!parentId.equals(routeId)) { + result[j++] = DecoratedNodeEntity.newDecoratedNodeEntity(routeNode, decorator); + } + } + return result; + } + + public static DecoratedNodeEntity[] getActivityLonglineParentCandidates(String parentId, NavigationTreeNodeSupport oldParentNode) { + NavigationTreeNodeSupport programNode = oldParentNode.getParent(); + int tripLonglineNb = programNode.getChildCount(); + + ObserveClientApplicationContext applicationContext = ObserveClientApplicationContext.get(); + DataReferenceDecorator<TripLonglineReference> decorator = applicationContext.getDataReferenceDecorator(TripLonglineReference.class, null); + + DecoratedNodeEntity[] result = new DecoratedNodeEntity[tripLonglineNb - 1]; + + int j = 0; + for (int i = 0; i < tripLonglineNb; i++) { + TripLonglineNavigationTreeNode tripLonglineNode = (TripLonglineNavigationTreeNode) programNode.getChildAt(i); + String tripLonglineId = tripLonglineNode.getId(); + if (!parentId.equals(tripLonglineId)) { + result[j++] = DecoratedNodeEntity.newDecoratedNodeEntity(tripLonglineNode, decorator); + } + } + return result; } + } ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/ActivityLonglineObsUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/ActivityLonglineObsUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/ActivityLonglineObsUIModel.java @@ -24,6 +24,7 @@ package fr.ird.observe.client.ds.editor.form.open.longline; import fr.ird.observe.client.ObserveClientApplicationContext; import fr.ird.observe.client.ds.editor.form.FormUILayoutFocusTraversalPolicy; +import fr.ird.observe.client.ds.editor.form.MoveDataHelper; import fr.ird.observe.client.ds.editor.form.ObserveFormHelper; import fr.ird.observe.client.ds.editor.form.open.OpenDataFormUI; import fr.ird.observe.client.ds.editor.form.open.OpenDataFormUILayoutFocusTraversalPolicy; @@ -31,15 +32,12 @@ import fr.ird.observe.client.ds.editor.form.open.OpenDataFormUIModel; import fr.ird.observe.client.ds.editor.form.spi.FormUIValidationMessageManager; import fr.ird.observe.client.ds.editor.tree.navigation.NavigationTree; import fr.ird.observe.client.ds.editor.tree.navigation.nodes.NavigationTreeNodeSupport; -import fr.ird.observe.client.ds.editor.tree.navigation.nodes.longline.TripLonglineNavigationTreeNode; import fr.ird.observe.client.util.DecoratedNodeEntity; import fr.ird.observe.dto.data.longline.ActivityLonglineObsDto; import fr.ird.observe.dto.data.longline.ActivityLonglineObsHelper; import fr.ird.observe.dto.data.longline.ActivityLonglineObsReference; import fr.ird.observe.dto.data.longline.TripLonglineDto; -import fr.ird.observe.dto.data.longline.TripLonglineReference; import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; -import fr.ird.observe.dto.decoration.decorators.DataReferenceDecorator; import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.dto.referential.longline.VesselActivityLonglineHelper; import fr.ird.observe.dto.referential.longline.VesselActivityLonglineReference; @@ -181,26 +179,7 @@ public class ActivityLonglineObsUIModel extends OpenDataFormUIModel<ActivityLong @Override public DecoratedNodeEntity[] getParentCandidates(OpenDataFormUI<ActivityLonglineObsDto, ActivityLonglineObsReference> ui) { - NavigationTreeNodeSupport oldParentNode = getOldParentNode(ui); - NavigationTreeNodeSupport programNode = oldParentNode.getParent(); - String oldTripLonglineId = oldParentNode.getId(); - int tripLonglineNb = programNode.getChildCount(); - - ObserveClientApplicationContext applicationContext = ObserveClientApplicationContext.get(); - DataReferenceDecorator<TripLonglineReference> decorator = applicationContext.getDataReferenceDecorator(TripLonglineReference.class, null); - - //on crée un tableau avec une marée en moins car on ne propose pas la marée actuelle - DecoratedNodeEntity[] decoratedTripLonglines = new DecoratedNodeEntity[tripLonglineNb - 1]; - - int j = 0; - for (int i = 0; i < tripLonglineNb; i++) { - TripLonglineNavigationTreeNode tripLonglineNode = (TripLonglineNavigationTreeNode) programNode.getChildAt(i); - String tripLonglineId = tripLonglineNode.getId(); - if (!oldTripLonglineId.equals(tripLonglineId)) { - decoratedTripLonglines[j++] = DecoratedNodeEntity.newDecoratedNodeEntity(tripLonglineNode, decorator); - } - } - return decoratedTripLonglines; + return MoveDataHelper.getActivityLonglineParentCandidates(getParentId(), getOldParentNode(ui)); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/TripLonglineUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/TripLonglineUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/TripLonglineUIModel.java @@ -27,6 +27,7 @@ import com.google.common.collect.ImmutableSet; import fr.ird.observe.client.ObserveClientApplicationContext; import fr.ird.observe.client.configuration.ClientConfig; import fr.ird.observe.client.ds.editor.form.FormUILayoutFocusTraversalPolicy; +import fr.ird.observe.client.ds.editor.form.MoveDataHelper; import fr.ird.observe.client.ds.editor.form.ObserveFormHelper; import fr.ird.observe.client.ds.editor.form.open.OpenDataFormUI; import fr.ird.observe.client.ds.editor.form.open.OpenDataFormUILayoutFocusTraversalPolicy; @@ -35,24 +36,19 @@ import fr.ird.observe.client.ds.editor.form.spi.FormUIValidationMessageManager; import fr.ird.observe.client.ds.editor.tree.navigation.NavigationTree; import fr.ird.observe.client.ds.editor.tree.navigation.ObserveNavigationTree; import fr.ird.observe.client.ds.editor.tree.navigation.nodes.NavigationTreeNodeSupport; -import fr.ird.observe.client.ds.editor.tree.navigation.nodes.longline.TripLonglineListNavigationTreeNode; import fr.ird.observe.client.util.DecoratedNodeEntity; -import fr.ird.observe.dto.IdHelper; import fr.ird.observe.dto.data.longline.TripLonglineDto; import fr.ird.observe.dto.data.longline.TripLonglineReference; -import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.dto.reference.DtoReferenceCollection; import fr.ird.observe.dto.reference.ReferentialReferencesFilter; import fr.ird.observe.dto.referential.PersonHelper; import fr.ird.observe.dto.referential.PersonReference; -import fr.ird.observe.dto.referential.ProgramReference; import fr.ird.observe.dto.referential.VesselHelper; import fr.ird.observe.dto.referential.VesselReference; import fr.ird.observe.services.service.data.longline.TripLonglineService; import java.awt.Component; import java.awt.Container; -import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -181,36 +177,9 @@ public class TripLonglineUIModel extends OpenDataFormUIModel<TripLonglineDto, Tr @Override public DecoratedNodeEntity[] getParentCandidates(OpenDataFormUI<TripLonglineDto, TripLonglineReference> ui) { - - NavigationTree treeHelper = ui.getDataSourceUI().getTree(); - - // racine - NavigationTreeNodeSupport rootNode = treeHelper.getRootNode(); - - //on crée un tableau avec un programme en moins car on ne propose pas le programme actuel - List<DecoratedNodeEntity> decoratedProgramList = new ArrayList<>(); - - ReferentialReferenceDecorator<ProgramReference> programDecorator = ui.getMainUI().getApplicationContext().getDecoratorService().getReferentialReferenceDecorator(ProgramReference.class); - - String parentId = getParentId(); - for (int i = 0, n = rootNode.getChildCount(); i < n; i++) { - - NavigationTreeNodeSupport programNode = (NavigationTreeNodeSupport) rootNode.getChildAt(i); - String programId = programNode.getId(); - - // si le noeud programme n'est pas le même que le parent actuel - // si le noeud est bien un noeud de programme - if (programId != null && IdHelper.isProgramId(programId) && !parentId.equals(programId)) { - if (programNode instanceof TripLonglineListNavigationTreeNode) { - TripLonglineListNavigationTreeNode node = (TripLonglineListNavigationTreeNode) programNode; - decoratedProgramList.add(DecoratedNodeEntity.newDecoratedNodeEntity(node, programDecorator)); - } - } - } - return decoratedProgramList.toArray(new DecoratedNodeEntity[decoratedProgramList.size()]); + return MoveDataHelper.getTripLonglineParentCandidates(ui, getParentId()); } - @Override public String getMoveTitle() { return t("observe.action.choose.program.title"); ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUIModel.java @@ -26,6 +26,7 @@ import com.google.common.collect.ImmutableSet; import fr.ird.observe.client.ClientApplicationContext; import fr.ird.observe.client.ObserveClientApplicationContext; import fr.ird.observe.client.ds.editor.form.FormUILayoutFocusTraversalPolicy; +import fr.ird.observe.client.ds.editor.form.MoveDataHelper; import fr.ird.observe.client.ds.editor.form.ObserveFormHelper; import fr.ird.observe.client.ds.editor.form.open.OpenDataFormUI; import fr.ird.observe.client.ds.editor.form.open.OpenDataFormUILayoutFocusTraversalPolicy; @@ -33,15 +34,12 @@ import fr.ird.observe.client.ds.editor.form.open.OpenDataFormUIModel; import fr.ird.observe.client.ds.editor.form.spi.FormUIValidationMessageManager; import fr.ird.observe.client.ds.editor.tree.navigation.NavigationTree; import fr.ird.observe.client.ds.editor.tree.navigation.nodes.NavigationTreeNodeSupport; -import fr.ird.observe.client.ds.editor.tree.navigation.nodes.seine.RouteSeineNavigationTreeNode; import fr.ird.observe.client.util.DecoratedNodeEntity; import fr.ird.observe.dto.data.seine.ActivitySeineDto; import fr.ird.observe.dto.data.seine.ActivitySeineReference; import fr.ird.observe.dto.data.seine.RouteDto; -import fr.ird.observe.dto.data.seine.RouteReference; import fr.ird.observe.dto.data.seine.TripSeineDto; import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; -import fr.ird.observe.dto.decoration.decorators.DataReferenceDecorator; import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.dto.referential.seine.VesselActivitySeineHelper; import fr.ird.observe.dto.referential.seine.VesselActivitySeineReference; @@ -246,25 +244,7 @@ public class ActivitySeineUIModel extends OpenDataFormUIModel<ActivitySeineDto, @Override public DecoratedNodeEntity[] getParentCandidates(OpenDataFormUI<ActivitySeineDto, ActivitySeineReference> ui) { NavigationTreeNodeSupport oldParentNode = getOldParentNode(ui); - NavigationTreeNodeSupport routesNode = oldParentNode.getParent(); - String oldRouteId = oldParentNode.getId(); - int routeNb = routesNode.getChildCount(); - - ObserveClientApplicationContext applicationContext = ObserveClientApplicationContext.get(); - DataReferenceDecorator<RouteReference> decorator = applicationContext.getDecoratorService().getDataReferenceDecorator(RouteReference.class); - - //on crée un tableau avec une route en moins car on ne propose pas la route actuel - DecoratedNodeEntity[] decoratedRoutes = new DecoratedNodeEntity[routeNb - 1]; - - int j = 0; - for (int i = 0; i < routeNb; i++) { - RouteSeineNavigationTreeNode routeNode = (RouteSeineNavigationTreeNode) routesNode.getChildAt(i); - String routeId = routeNode.getId(); - if (!oldRouteId.equals(routeId)) { - decoratedRoutes[j++] = DecoratedNodeEntity.newDecoratedNodeEntity(routeNode, decorator); - } - } - return decoratedRoutes; + return MoveDataHelper.getActivitySeineParentCandidates(getParentId(), oldParentNode); } ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/RouteUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/RouteUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/RouteUIModel.java @@ -25,6 +25,7 @@ package fr.ird.observe.client.ds.editor.form.open.seine; import fr.ird.observe.client.ClientApplicationContext; import fr.ird.observe.client.ds.editor.DataSourceUI; import fr.ird.observe.client.ds.editor.form.FormUILayoutFocusTraversalPolicy; +import fr.ird.observe.client.ds.editor.form.MoveDataHelper; import fr.ird.observe.client.ds.editor.form.ObserveFormHelper; import fr.ird.observe.client.ds.editor.form.open.OpenDataFormUI; import fr.ird.observe.client.ds.editor.form.open.OpenDataFormUILayoutFocusTraversalPolicy; @@ -33,15 +34,12 @@ import fr.ird.observe.client.ds.editor.form.spi.FormUIValidationMessageManager; import fr.ird.observe.client.ds.editor.tree.navigation.NavigationTree; import fr.ird.observe.client.ds.editor.tree.navigation.ObserveNavigationTree; import fr.ird.observe.client.ds.editor.tree.navigation.nodes.NavigationTreeNodeSupport; -import fr.ird.observe.client.ds.editor.tree.navigation.nodes.seine.TripSeineNavigationTreeNode; import fr.ird.observe.client.util.DecoratedNodeEntity; import fr.ird.observe.dto.data.seine.ActivitySeineDto; import fr.ird.observe.dto.data.seine.RouteDto; import fr.ird.observe.dto.data.seine.RouteReference; import fr.ird.observe.dto.data.seine.TripSeineDto; -import fr.ird.observe.dto.data.seine.TripSeineReference; import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; -import fr.ird.observe.dto.decoration.decorators.DataReferenceDecorator; import fr.ird.observe.dto.referential.seine.VesselActivitySeineHelper; import fr.ird.observe.dto.referential.seine.VesselActivitySeineReference; import fr.ird.observe.services.service.data.seine.RouteService; @@ -248,31 +246,7 @@ public class RouteUIModel extends OpenDataFormUIModel<RouteDto, RouteReference, @Override public DecoratedNodeEntity[] getParentCandidates(OpenDataFormUI<RouteDto, RouteReference> ui) { - - NavigationTreeNodeSupport oldTripSeineNode = getOldParentNode(ui); - - NavigationTreeNodeSupport programNode = oldTripSeineNode.getParent(); - String oldTripSeineId = oldTripSeineNode.getId(); - int tripSeineNb = programNode.getChildCount(); - - ClientApplicationContext applicationContext = ClientApplicationContext.get(); - DataReferenceDecorator decorator = applicationContext.getDecoratorService().getDataReferenceDecorator(TripSeineReference.class); - - //on crée un tableau avec une marée en moins car on ne propose pas la marée actuel - DecoratedNodeEntity[] decoratedTripSeines = new DecoratedNodeEntity[tripSeineNb - 1]; - - int j = 0; - for (int i = 0; i < tripSeineNb; i++) { - - TripSeineNavigationTreeNode tripSeineNode = (TripSeineNavigationTreeNode) programNode.getChildAt(i); - - String tripSeineId = tripSeineNode.getId(); - - if (!oldTripSeineId.equals(tripSeineId)) { - decoratedTripSeines[j++] = DecoratedNodeEntity.newDecoratedNodeEntity(tripSeineNode, decorator); - } - } - return decoratedTripSeines; + return MoveDataHelper.getRouteParentCandidates(getParentId(), getOldParentNode(ui)); } ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/TripSeineUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/TripSeineUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/TripSeineUIModel.java @@ -27,6 +27,7 @@ import com.google.common.collect.ImmutableSet; import fr.ird.observe.client.ObserveClientApplicationContext; import fr.ird.observe.client.configuration.ClientConfig; import fr.ird.observe.client.ds.editor.form.FormUILayoutFocusTraversalPolicy; +import fr.ird.observe.client.ds.editor.form.MoveDataHelper; import fr.ird.observe.client.ds.editor.form.ObserveFormHelper; import fr.ird.observe.client.ds.editor.form.open.OpenDataFormUI; import fr.ird.observe.client.ds.editor.form.open.OpenDataFormUILayoutFocusTraversalPolicy; @@ -35,24 +36,19 @@ import fr.ird.observe.client.ds.editor.form.spi.FormUIValidationMessageManager; import fr.ird.observe.client.ds.editor.tree.navigation.NavigationTree; import fr.ird.observe.client.ds.editor.tree.navigation.ObserveNavigationTree; import fr.ird.observe.client.ds.editor.tree.navigation.nodes.NavigationTreeNodeSupport; -import fr.ird.observe.client.ds.editor.tree.navigation.nodes.seine.TripSeineListNavigationTreeNode; import fr.ird.observe.client.util.DecoratedNodeEntity; -import fr.ird.observe.dto.IdHelper; import fr.ird.observe.dto.data.seine.TripSeineDto; import fr.ird.observe.dto.data.seine.TripSeineReference; -import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.dto.reference.DtoReferenceCollection; import fr.ird.observe.dto.reference.ReferentialReferencesFilter; import fr.ird.observe.dto.referential.PersonHelper; import fr.ird.observe.dto.referential.PersonReference; -import fr.ird.observe.dto.referential.ProgramReference; import fr.ird.observe.dto.referential.VesselHelper; import fr.ird.observe.dto.referential.VesselReference; import fr.ird.observe.services.service.data.seine.TripSeineService; import java.awt.Component; import java.awt.Container; -import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -188,33 +184,7 @@ public class TripSeineUIModel extends OpenDataFormUIModel<TripSeineDto, TripSein @Override public DecoratedNodeEntity[] getParentCandidates(OpenDataFormUI<TripSeineDto, TripSeineReference> ui) { - - NavigationTree treeHelper = ui.getDataSourceUI().getTree(); - - // racine - NavigationTreeNodeSupport rootNode = treeHelper.getRootNode(); - - //on crée un tableau avec un programme en moins car on ne propose pas le programme actuel - List<DecoratedNodeEntity> decoratedProgramList = new ArrayList<>(); - - ReferentialReferenceDecorator<ProgramReference> programDecorator = ui.getMainUI().getApplicationContext().getDecoratorService().getReferentialReferenceDecorator(ProgramReference.class); - - String parentId = getParentId(); - for (int i = 0, n = rootNode.getChildCount(); i < n; i++) { - - NavigationTreeNodeSupport programNode = (NavigationTreeNodeSupport) rootNode.getChildAt(i); - String programId = programNode.getId(); - - // si le noeud programme n'est pas le même que le parent actuel - // si le noeud est bien un noeud de programme - if (programId != null && IdHelper.isProgramId(programId) && !parentId.equals(programId)) { - if (programNode instanceof TripSeineListNavigationTreeNode) { - TripSeineListNavigationTreeNode node = (TripSeineListNavigationTreeNode) programNode; - decoratedProgramList.add(DecoratedNodeEntity.newDecoratedNodeEntity(node, programDecorator)); - } - } - } - return decoratedProgramList.toArray(new DecoratedNodeEntity[decoratedProgramList.size()]); + return MoveDataHelper.getTripSeineParentCandidates(ui, getParentId()); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/CommonOpenDataListFormUI.jcss deleted ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/CommonOpenDataListFormUI.jcss +++ /dev/null @@ -1,22 +0,0 @@ -/* - * #%L - * ObServe :: Client - * %% - * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/OpenDataListFormUIMoveMultipleTripActionSupport.java deleted ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/OpenDataListFormUIMoveMultipleTripActionSupport.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * #%L - * ObServe :: Client - * %% - * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.client.ds.editor.form.openlist; - -import fr.ird.observe.client.ObserveClientApplicationContext; -import fr.ird.observe.client.ds.editor.form.MoveDataHelper; -import fr.ird.observe.client.ds.editor.form.openlist.actions.OpenDataListFormUIMoveMultipleDataActionSupport; -import fr.ird.observe.client.ds.editor.tree.navigation.NavigationTree; -import fr.ird.observe.client.ds.editor.tree.navigation.nodes.NavigationTreeNodeSupport; -import fr.ird.observe.dto.referential.GearType; -import fr.ird.observe.dto.referential.ProgramDto; -import fr.ird.observe.spi.application.ObserveApplicationDataContext; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.util.Iterator; -import java.util.List; -import java.util.Optional; -import java.util.Set; - -import static org.nuiton.i18n.I18n.n; - -/** - * Action pour changer le programme d'une ou plusieurs marée dans la liste. - * - * @author Kevin Morin (Code Lutin) - * @since 5.0 - */ -public abstract class OpenDataListFormUIMoveMultipleTripActionSupport extends OpenDataListFormUIMoveMultipleDataActionSupport { - - private static final Log log = LogFactory.getLog(OpenDataListFormUIMoveMultipleTripActionSupport.class); - - private final GearType gearType; - - protected OpenDataListFormUIMoveMultipleTripActionSupport(GearType gearType) { - super(n("observe.common.TripDto.action.moves"), - n("observe.common.TripDto.action.moves.tip"), - "move-trips"); - this.gearType = gearType; - } - - @Override - public Optional<String> getNewParentId() { - return MoveDataHelper.chooseNewProgram(getMainUI(), gearType, getOldParentNode().getId()); - } - - @Override - public void updateUI(String newParentId, Set<String> dataIds, List<Integer> positions) { - - NavigationTreeNodeSupport oldParentNode = getOldParentNode(); - - ObserveClientApplicationContext applicationContext = ObserveClientApplicationContext.get(); - ObserveApplicationDataContext openDataManager = applicationContext.getApplicationDataContext(); - NavigationTree treeHelper = getDataSourceEditor().getTree(); - - NavigationTreeNodeSupport rootNode = treeHelper.getRootNode(); - NavigationTreeNodeSupport newProgramNode = treeHelper.getChild(rootNode, newParentId); - - Iterator<String> iterator = dataIds.iterator(); - for (Integer position : positions) { - - String tripId = iterator.next(); - NavigationTreeNodeSupport tripNode = treeHelper.getChild(oldParentNode, tripId); - boolean wasOpen = tripNode.isOpen(); - treeHelper.removeNode(tripNode); - - if (wasOpen) { - openDataManager.close(ProgramDto.class); - openDataManager.open(ProgramDto.class, newParentId); - } - - NavigationTreeNodeSupport newTripNode = treeHelper.getChild(newProgramNode, tripId); - - if (newTripNode == null) { - - // create it - if (log.isInfoEnabled()) { - log.info("Insert trip node: "); - } - treeHelper.insertNode(newProgramNode, tripNode, position); - } - } - - treeHelper.reloadNode(oldParentNode, true); - treeHelper.reloadNode(newProgramNode, true); - treeHelper.selectNode(newProgramNode); - } - -} ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/ActivityLonglineObsListUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/ActivityLonglineObsListUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/ActivityLonglineObsListUI.jaxx @@ -28,9 +28,7 @@ org.nuiton.jaxx.widgets.select.BeanListHeader </import> - <style source="../CommonOpenDataListFormUI.jcss"/> - - <ActivityLonglineObsListUIModel id='model' title='observe.common.ActivityLonglineObsDto.types'/> + <ActivityLonglineObsListUIModel id='model'/> <JLabel id="emptyLabel" text='observe.common.ActivityLonglineObsDto.message.nonForTrip'/> <BeanListHeader id='listHeader' labelText='observe.common.ActivityDto.list'/> ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/ActivityLonglineObsListUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/ActivityLonglineObsListUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/ActivityLonglineObsListUIModel.java @@ -22,13 +22,26 @@ package fr.ird.observe.client.ds.editor.form.openlist.longline; * #L% */ +import com.google.common.collect.ImmutableSet; +import fr.ird.observe.client.ObserveClientApplicationContext; +import fr.ird.observe.client.ds.editor.form.MoveDataHelper; +import fr.ird.observe.client.ds.editor.form.openlist.OpenDataListFormUI; import fr.ird.observe.client.ds.editor.form.openlist.OpenDataListFormUIModel; import fr.ird.observe.client.ds.editor.form.spi.FormUIValidationMessageManager; +import fr.ird.observe.client.ds.editor.tree.navigation.NavigationTree; +import fr.ird.observe.client.ds.editor.tree.navigation.nodes.NavigationTreeNodeSupport; +import fr.ird.observe.client.util.DecoratedNodeEntity; import fr.ird.observe.dto.data.longline.ActivityLonglineObsDto; import fr.ird.observe.dto.data.longline.ActivityLonglineObsReference; +import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.services.service.data.longline.ActivityLonglineObsService; +import fr.ird.observe.spi.application.ObserveApplicationDataContext; + +import java.util.List; +import java.util.Optional; import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; /** * Created on 9/26/14. @@ -38,6 +51,10 @@ import static org.nuiton.i18n.I18n.n; */ public class ActivityLonglineObsListUIModel extends OpenDataListFormUIModel<ActivityLonglineObsDto, ActivityLonglineObsReference, ActivityLonglineObsService> { + public ActivityLonglineObsListUIModel() { + setTitle(t("observe.common.ActivityLonglineObsDto.types")); + } + @Override public void computeReadMessages(FormUIValidationMessageManager validationManager) { if (isAnotherParentOpen()) { @@ -61,4 +78,92 @@ public class ActivityLonglineObsListUIModel extends OpenDataListFormUIModel<Acti validationManager.addInfoMessage(n("observe.common.ActivityLonglineObsDto.message.active.found")); } + @Override + public DecoratedNodeEntity[] getParentCandidates(OpenDataListFormUI<ActivityLonglineObsDto, ActivityLonglineObsReference> ui) { + return MoveDataHelper.getActivityLonglineParentCandidates(getParentId(), getOldParentNode(ui)); + } + + @Override + public String getMoveTitle() { + return t("observe.action.choose.tripLongline.title"); + } + + @Override + public String getMoveMessage() { + return t("observe.action.choose.tripLongline.message"); + } + + @Override + public void afterMoveData(ImmutableSet<String> dataIds, String newParentId, List<Integer> positions, OpenDataListFormUI<ActivityLonglineObsDto, ActivityLonglineObsReference> ui) { + super.afterMoveData(dataIds, newParentId, positions, ui); + + NavigationTreeNodeSupport oldParentNode = getOldParentNode(ui); + + ObserveClientApplicationContext applicationContext = ObserveClientApplicationContext.get(); + ObserveApplicationDataContext openDataManager = applicationContext.getApplicationDataContext(); + NavigationTree tree = ui.getDataSourceUI().getTree(); + + NavigationTreeNodeSupport oldTripLonglineNode = oldParentNode.getParent(); + NavigationTreeNodeSupport programNode = oldTripLonglineNode.getParent(); + NavigationTreeNodeSupport newTripLonglineNode = tree.getChild(programNode, newParentId); + String activitiesNodeId = ObserveI18nDecoratorHelper.getTypePluralI18nKey(ActivityLonglineObsDto.class); + NavigationTreeNodeSupport newActivitiesNode = tree.getChild(newTripLonglineNode, activitiesNodeId); + + // Let's check if we're moving an open activity + String openId = openDataManager.getOpenId(ActivityLonglineObsDto.class); + Optional<String> openActivity = openId != null && dataIds.contains(openId) ? Optional.of(openId) : Optional.empty(); + + // If so, we closeData it to avoid ending up with an open activity into a closed trip. + if (openActivity.isPresent()) { + openDataManager.close(ActivityLonglineObsDto.class); + } + + // Let's reload the sub tree of each activities node. + // As the change have already be oldParentNode in database, we just call the child loaders to regenerate the activities nodes sub trees + tree.reloadNodeSubTree(oldParentNode); + tree.reloadNodeSubTree(newActivitiesNode); + + // Let's put the focus on the activities node which received the activities + tree.selectNode(newActivitiesNode); + } + + /* + + //FIXME!!! Voir si c'est vraiment nécessaire, je comprends pas pourquoi le comportement change des autres types + @Override + protected void doActionPerformed(ActionEvent e, OpenDataListFormUI ui) { + + String openId = ObserveClientApplicationContext.applicationDataContext().getOpenActivityLonglineObsId(); + + NavigationTree tree = getDataSourceUI().getTree(); + + boolean wasCollapsed = ObserveFormHelper.isOpenActivityNodeCollapsed(tree, openId); + + // selection du noeud de l'activity ouverte + NavigationTreeNodeSupport selectedNode = tree.getSelectedNode(); + selectedNode = tree.getActivityLonglineNode(selectedNode, openId); + tree.selectNode(selectedNode); + + // on conserve le path de l'activité + TreePath path = tree.getSelectionPath(); + + // recuperation de l'écran associé + ActivityLonglineObsUI selectedUI = (ActivityLonglineObsUI) getDataSourceUI().getSelectedContentUI(); + + if (openId != null) { + // fermeture de l'activité et création d'une nouvelle + selectedUI.getCloseData().doClick(); + } + + selectedUI.getCreate().doClick(); + + if (wasCollapsed) { + + // on ferme le noeud de l'activité (qui a ete ouverte lors de la selection de celle-ci) + tree.collapsePath(path); + } + + } + + */ } ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/TripLonglineListUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/TripLonglineListUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/TripLonglineListUI.jaxx @@ -28,9 +28,7 @@ org.nuiton.jaxx.widgets.select.BeanListHeader </import> - <style source="../CommonOpenDataListFormUI.jcss"/> - - <TripLonglineListUIModel id='model' title='observe.common.TripLonglineDto.types'/> + <TripLonglineListUIModel id='model'/> <JLabel id="emptyLabel" text='observe.common.TripDto.message.noneForTrip'/> <BeanListHeader id='listHeader' labelText='observe.common.TripDto.list'/> ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/TripLonglineListUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/TripLonglineListUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/TripLonglineListUIModel.java @@ -22,16 +22,24 @@ package fr.ird.observe.client.ds.editor.form.openlist.longline; * #L% */ +import com.google.common.collect.ImmutableSet; import fr.ird.observe.client.ClientApplicationContext; +import fr.ird.observe.client.ds.editor.form.MoveDataHelper; +import fr.ird.observe.client.ds.editor.form.openlist.OpenDataListFormUI; import fr.ird.observe.client.ds.editor.form.openlist.OpenDataListFormUIModel; import fr.ird.observe.client.ds.editor.form.spi.FormUIValidationMessageManager; +import fr.ird.observe.client.ds.editor.tree.navigation.nodes.NavigationTreeNodeSupport; +import fr.ird.observe.client.util.DecoratedNodeEntity; import fr.ird.observe.dto.data.longline.TripLonglineDto; import fr.ird.observe.dto.data.longline.TripLonglineReference; import fr.ird.observe.dto.reference.DtoReference; import fr.ird.observe.dto.referential.ProgramReference; import fr.ird.observe.services.service.data.longline.TripLonglineService; +import java.util.List; + import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; /** * Created on 9/26/14. @@ -41,6 +49,10 @@ import static org.nuiton.i18n.I18n.n; */ public class TripLonglineListUIModel extends OpenDataListFormUIModel<TripLonglineDto, TripLonglineReference, TripLonglineService> { + public TripLonglineListUIModel() { + setTitle(t("observe.common.TripLonglineDto.types")); + } + @Override public void computeReadMessages(FormUIValidationMessageManager validationManager) { validationManager.addInfoMessage(n("observe.common.TripLonglineDto.message.active.found.for.other.program")); @@ -63,4 +75,26 @@ public class TripLonglineListUIModel extends OpenDataListFormUIModel<TripLonglin setTitle(title); super.openUI(); } + + @Override + public String getMoveTitle() { + return t("observe.action.choose.program.title"); + } + + @Override + public String getMoveMessage() { + return t("observe.action.choose.program.message"); + } + + @Override + public DecoratedNodeEntity[] getParentCandidates(OpenDataListFormUI<TripLonglineDto, TripLonglineReference> ui) { + return MoveDataHelper.getTripLonglineParentCandidates(ui, getParentId()); + } + + @Override + public void afterMoveData(ImmutableSet<String> dataIds, String newParentId, List<Integer> positions, OpenDataListFormUI<TripLonglineDto, TripLonglineReference> ui) { + super.afterMoveData(dataIds, newParentId, positions, ui); + NavigationTreeNodeSupport oldParentNode = getOldParentNode(ui); + MoveDataHelper.moveTrips(ui.getDataSourceUI().getTree(), newParentId, dataIds, positions, oldParentNode); + } } ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/actions/OpenDataListFormUICreateActivityLonglineObs.java deleted ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/actions/OpenDataListFormUICreateActivityLonglineObs.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * #%L - * ObServe :: Client - * %% - * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.client.ds.editor.form.openlist.longline.actions; - -import fr.ird.observe.client.ObserveClientApplicationContext; -import fr.ird.observe.client.ds.editor.form.ObserveFormHelper; -import fr.ird.observe.client.ds.editor.form.open.longline.ActivityLonglineObsUI; -import fr.ird.observe.client.ds.editor.form.openlist.OpenDataListFormUI; -import fr.ird.observe.client.ds.editor.form.openlist.actions.OpenDataListFormUICreateData; -import fr.ird.observe.client.ds.editor.tree.navigation.NavigationTree; -import fr.ird.observe.client.ds.editor.tree.navigation.nodes.NavigationTreeNodeSupport; - -import javax.swing.tree.TreePath; -import java.awt.event.ActionEvent; - -/** - * FIXME!!! N'est plus utilisé mais on garde pour voir si ce n'est pas encore nécessaire - * Action pour fermer l'objet sous-jacent à l'écran et en créer un nouveau. - * - * @author Tony Chemit - dev(a)tchemit.fr - * @since 1.5 - */ -public class OpenDataListFormUICreateActivityLonglineObs extends OpenDataListFormUICreateData { - - public OpenDataListFormUICreateActivityLonglineObs() { -// super(n("observe.common.ActivityDto.action.closeAndCreate"), -// n("observe.common.ActivityDto.action.closeAndCreate.tip")); - } - - @Override - protected void doActionPerformed(ActionEvent e, OpenDataListFormUI ui) { - - //FIXME!!! Voir si c'est vraiment nécessaire, je comprends pas pourquoi le comportement change des autres types - String openId = ObserveClientApplicationContext.applicationDataContext().getOpenActivityLonglineObsId(); - - NavigationTree tree = getDataSourceEditor().getTree(); - - boolean wasCollapsed = ObserveFormHelper.isOpenActivityNodeCollapsed(tree, openId); - - // selection du noeud de l'activity ouverte - NavigationTreeNodeSupport selectedNode = tree.getSelectedNode(); - selectedNode = tree.getActivityLonglineNode(selectedNode, openId); - tree.selectNode(selectedNode); - - // on conserve le path de l'activité - TreePath path = tree.getSelectionPath(); - - // recuperation de l'écran associé - ActivityLonglineObsUI selectedUI = (ActivityLonglineObsUI) getDataSourceEditor().getSelectedContentUI(); - - if (openId != null) { - // fermeture de l'activité et création d'une nouvelle - selectedUI.getCloseData().doClick(); - } - - selectedUI.getCreate().doClick(); - - if (wasCollapsed) { - - // on ferme le noeud de l'activité (qui a ete ouverte lors de la selection de celle-ci) - tree.collapsePath(path); - } - - } - -} ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/actions/OpenDataListFormUIMoveMultipleActivityLonglineObs.java deleted ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/actions/OpenDataListFormUIMoveMultipleActivityLonglineObs.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * #%L - * ObServe :: Client - * %% - * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.client.ds.editor.form.openlist.longline.actions; - -import fr.ird.observe.client.ObserveClientApplicationContext; -import fr.ird.observe.client.ds.editor.form.MoveDataHelper; -import fr.ird.observe.client.ds.editor.form.openlist.actions.OpenDataListFormUIMoveMultipleDataActionSupport; -import fr.ird.observe.client.ds.editor.tree.navigation.NavigationTree; -import fr.ird.observe.client.ds.editor.tree.navigation.nodes.NavigationTreeNodeSupport; -import fr.ird.observe.dto.data.longline.ActivityLonglineObsDto; -import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; -import fr.ird.observe.spi.application.ObserveApplicationDataContext; - -import java.util.List; -import java.util.Optional; -import java.util.Set; - -import static org.nuiton.i18n.I18n.n; - -/** - * Action pour changer le programme d'une ou plusieurs marée dans la liste. - * - * @author Kevin Morin (Code Lutin) - * @since 5.0 - */ -public class OpenDataListFormUIMoveMultipleActivityLonglineObs extends OpenDataListFormUIMoveMultipleDataActionSupport { - - public OpenDataListFormUIMoveMultipleActivityLonglineObs() { - super(n("observe.common.ActivityLonglineObsDto.action.moves"), - n("observe.common.ActivityLonglineObsDto.action.moves.tip"), - "move-activities"); - } - - @Override - public Optional<String> getNewParentId() { - return MoveDataHelper.chooseNewTripLongline(getMainUI(), getOldParentNode()); - } - - @Override - public void updateUI(String tripLonglineId, Set<String> dataIds, List<Integer> positions) { - - NavigationTreeNodeSupport oldParentNode = getOldParentNode(); - - ObserveClientApplicationContext applicationContext = ObserveClientApplicationContext.get(); - ObserveApplicationDataContext openDataManager = applicationContext.getApplicationDataContext(); - NavigationTree treeHelper = getDataSourceEditor().getTree(); - - NavigationTreeNodeSupport oldTripLonglineNode = oldParentNode.getParent(); - NavigationTreeNodeSupport programNode = oldTripLonglineNode.getParent(); - NavigationTreeNodeSupport newTripLonglineNode = treeHelper.getChild(programNode, tripLonglineId); - String activitiesNodeId = ObserveI18nDecoratorHelper.getTypePluralI18nKey(ActivityLonglineObsDto.class); - NavigationTreeNodeSupport newActivitiesNode = treeHelper.getChild(newTripLonglineNode, activitiesNodeId); - - // Let's check if we're moving an open activity - String openId = openDataManager.getOpenId(ActivityLonglineObsDto.class); - Optional<String> openActivity = openId != null && dataIds.contains(openId) ? Optional.of(openId) : Optional.empty(); - - // If so, we closeData it to avoid ending up with an open activity into a closed trip. - if (openActivity.isPresent()) { - openDataManager.close(ActivityLonglineObsDto.class); - } - - // Let's reload the sub tree of each activities node. - // As the change have already be oldParentNode in database, we just call the child loaders to regenerate the activities nodes sub trees - treeHelper.reloadNodeSubTree(oldParentNode); - treeHelper.reloadNodeSubTree(newActivitiesNode); - - // Let's put the focus on the activities node which received the activities - treeHelper.selectNode(newActivitiesNode); - } - -} ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/actions/OpenDataListFormUIMoveMultipleTripLongline.java deleted ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/actions/OpenDataListFormUIMoveMultipleTripLongline.java +++ /dev/null @@ -1,37 +0,0 @@ -package fr.ird.observe.client.ds.editor.form.openlist.longline.actions; - -/*- - * #%L - * ObServe :: Client - * %% - * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.client.ds.editor.form.openlist.OpenDataListFormUIMoveMultipleTripActionSupport; -import fr.ird.observe.dto.referential.GearType; - -/** - * @author Kevin Morin (Code Lutin) - * @since 5.0 - */ -public class OpenDataListFormUIMoveMultipleTripLongline extends OpenDataListFormUIMoveMultipleTripActionSupport { - - public OpenDataListFormUIMoveMultipleTripLongline() { - super(GearType.longline); - } -} ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/ActivitySeineListUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/ActivitySeineListUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/ActivitySeineListUI.jaxx @@ -28,9 +28,7 @@ org.nuiton.jaxx.widgets.select.BeanListHeader </import> - <style source="../CommonOpenDataListFormUI.jcss"/> - - <ActivitySeineListUIModel id='model' title='observe.common.ActivitySeineDto.types'/> + <ActivitySeineListUIModel id='model'/> <JLabel id="emptyLabel" text='observe.common.ActivitySeineDto.message.noneForRoute'/> <BeanListHeader id='listHeader' labelText='observe.common.ActivityDto.list'/> <JButton id='showSelectedData'/> ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/ActivitySeineListUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/ActivitySeineListUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/ActivitySeineListUIModel.java @@ -22,14 +22,26 @@ package fr.ird.observe.client.ds.editor.form.openlist.seine; * #L% */ +import com.google.common.collect.ImmutableSet; import fr.ird.observe.client.ObserveClientApplicationContext; +import fr.ird.observe.client.ds.editor.form.MoveDataHelper; +import fr.ird.observe.client.ds.editor.form.openlist.OpenDataListFormUI; import fr.ird.observe.client.ds.editor.form.openlist.OpenDataListFormUIModel; import fr.ird.observe.client.ds.editor.form.spi.FormUIValidationMessageManager; +import fr.ird.observe.client.ds.editor.tree.navigation.NavigationTree; +import fr.ird.observe.client.ds.editor.tree.navigation.nodes.NavigationTreeNodeSupport; +import fr.ird.observe.client.util.DecoratedNodeEntity; import fr.ird.observe.dto.data.seine.ActivitySeineDto; import fr.ird.observe.dto.data.seine.ActivitySeineReference; +import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.services.service.data.seine.ActivitySeineService; +import fr.ird.observe.spi.application.ObserveApplicationDataContext; + +import java.util.List; +import java.util.Optional; import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; /** * Created on 9/26/14. @@ -39,6 +51,10 @@ import static org.nuiton.i18n.I18n.n; */ public class ActivitySeineListUIModel extends OpenDataListFormUIModel<ActivitySeineDto, ActivitySeineReference, ActivitySeineService> { + public ActivitySeineListUIModel() { + setTitle(t("observe.common.ActivitySeineDto.types")); + } + @Override public void computeReadMessages(FormUIValidationMessageManager validationManager) { if (!ObserveClientApplicationContext.applicationDataContext().isOpenRoute()) { @@ -62,4 +78,95 @@ public class ActivitySeineListUIModel extends OpenDataListFormUIModel<ActivitySe validationManager.addInfoMessage(n("observe.common.ActivitySeineDto.message.active.found")); } + + @Override + public String getMoveTitle() { + return t("observe.action.choose.route.title"); + } + + @Override + public String getMoveMessage() { + return t("observe.action.choose.route.message"); + } + + @Override + public DecoratedNodeEntity[] getParentCandidates(OpenDataListFormUI<ActivitySeineDto, ActivitySeineReference> ui) { + return MoveDataHelper.getActivitySeineParentCandidates(getParentId(), getOldParentNode(ui)); + } + + @Override + public void afterMoveData(ImmutableSet<String> dataIds, String newParentId, List<Integer> positions, OpenDataListFormUI<ActivitySeineDto, ActivitySeineReference> ui) { + super.afterMoveData(dataIds, newParentId, positions, ui); + + NavigationTreeNodeSupport oldParentNode = getOldParentNode(ui); + + ObserveApplicationDataContext openDataManager = ObserveClientApplicationContext.applicationDataContext(); + NavigationTree treeHelper = ui.getDataSourceUI().getTree(); + + NavigationTreeNodeSupport oldRouteNode = oldParentNode.getParent(); + NavigationTreeNodeSupport routesNode = oldRouteNode.getParent(); + NavigationTreeNodeSupport newRouteNode = treeHelper.getChild(routesNode, newParentId); + String activitiesNodeId = ObserveI18nDecoratorHelper.getTypePluralI18nKey(ActivitySeineDto.class); + NavigationTreeNodeSupport newActivitiesNode = treeHelper.getChild(newRouteNode, activitiesNodeId); + + // Let's check if we're moving an open activity + String openId = openDataManager.getOpenActivityLonglineObsId(); + Optional<String> openActivity = openId != null && dataIds.contains(openId) ? Optional.of(openId) : Optional.empty(); + + // If so, we closeData it to avoid ending up with an open activity into a closed route. + if (openActivity.isPresent()) { + openDataManager.close(ActivitySeineDto.class); + } + + // Let's reload the sub tree of each activities node. + // As the change have already be done in database, we just call the child loaders to regenerate the activities nodes sub trees + treeHelper.reloadNodeSubTree(oldParentNode); + treeHelper.reloadNodeSubTree(newActivitiesNode); + + // Let's put the focus on the activities node which received the activities + treeHelper.selectNode(newActivitiesNode); + } + + /* + //FIXME!!! Voir si c'est vraiment nécessaire, je comprends pas pourquoi le comportement change des autres types + @Override + protected void doActionPerformed(ActionEvent e, OpenDataListFormUI ui) { + + String openId = ObserveClientApplicationContext.applicationDataContext().getOpenActivitySeineId(); + + NavigationTree tree = getDataSourceUI().getTree(); + + boolean wasCollapsed = ObserveFormHelper.isOpenActivityNodeCollapsed(tree, openId); + + //FIXME!!! Voir si ça fonctionne bien + // selection du noeud de l'activité ouverte + ui.getActionMap().get(MainUIMenuNavigationGoToOpenActivity.class).actionPerformed(null); + + NavigationTreeNodeSupport selectedNode = tree.getSelectedNode(); + selectedNode = tree.getActivitySeineNode(selectedNode, openId); + + tree.selectNode(selectedNode); + + // on conserve le path de l'activité + TreePath path = tree.getSelectionPath(); + + // recuperation de l'écran associé + ActivitySeineUI selectedUI = (ActivitySeineUI) getDataSourceUI().getSelectedContentUI(); + + if (openId != null) { + // fermeture de l'activité et création d'une nouvelle + selectedUI.getCloseData().doClick(); + } + + selectedUI.getCreate().doClick(); + + if (wasCollapsed) { + + // on ferme le noeud de l'activity (qui a ete ouvert + // lors de la selection de celle-ci) + tree.collapsePath(path); + } + + } + */ } ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/RouteListUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/RouteListUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/RouteListUI.jaxx @@ -28,9 +28,7 @@ org.nuiton.jaxx.widgets.select.BeanListHeader </import> - <style source="../CommonOpenDataListFormUI.jcss"/> - - <RouteListUIModel id='model' title='observe.common.RouteDto.types'/> + <RouteListUIModel id='model'/> <JLabel id="emptyLabel" text='observe.common.RouteDto.noneForTrip'/> <BeanListHeader id='listHeader' labelText='observe.common.RouteDto.list'/> <JButton id='showSelectedData'/> ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/RouteListUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/RouteListUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/RouteListUIModel.java @@ -22,13 +22,26 @@ package fr.ird.observe.client.ds.editor.form.openlist.seine; * #L% */ +import com.google.common.collect.ImmutableSet; +import fr.ird.observe.client.ObserveClientApplicationContext; +import fr.ird.observe.client.ds.editor.form.MoveDataHelper; +import fr.ird.observe.client.ds.editor.form.openlist.OpenDataListFormUI; import fr.ird.observe.client.ds.editor.form.openlist.OpenDataListFormUIModel; import fr.ird.observe.client.ds.editor.form.spi.FormUIValidationMessageManager; +import fr.ird.observe.client.ds.editor.tree.navigation.NavigationTree; +import fr.ird.observe.client.ds.editor.tree.navigation.nodes.NavigationTreeNodeSupport; +import fr.ird.observe.client.util.DecoratedNodeEntity; import fr.ird.observe.dto.data.seine.RouteDto; import fr.ird.observe.dto.data.seine.RouteReference; +import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.services.service.data.seine.RouteService; +import fr.ird.observe.spi.application.ObserveApplicationDataContext; + +import java.util.List; +import java.util.Optional; import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; /** * Created on 9/26/14. @@ -38,6 +51,10 @@ import static org.nuiton.i18n.I18n.n; */ public class RouteListUIModel extends OpenDataListFormUIModel<RouteDto, RouteReference, RouteService> { + public RouteListUIModel() { + setTitle(t("observe.common.RouteDto.types")); + } + @Override public void computeReadMessages(FormUIValidationMessageManager validationManager) { if (isAnotherParentOpen()) { @@ -61,4 +78,62 @@ public class RouteListUIModel extends OpenDataListFormUIModel<RouteDto, RouteRef validationManager.addInfoMessage(n("observe.common.RouteDto.message.active.found")); } + @Override + public String getMoveTitle() { + return t("observe.action.choose.tripSeine.title"); + } + + @Override + public String getMoveMessage() { + return t("observe.action.choose.tripSeine.message"); + } + + @Override + public DecoratedNodeEntity[] getParentCandidates(OpenDataListFormUI<RouteDto, RouteReference> ui) { + return MoveDataHelper.getRouteParentCandidates(getParentId(), getOldParentNode(ui)); + } + + @Override + public void afterMoveData(ImmutableSet<String> dataIds, String newParentId, List<Integer> positions, OpenDataListFormUI<RouteDto, RouteReference> ui) { + super.afterMoveData(dataIds, newParentId, positions, ui); + + + NavigationTreeNodeSupport oldParentNode = getOldParentNode(ui); + + ObserveApplicationDataContext openDataManager = ObserveClientApplicationContext.applicationDataContext(); + NavigationTree treeHelper = ui.getDataSourceUI().getTree(); + + NavigationTreeNodeSupport oldTripSeineNode = oldParentNode.getParent(); + NavigationTreeNodeSupport programNode = oldTripSeineNode.getParent(); + NavigationTreeNodeSupport newTripSeineNode = treeHelper.getChild(programNode, newParentId); + String routesNodeId = ObserveI18nDecoratorHelper.getTypePluralI18nKey(RouteDto.class); + NavigationTreeNodeSupport newRoutesNode = treeHelper.getChild(newTripSeineNode, routesNodeId); + + // Let's check if we're moving an open route + String openId = openDataManager.getOpenRouteId(); + Optional<String> openRoute = openId != null && dataIds.contains(openId) ? Optional.of(openId) : Optional.empty(); + + // If so, we closeData it to avoid ending up with an open route into a closed trip. + if (openRoute.isPresent()) { + openDataManager.close(RouteDto.class); + } + + // Let's reload the sub tree of each routes node. + // As the change have already be done in database, we just call the child loaders to regenerate the routes nodes sub trees + treeHelper.reloadNodeSubTree(oldParentNode); + treeHelper.reloadNodeSubTree(newRoutesNode); + + // 1. Select the newRoutesNode : + // only a selected node can be reloaded (@see fr.ird.observe.client.ui.tree.ObserveTreeBridge.canLoadChild). + // (And also it's better for user experience because it puts the focus on the routes node which receive the routes) + // + // However, the node selection has to be done after that the trip has been opened : + // selecting the newRoutesNode opens a list layout which compute a rendering mode associated to the trip state. + // After the mode has been computed, it is injected in the list component which triggers listeners on associated components, such as buttons. + // + // That's why, if we do this before the trip is opened, + // we will end up with an incoherent list view (some buttons will be deactivated while they should be activated for instance) + treeHelper.selectNode(newRoutesNode); + + } } ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/TripSeineListUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/TripSeineListUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/TripSeineListUI.jaxx @@ -27,9 +27,7 @@ org.nuiton.jaxx.widgets.select.BeanListHeader </import> - <style source="../CommonOpenDataListFormUI.jcss"/> - - <TripSeineListUIModel id='model' title='observe.common.TripSeineDto.types'/> + <TripSeineListUIModel id='model'/> <JLabel id="emptyLabel" text='observe.common.TripDto.message.noneForTrip'/> <BeanListHeader id='listHeader' labelText='observe.common.TripDto.list'/> <JButton id='showSelectedData'/> ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/TripSeineListUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/TripSeineListUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/TripSeineListUIModel.java @@ -22,16 +22,24 @@ package fr.ird.observe.client.ds.editor.form.openlist.seine; * #L% */ +import com.google.common.collect.ImmutableSet; import fr.ird.observe.client.ClientApplicationContext; +import fr.ird.observe.client.ds.editor.form.MoveDataHelper; +import fr.ird.observe.client.ds.editor.form.openlist.OpenDataListFormUI; import fr.ird.observe.client.ds.editor.form.openlist.OpenDataListFormUIModel; import fr.ird.observe.client.ds.editor.form.spi.FormUIValidationMessageManager; +import fr.ird.observe.client.ds.editor.tree.navigation.nodes.NavigationTreeNodeSupport; +import fr.ird.observe.client.util.DecoratedNodeEntity; import fr.ird.observe.dto.data.seine.TripSeineDto; import fr.ird.observe.dto.data.seine.TripSeineReference; import fr.ird.observe.dto.reference.DtoReference; import fr.ird.observe.dto.referential.ProgramReference; import fr.ird.observe.services.service.data.seine.TripSeineService; +import java.util.List; + import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; /** * Created on 9/26/14. @@ -41,6 +49,10 @@ import static org.nuiton.i18n.I18n.n; */ public class TripSeineListUIModel extends OpenDataListFormUIModel<TripSeineDto, TripSeineReference, TripSeineService> { + public TripSeineListUIModel() { + setTitle(t("observe.common.TripSeineDto.types")); + } + @Override public void computeReadMessages(FormUIValidationMessageManager validationManager) { validationManager.addInfoMessage(n("observe.common.TripSeineDto.message.active.found.for.other.program")); @@ -63,4 +75,26 @@ public class TripSeineListUIModel extends OpenDataListFormUIModel<TripSeineDto, setTitle(title); super.openUI(); } + + @Override + public String getMoveTitle() { + return t("observe.action.choose.program.title"); + } + + @Override + public String getMoveMessage() { + return t("observe.action.choose.program.message"); + } + + @Override + public DecoratedNodeEntity[] getParentCandidates(OpenDataListFormUI<TripSeineDto, TripSeineReference> ui) { + return MoveDataHelper.getTripSeineParentCandidates(ui, getParentId()); + } + + @Override + public void afterMoveData(ImmutableSet<String> dataIds, String newParentId, List<Integer> positions, OpenDataListFormUI<TripSeineDto, TripSeineReference> ui) { + super.afterMoveData(dataIds, newParentId, positions, ui); + NavigationTreeNodeSupport oldParentNode = getOldParentNode(ui); + MoveDataHelper.moveTrips(ui.getDataSourceUI().getTree(), newParentId, dataIds, positions, oldParentNode); + } } ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/actions/OpenDataListFormUICreateActivitySeine.java deleted ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/actions/OpenDataListFormUICreateActivitySeine.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * #%L - * ObServe :: Client - * %% - * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.client.ds.editor.form.openlist.seine.actions; - -import fr.ird.observe.client.ObserveClientApplicationContext; -import fr.ird.observe.client.ds.editor.form.ObserveFormHelper; -import fr.ird.observe.client.ds.editor.form.open.seine.ActivitySeineUI; -import fr.ird.observe.client.ds.editor.form.openlist.OpenDataListFormUI; -import fr.ird.observe.client.ds.editor.form.openlist.actions.OpenDataListFormUICreateData; -import fr.ird.observe.client.ds.editor.tree.navigation.NavigationTree; -import fr.ird.observe.client.ds.editor.tree.navigation.nodes.NavigationTreeNodeSupport; -import fr.ird.observe.client.main.actions.MainUIMenuNavigationGoToOpenActivity; - -import javax.swing.tree.TreePath; -import java.awt.event.ActionEvent; - -/** - * FIXME!!! N'est plus utilisé mais on garde pour voir si ce n'est pas encore nécessaire - * Action pour fermer l'objet sous-jacent à l'écran et en créer un nouveau. - * - * @author Tony Chemit - dev(a)tchemit.fr - * @since 1.5 - */ -public class OpenDataListFormUICreateActivitySeine extends OpenDataListFormUICreateData { - - public OpenDataListFormUICreateActivitySeine() { -// super(n("observe.common.ActivityDto.action.closeAndCreate"), -// n("observe.common.ActivityDto.action.closeAndCreate.tip")); - } - - @Override - protected void doActionPerformed(ActionEvent e, OpenDataListFormUI ui) { - - //FIXME!!! Voir si c'est vraiment nécessaire, je comprends pas pourquoi le comportement change des autres types - String openId = ObserveClientApplicationContext.applicationDataContext().getOpenActivitySeineId(); - - NavigationTree tree = getDataSourceEditor().getTree(); - - boolean wasCollapsed = ObserveFormHelper.isOpenActivityNodeCollapsed(tree, openId); - - //FIXME!!! Voir si ça fonctionne bien - // selection du noeud de l'activité ouverte - getUi().getActionMap().get(MainUIMenuNavigationGoToOpenActivity.class).actionPerformed(null); - - NavigationTreeNodeSupport selectedNode = tree.getSelectedNode(); - selectedNode = tree.getActivitySeineNode(selectedNode, openId); - - tree.selectNode(selectedNode); - - // on conserve le path de l'activité - TreePath path = tree.getSelectionPath(); - - // recuperation de l'écran associé - ActivitySeineUI selectedUI = (ActivitySeineUI) getDataSourceEditor().getSelectedContentUI(); - - if (openId != null) { - // fermeture de l'activité et création d'une nouvelle - selectedUI.getCloseData().doClick(); - } - - selectedUI.getCreate().doClick(); - - if (wasCollapsed) { - - // on ferme le noeud de l'activity (qui a ete ouvert - // lors de la selection de celle-ci) - tree.collapsePath(path); - } - - } - -} ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/actions/OpenDataListFormUIMoveMultipleActivitySeine.java deleted ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/actions/OpenDataListFormUIMoveMultipleActivitySeine.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * #%L - * ObServe :: Client - * %% - * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.client.ds.editor.form.openlist.seine.actions; - -import fr.ird.observe.client.ObserveClientApplicationContext; -import fr.ird.observe.client.ds.editor.form.MoveDataHelper; -import fr.ird.observe.client.ds.editor.form.openlist.actions.OpenDataListFormUIMoveMultipleDataActionSupport; -import fr.ird.observe.client.ds.editor.tree.navigation.NavigationTree; -import fr.ird.observe.client.ds.editor.tree.navigation.nodes.NavigationTreeNodeSupport; -import fr.ird.observe.dto.data.seine.ActivitySeineDto; -import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; -import fr.ird.observe.spi.application.ObserveApplicationDataContext; - -import java.util.List; -import java.util.Optional; -import java.util.Set; - -import static org.nuiton.i18n.I18n.n; - -/** - * Action pour changer le programme d'une ou plusieurs marée dans la liste. - * - * @author Kevin Morin (Code Lutin) - * @since 5.0 - */ -public class OpenDataListFormUIMoveMultipleActivitySeine extends OpenDataListFormUIMoveMultipleDataActionSupport { - - public OpenDataListFormUIMoveMultipleActivitySeine() { - super(n("observe.common.ActivitySeineDto.action.moves"), - n("observe.common.ActivitySeineDto.action.moves.tip"), - "moveData-activities"); - } - - @Override - public Optional<String> getNewParentId() { - return MoveDataHelper.chooseNewRoute(getMainUI(), getOldParentNode()); - } - - @Override - public void updateUI(String newParentId, Set<String> dataIds, List<Integer> positions) { - - NavigationTreeNodeSupport oldParentNode = getOldParentNode(); - - ObserveApplicationDataContext openDataManager = ObserveClientApplicationContext.applicationDataContext(); - NavigationTree treeHelper = getDataSourceEditor().getTree(); - - NavigationTreeNodeSupport oldRouteNode = oldParentNode.getParent(); - NavigationTreeNodeSupport routesNode = oldRouteNode.getParent(); - NavigationTreeNodeSupport newRouteNode = treeHelper.getChild(routesNode, newParentId); - String activitiesNodeId = ObserveI18nDecoratorHelper.getTypePluralI18nKey(ActivitySeineDto.class); - NavigationTreeNodeSupport newActivitiesNode = treeHelper.getChild(newRouteNode, activitiesNodeId); - - // Let's check if we're moving an open activity - String openId = openDataManager.getOpenActivityLonglineObsId(); - Optional<String> openActivity = openId != null && dataIds.contains(openId) ? Optional.of(openId) : Optional.empty(); - - // If so, we closeData it to avoid ending up with an open activity into a closed route. - if (openActivity.isPresent()) { - openDataManager.close(ActivitySeineDto.class); - } - - // Let's reload the sub tree of each activities node. - // As the change have already be done in database, we just call the child loaders to regenerate the activities nodes sub trees - treeHelper.reloadNodeSubTree(oldParentNode); - treeHelper.reloadNodeSubTree(newActivitiesNode); - - // Let's put the focus on the activities node which received the activities - treeHelper.selectNode(newActivitiesNode); - } - -} ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/actions/OpenDataListFormUIMoveMultipleRoute.java deleted ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/actions/OpenDataListFormUIMoveMultipleRoute.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * #%L - * ObServe :: Client - * %% - * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.client.ds.editor.form.openlist.seine.actions; - -import fr.ird.observe.client.ObserveClientApplicationContext; -import fr.ird.observe.client.ds.editor.form.MoveDataHelper; -import fr.ird.observe.client.ds.editor.form.openlist.actions.OpenDataListFormUIMoveMultipleDataActionSupport; -import fr.ird.observe.client.ds.editor.tree.navigation.NavigationTree; -import fr.ird.observe.client.ds.editor.tree.navigation.nodes.NavigationTreeNodeSupport; -import fr.ird.observe.dto.data.seine.RouteDto; -import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; -import fr.ird.observe.spi.application.ObserveApplicationDataContext; - -import java.util.List; -import java.util.Optional; -import java.util.Set; - -import static org.nuiton.i18n.I18n.n; - -/** - * Action pour changer le programme d'une ou plusieurs marée dans la liste. - * - * @author Kevin Morin (Code Lutin) - * @since 5.0 - */ -public class OpenDataListFormUIMoveMultipleRoute extends OpenDataListFormUIMoveMultipleDataActionSupport { - - public OpenDataListFormUIMoveMultipleRoute() { - super(n("observe.common.RouteDto.action.moves"), - n("observe.common.RouteDto.action.moves.tip"), - "moveData-routes"); - } - - @Override - public Optional<String> getNewParentId() { - return MoveDataHelper.chooseNewTripSeine(getMainUI(), getOldParentNode()); - } - - - @Override - public void updateUI(String tripSeineId, Set<String> dataIds, List<Integer> positions) { - - NavigationTreeNodeSupport oldParentNode = getOldParentNode(); - - ObserveApplicationDataContext openDataManager = ObserveClientApplicationContext.applicationDataContext(); - NavigationTree treeHelper = getDataSourceEditor().getTree(); - - NavigationTreeNodeSupport oldTripSeineNode = oldParentNode.getParent(); - NavigationTreeNodeSupport programNode = oldTripSeineNode.getParent(); - NavigationTreeNodeSupport newTripSeineNode = treeHelper.getChild(programNode, tripSeineId); - String routesNodeId = ObserveI18nDecoratorHelper.getTypePluralI18nKey(RouteDto.class); - NavigationTreeNodeSupport newRoutesNode = treeHelper.getChild(newTripSeineNode, routesNodeId); - - // Let's check if we're moving an open route - String openId = openDataManager.getOpenRouteId(); - Optional<String> openRoute = openId != null && dataIds.contains(openId) ? Optional.of(openId) : Optional.empty(); - - // If so, we closeData it to avoid ending up with an open route into a closed trip. - if (openRoute.isPresent()) { - openDataManager.close(RouteDto.class); - } - - // Let's reload the sub tree of each routes node. - // As the change have already be done in database, we just call the child loaders to regenerate the routes nodes sub trees - treeHelper.reloadNodeSubTree(oldParentNode); - treeHelper.reloadNodeSubTree(newRoutesNode); - - // 1. Select the newRoutesNode : - // only a selected node can be reloaded (@see fr.ird.observe.client.ui.tree.ObserveTreeBridge.canLoadChild). - // (And also it's better for user experience because it puts the focus on the routes node which receive the routes) - // - // However, the node selection has to be done after that the trip has been opened : - // selecting the newRoutesNode opens a list layout which compute a rendering mode associated to the trip state. - // After the mode has been computed, it is injected in the list component which triggers listeners on associated components, such as buttons. - // - // That's why, if we do this before the trip is opened, - // we will end up with an incoherent list view (some buttons will be deactivated while they should be activated for instance) - treeHelper.selectNode(newRoutesNode); - - } - -} ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/actions/OpenDataListFormUIMoveMultipleTripSeine.java deleted ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/actions/OpenDataListFormUIMoveMultipleTripSeine.java +++ /dev/null @@ -1,38 +0,0 @@ -package fr.ird.observe.client.ds.editor.form.openlist.seine.actions; - -/*- - * #%L - * ObServe :: Client - * %% - * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.client.ds.editor.form.openlist.OpenDataListFormUIMoveMultipleTripActionSupport; -import fr.ird.observe.dto.referential.GearType; - -/** - * @author Kevin Morin (Code Lutin) - * @since 5.0 - */ -public class OpenDataListFormUIMoveMultipleTripSeine extends OpenDataListFormUIMoveMultipleTripActionSupport { - - public OpenDataListFormUIMoveMultipleTripSeine() { - super(GearType.seine); - } - -} View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/baec96e5059068c2a48461457ce… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/baec96e5059068c2a48461457ce… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: use jaxx snapshot
by Tony CHEMIT Dec. 21, 2017

Dec. 21, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: df4ec157 by Tony CHEMIT at 2017-12-21T17:36:01+01:00 use jaxx snapshot - - - - - f1f12485 by Tony CHEMIT at 2017-12-21T17:36:32+01:00 lets add createdate and version to any IdDto - - - - - d70a4053 by Tony CHEMIT at 2017-12-21T17:36:45+01:00 fix test - - - - - 6c858fe2 by Tony CHEMIT at 2017-12-21T17:46:17+01:00 continue ui storm - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/ObserveClientImplementationFactory.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/CommonOpenDataFormUI.jcss - − client/src/main/java/fr/ird/observe/client/ds/editor/form/open/OpenDataFormUIMoveTripActionSupport.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/ActivityLonglineObsUI.jaxx - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/ActivityLonglineObsUI.jcss - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/ActivityLonglineObsUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/TripLonglineUI.jaxx - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/TripLonglineUI.jcss - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/TripLonglineUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUIAddSetLonglineObs.java → client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/AddSetLonglineObs.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUIMoveActivityLongline.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUIMoveTripLongline.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUI.jaxx - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUI.jcss - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/RouteUI.jaxx - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/RouteUI.jcss - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/RouteUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/TripSeineUI.jaxx - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/TripSeineUI.jcss - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/TripSeineUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/actions/OpenDataFormUIAddFloatingObject.java → client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/actions/AddFloatingObject.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/actions/OpenDataFormUIAddSetSeine.java → client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/actions/AddSetSeine.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/actions/OpenDataFormUIMoveActivitySeine.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/actions/OpenDataFormUIMoveRoute.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/actions/OpenDataFormUIMoveTripSeine.java - − client/src/main/java/fr/ird/observe/client/ds/editor/tree/ObserveNavigationTreeShowPopupAction.java - dto/src/main/models/Observe.model - pom.xml - services-local/src/test/java/fr/ird/observe/spi/persistence/PersistenceModuleHelperTest.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ObserveClientImplementationFactory.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ObserveClientImplementationFactory.java +++ b/client/src/main/java/fr/ird/observe/client/ObserveClientImplementationFactory.java @@ -24,8 +24,6 @@ package fr.ird.observe.client; import fr.ird.observe.client.ds.ObserveClientDataSource; import fr.ird.observe.client.ds.ObserveDataSourceServicesProvider; -import fr.ird.observe.client.ds.editor.DataSourceUI; -import fr.ird.observe.client.ds.editor.tree.ObserveNavigationTreeShowPopupAction; import fr.ird.observe.client.ds.editor.tree.navigation.ObserveNavigationTree; import fr.ird.observe.client.ds.editor.tree.selection.ObserveSelectionTree; import fr.ird.observe.client.main.ObserveMainUI; @@ -148,9 +146,6 @@ public class ObserveClientImplementationFactory implements ClientImplementationF // set fullscreen property on main ui ui.getGraphicsConfiguration().getDevice().setFullScreenWindow(config.isFullScreen() ? ui : null); - DataSourceUI dataSourceEditor = ui.getDataSourceEditor(); - new ObserveNavigationTreeShowPopupAction(dataSourceEditor.getTree(), dataSourceEditor.getNavigationTree(), dataSourceEditor.getNavigationPopup()); - return ui; } ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/CommonOpenDataFormUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/CommonOpenDataFormUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/CommonOpenDataFormUI.jcss @@ -63,9 +63,3 @@ BigTextBeanEditor { model:{bean}; } -#model { - editable:true; - modified:{validator.isChanged()}; - valid:{validator.isValid()}; -} - ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/OpenDataFormUIMoveTripActionSupport.java deleted ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/OpenDataFormUIMoveTripActionSupport.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * #%L - * ObServe :: Client - * %% - * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.client.ds.editor.form.open; - -import fr.ird.observe.client.ds.editor.form.MoveDataHelper; -import fr.ird.observe.client.ds.editor.form.open.actions.OpenDataFormUIMoveSingleDataActionSupport; -import fr.ird.observe.client.ds.editor.tree.navigation.nodes.NavigationTreeNodeSupport; -import fr.ird.observe.dto.data.OpenableDto; -import fr.ird.observe.dto.reference.DataDtoReference; -import fr.ird.observe.dto.referential.GearType; - -import java.util.Optional; - -/** - * Action pour changer le programme d'une ou plusieurs marée dans la liste. - * - * @author Tony Chemit - dev(a)tchemit.fr - * @since 5.0 - */ -public abstract class OpenDataFormUIMoveTripActionSupport<D extends OpenableDto, R extends DataDtoReference<D, R>> extends OpenDataFormUIMoveSingleDataActionSupport<D,R> { - - private final GearType gearType; - - protected OpenDataFormUIMoveTripActionSupport(String label, String tip, GearType gearType) { - super(label, tip, "move-trips"); - this.gearType = gearType; - } - - @Override - public Optional<String> getNewParentId() { - return MoveDataHelper.chooseNewProgram(getMainUI(), gearType, getOldParentNode().getId()); - } - - @Override - public NavigationTreeNodeSupport getNewParentNode(String newParentId) { - return getDataSourceEditor().getTree().getChild(getOldParentNode().getParent(), newParentId); - } - -} ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/ActivityLonglineObsUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/ActivityLonglineObsUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/ActivityLonglineObsUI.jaxx @@ -131,6 +131,7 @@ <JButton id='delete'/> <JButton id='openData'/> <JButton id='closeData'/> + <JButton id='moveData'/> <JButton id='create'/> </fr.ird.observe.client.ds.editor.form.open.OpenDataFormUI> ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/ActivityLonglineObsUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/ActivityLonglineObsUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/ActivityLonglineObsUI.jcss @@ -49,10 +49,16 @@ toolTipText:"observe.common.ActivityDto.action.closeAndCreate.tip"; } +#moveData { + text:"observe.menu.navigation.action.move.activityLongline"; + toolTipText:"observe.menu.navigation.action.move.activityLongline"; + actionIcon:move-activities; +} + #delete { toolTipText:"observe.common.ActivityDto.action.delete.tip"; } #addSet { - actionType:"fr.ird.observe.client.ds.editor.form.open.longline.actions.OpenDataFormUIAddSetLonglineObs.class"; + actionType:"fr.ird.observe.client.ds.editor.form.open.longline.actions.AddSetLonglineObs.class"; } ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/ActivityLonglineObsUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/ActivityLonglineObsUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/ActivityLonglineObsUIModel.java @@ -29,10 +29,17 @@ import fr.ird.observe.client.ds.editor.form.open.OpenDataFormUI; import fr.ird.observe.client.ds.editor.form.open.OpenDataFormUILayoutFocusTraversalPolicy; import fr.ird.observe.client.ds.editor.form.open.OpenDataFormUIModel; import fr.ird.observe.client.ds.editor.form.spi.FormUIValidationMessageManager; +import fr.ird.observe.client.ds.editor.tree.navigation.NavigationTree; +import fr.ird.observe.client.ds.editor.tree.navigation.nodes.NavigationTreeNodeSupport; +import fr.ird.observe.client.ds.editor.tree.navigation.nodes.longline.TripLonglineNavigationTreeNode; +import fr.ird.observe.client.util.DecoratedNodeEntity; import fr.ird.observe.dto.data.longline.ActivityLonglineObsDto; import fr.ird.observe.dto.data.longline.ActivityLonglineObsHelper; import fr.ird.observe.dto.data.longline.ActivityLonglineObsReference; import fr.ird.observe.dto.data.longline.TripLonglineDto; +import fr.ird.observe.dto.data.longline.TripLonglineReference; +import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; +import fr.ird.observe.dto.decoration.decorators.DataReferenceDecorator; import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.dto.referential.longline.VesselActivityLonglineHelper; import fr.ird.observe.dto.referential.longline.VesselActivityLonglineReference; @@ -146,7 +153,8 @@ public class ActivityLonglineObsUIModel extends OpenDataFormUIModel<ActivityLong } } - public void afterOpen(OpenDataFormUI<ActivityLonglineObsDto, ActivityLonglineObsReference> ui) { + @Override + public void afterOpenData(OpenDataFormUI<ActivityLonglineObsDto, ActivityLonglineObsReference> ui) { String setLonglineId = Optional.ofNullable(getBean().getSetLonglineObs()).map(DataDtoReference::getId).orElse(null); ObserveFormHelper.getApplicationDataSourceContext(ui).setOpenSetLonglineObsId(setLonglineId); } @@ -170,4 +178,46 @@ public class ActivityLonglineObsUIModel extends OpenDataFormUIModel<ActivityLong }; } + + @Override + public DecoratedNodeEntity[] getParentCandidates(OpenDataFormUI<ActivityLonglineObsDto, ActivityLonglineObsReference> ui) { + NavigationTreeNodeSupport oldParentNode = getOldParentNode(ui); + NavigationTreeNodeSupport programNode = oldParentNode.getParent(); + String oldTripLonglineId = oldParentNode.getId(); + int tripLonglineNb = programNode.getChildCount(); + + ObserveClientApplicationContext applicationContext = ObserveClientApplicationContext.get(); + DataReferenceDecorator<TripLonglineReference> decorator = applicationContext.getDataReferenceDecorator(TripLonglineReference.class, null); + + //on crée un tableau avec une marée en moins car on ne propose pas la marée actuelle + DecoratedNodeEntity[] decoratedTripLonglines = new DecoratedNodeEntity[tripLonglineNb - 1]; + + int j = 0; + for (int i = 0; i < tripLonglineNb; i++) { + TripLonglineNavigationTreeNode tripLonglineNode = (TripLonglineNavigationTreeNode) programNode.getChildAt(i); + String tripLonglineId = tripLonglineNode.getId(); + if (!oldTripLonglineId.equals(tripLonglineId)) { + decoratedTripLonglines[j++] = DecoratedNodeEntity.newDecoratedNodeEntity(tripLonglineNode, decorator); + } + } + return decoratedTripLonglines; + } + + @Override + public String getMoveTitle() { + return t("observe.action.choose.tripLongline.title"); + } + + @Override + public String getMoveMessage() { + return t("observe.action.choose.tripLongline.message"); + } + + + @Override + public NavigationTreeNodeSupport getNewParentNode(NavigationTree tree, NavigationTreeNodeSupport oldParentNode, String newParentId) { + NavigationTreeNodeSupport tripLonglineNode = tree.getChild(oldParentNode.getParent(), newParentId); + String activitiesNodeId = ObserveI18nDecoratorHelper.getTypePluralI18nKey(ActivityLonglineObsDto.class); + return tree.getChild(tripLonglineNode, activitiesNodeId); + } } ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/TripLonglineUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/TripLonglineUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/TripLonglineUI.jaxx @@ -30,7 +30,6 @@ <import> fr.ird.observe.dto.data.longline.TripLonglineDto fr.ird.observe.dto.data.longline.TripLonglineReference - fr.ird.observe.dto.data.longline.TripLonglineActivityObsDto fr.ird.observe.dto.referential.HarbourReference fr.ird.observe.dto.referential.VesselReference fr.ird.observe.dto.referential.PersonReference @@ -202,11 +201,12 @@ </tab> </JTabbedPane> </JPanel> + <JButton id='create'/> <JButton id='reset'/> <JButton id='save'/> <JButton id='delete'/> <JButton id='openData'/> <JButton id='closeData'/> - <JButton id='create'/> + <JButton id='moveData'/> </fr.ird.observe.client.ds.editor.form.open.OpenDataFormUI> ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/TripLonglineUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/TripLonglineUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/TripLonglineUI.jcss @@ -44,3 +44,10 @@ #delete { toolTipText:"observe.common.TripDto.action.delete.tip"; } + + +#moveData { + text:"observe.menu.navigation.action.move.tripLongline"; + toolTipText:"observe.menu.navigation.action.move.tripLongline"; + actionIcon:move-trips; +} ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/TripLonglineUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/TripLonglineUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/TripLonglineUIModel.java @@ -32,19 +32,27 @@ import fr.ird.observe.client.ds.editor.form.open.OpenDataFormUI; import fr.ird.observe.client.ds.editor.form.open.OpenDataFormUILayoutFocusTraversalPolicy; import fr.ird.observe.client.ds.editor.form.open.OpenDataFormUIModel; import fr.ird.observe.client.ds.editor.form.spi.FormUIValidationMessageManager; +import fr.ird.observe.client.ds.editor.tree.navigation.NavigationTree; import fr.ird.observe.client.ds.editor.tree.navigation.ObserveNavigationTree; +import fr.ird.observe.client.ds.editor.tree.navigation.nodes.NavigationTreeNodeSupport; +import fr.ird.observe.client.ds.editor.tree.navigation.nodes.longline.TripLonglineListNavigationTreeNode; +import fr.ird.observe.client.util.DecoratedNodeEntity; +import fr.ird.observe.dto.IdHelper; import fr.ird.observe.dto.data.longline.TripLonglineDto; import fr.ird.observe.dto.data.longline.TripLonglineReference; +import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.dto.reference.DtoReferenceCollection; import fr.ird.observe.dto.reference.ReferentialReferencesFilter; import fr.ird.observe.dto.referential.PersonHelper; import fr.ird.observe.dto.referential.PersonReference; +import fr.ird.observe.dto.referential.ProgramReference; import fr.ird.observe.dto.referential.VesselHelper; import fr.ird.observe.dto.referential.VesselReference; import fr.ird.observe.services.service.data.longline.TripLonglineService; import java.awt.Component; import java.awt.Container; +import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -94,7 +102,7 @@ public class TripLonglineUIModel extends OpenDataFormUIModel<TripLonglineDto, Tr @Override public int moveData(String newParentId) { -// FIXME!!! +// FIXME!!! Ce n'est pas l'endroit pour gérer cet état (à faire dans l'action) // Close old program and open new program // if (getOpenDataManager().isOpen(dataId)) { // getOpenDataManager().closeProgram(oldParentId); @@ -170,4 +178,51 @@ public class TripLonglineUIModel extends OpenDataFormUIModel<TripLonglineDto, Tr ObserveFormHelper.getApplicationDataSourceContext(this).closeProgram(); super.closeData(); } + + @Override + public DecoratedNodeEntity[] getParentCandidates(OpenDataFormUI<TripLonglineDto, TripLonglineReference> ui) { + + NavigationTree treeHelper = ui.getDataSourceUI().getTree(); + + // racine + NavigationTreeNodeSupport rootNode = treeHelper.getRootNode(); + + //on crée un tableau avec un programme en moins car on ne propose pas le programme actuel + List<DecoratedNodeEntity> decoratedProgramList = new ArrayList<>(); + + ReferentialReferenceDecorator<ProgramReference> programDecorator = ui.getMainUI().getApplicationContext().getDecoratorService().getReferentialReferenceDecorator(ProgramReference.class); + + String parentId = getParentId(); + for (int i = 0, n = rootNode.getChildCount(); i < n; i++) { + + NavigationTreeNodeSupport programNode = (NavigationTreeNodeSupport) rootNode.getChildAt(i); + String programId = programNode.getId(); + + // si le noeud programme n'est pas le même que le parent actuel + // si le noeud est bien un noeud de programme + if (programId != null && IdHelper.isProgramId(programId) && !parentId.equals(programId)) { + if (programNode instanceof TripLonglineListNavigationTreeNode) { + TripLonglineListNavigationTreeNode node = (TripLonglineListNavigationTreeNode) programNode; + decoratedProgramList.add(DecoratedNodeEntity.newDecoratedNodeEntity(node, programDecorator)); + } + } + } + return decoratedProgramList.toArray(new DecoratedNodeEntity[decoratedProgramList.size()]); + } + + + @Override + public String getMoveTitle() { + return t("observe.action.choose.program.title"); + } + + @Override + public String getMoveMessage() { + return t("observe.action.choose.program.message"); + } + + @Override + protected NavigationTreeNodeSupport getNewParentNode(NavigationTree tree, NavigationTreeNodeSupport oldParentNode, String newParentId) { + return tree.getChild(oldParentNode.getParent(), newParentId); + } } ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUIAddSetLonglineObs.java → client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/AddSetLonglineObs.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUIAddSetLonglineObs.java +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/AddSetLonglineObs.java @@ -41,9 +41,9 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - dev(a)tchemit.fr * @since 6.0 */ -public class OpenDataFormUIAddSetLonglineObs extends OpenDataFormUIActionSupport<ActivityLonglineObsDto, ActivityLonglineObsReference> { +public class AddSetLonglineObs extends OpenDataFormUIActionSupport<ActivityLonglineObsDto, ActivityLonglineObsReference> { - public OpenDataFormUIAddSetLonglineObs() { + public AddSetLonglineObs() { super(t("observe.common.ActivityLonglineObsDto.action.addSet"), t("observe.common.ActivityLonglineObsDto.action.addSet.tip"), "add", ObserveKeyStrokes.KEY_STROKE_ADD_SET_LONGLINE); ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUIMoveActivityLongline.java deleted ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUIMoveActivityLongline.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * #%L - * ObServe :: Client - * %% - * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.client.ds.editor.form.open.longline.actions; - -import fr.ird.observe.client.ds.editor.form.MoveDataHelper; -import fr.ird.observe.client.ds.editor.form.open.actions.OpenDataFormUIMoveSingleDataActionSupport; -import fr.ird.observe.client.ds.editor.tree.navigation.NavigationTree; -import fr.ird.observe.client.ds.editor.tree.navigation.nodes.NavigationTreeNodeSupport; -import fr.ird.observe.dto.data.longline.ActivityLonglineObsDto; -import fr.ird.observe.dto.data.longline.ActivityLonglineObsReference; -import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; - -import java.util.Optional; - -import static org.nuiton.i18n.I18n.n; - -/** - * Action pour changer le programme d'une ou plusieurs marée dans la liste. - * - * @author Tony Chemit - dev(a)ultreia.io - * @since 5.0 - */ -public class OpenDataFormUIMoveActivityLongline extends OpenDataFormUIMoveSingleDataActionSupport<ActivityLonglineObsDto,ActivityLonglineObsReference> { - - public OpenDataFormUIMoveActivityLongline() { - super(n("observe.menu.navigation.action.move.activityLongline"), - n("observe.menu.navigation.action.move.activityLongline"), - "move-activities"); - } - - @Override - public Optional<String> getNewParentId() { - return MoveDataHelper.chooseNewTripLongline(getMainUI(), getOldParentNode()); - } - - @Override - public NavigationTreeNodeSupport getNewParentNode(String newParentId) { - NavigationTree tree = getDataSourceEditor().getTree(); - NavigationTreeNodeSupport tripLonglineNode = tree.getChild(getOldParentNode().getParent(), newParentId); - String activitiesNodeId = ObserveI18nDecoratorHelper.getTypePluralI18nKey(ActivityLonglineObsDto.class); - return tree.getChild(tripLonglineNode, activitiesNodeId); - } - -} ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUIMoveTripLongline.java deleted ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUIMoveTripLongline.java +++ /dev/null @@ -1,44 +0,0 @@ -package fr.ird.observe.client.ds.editor.form.open.longline.actions; - -/*- - * #%L - * ObServe :: Client - * %% - * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.client.ds.editor.form.open.OpenDataFormUIMoveTripActionSupport; -import fr.ird.observe.dto.data.longline.TripLonglineDto; -import fr.ird.observe.dto.data.longline.TripLonglineReference; -import fr.ird.observe.dto.referential.GearType; - -import static org.nuiton.i18n.I18n.n; - -/** - * @author Tony Chemit - dev(a)tchemit.fr - * @since 5.0 - */ -public class OpenDataFormUIMoveTripLongline extends OpenDataFormUIMoveTripActionSupport<TripLonglineDto, TripLonglineReference> { - - public OpenDataFormUIMoveTripLongline() { - super(n("observe.menu.navigation.action.move.tripLongline"), - n("observe.menu.navigation.action.move.tripLongline"), - GearType.longline); - } - -} ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUI.jaxx @@ -272,11 +272,12 @@ </cell> </row> </Table> + <JButton id='create'/> <JButton id='reset'/> <JButton id='save'/> <JButton id='delete'/> <JButton id='openData'/> <JButton id='closeData'/> - <JButton id='create'/> + <JButton id='moveData'/> </fr.ird.observe.client.ds.editor.form.open.OpenDataFormUI> ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUI.jcss @@ -91,9 +91,15 @@ } #addSet { - actionType:"fr.ird.observe.client.ds.editor.form.open.seine.actions.OpenDataFormUIAddSetSeine.class"; + actionType:"fr.ird.observe.client.ds.editor.form.open.seine.actions.AddSetSeine.class"; } #addDCP { - actionType:"fr.ird.observe.client.ds.editor.form.open.seine.actions.OpenDataFormUIAddFloatingObject.class"; + actionType:"fr.ird.observe.client.ds.editor.form.open.seine.actions.AddFloatingObject.class"; +} + +#moveData { + text:"observe.menu.navigation.action.move.activitySeine"; + toolTipText:"observe.menu.navigation.action.move.activitySeine"; + actionIcon:move-activities; } ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUIModel.java @@ -31,16 +31,21 @@ import fr.ird.observe.client.ds.editor.form.open.OpenDataFormUI; import fr.ird.observe.client.ds.editor.form.open.OpenDataFormUILayoutFocusTraversalPolicy; import fr.ird.observe.client.ds.editor.form.open.OpenDataFormUIModel; import fr.ird.observe.client.ds.editor.form.spi.FormUIValidationMessageManager; +import fr.ird.observe.client.ds.editor.tree.navigation.NavigationTree; +import fr.ird.observe.client.ds.editor.tree.navigation.nodes.NavigationTreeNodeSupport; +import fr.ird.observe.client.ds.editor.tree.navigation.nodes.seine.RouteSeineNavigationTreeNode; +import fr.ird.observe.client.util.DecoratedNodeEntity; import fr.ird.observe.dto.data.seine.ActivitySeineDto; import fr.ird.observe.dto.data.seine.ActivitySeineReference; import fr.ird.observe.dto.data.seine.RouteDto; +import fr.ird.observe.dto.data.seine.RouteReference; import fr.ird.observe.dto.data.seine.TripSeineDto; +import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; +import fr.ird.observe.dto.decoration.decorators.DataReferenceDecorator; import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.dto.referential.seine.VesselActivitySeineHelper; import fr.ird.observe.dto.referential.seine.VesselActivitySeineReference; import fr.ird.observe.services.service.data.seine.ActivitySeineService; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import javax.swing.JComponent; import javax.swing.JSpinner; @@ -85,14 +90,11 @@ public class ActivitySeineUIModel extends OpenDataFormUIModel<ActivitySeineDto, ActivitySeineDto.PROPERTY_DETECTION_MODE, ActivitySeineDto.PROPERTY_REASON_FOR_NO_FISHING).build(); - private static final Log log = LogFactory.getLog(ActivitySeineUIModel.class); private static final String PROPERTY_SET_OPERATION = "setOperation"; private static final String PROPERTY_DCP_OPERATION = "dcpOperation"; private static final String PROPERTY_CHANGED_ZONE_OPERATION = "changedZoneOperation"; - private String activity6Label; public ActivitySeineUIModel() { - super(); bean.addPropertyChangeListener(ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, evt -> { VesselActivitySeineReference oldActivitySeine = (VesselActivitySeineReference) evt.getOldValue(); VesselActivitySeineReference newActivitySeine = (VesselActivitySeineReference) evt.getNewValue(); @@ -121,7 +123,8 @@ public class ActivitySeineUIModel extends OpenDataFormUIModel<ActivitySeineDto, } } - public void afterOpen(OpenDataFormUI<ActivitySeineDto, ActivitySeineReference> ui) { + @Override + public void afterOpenData(OpenDataFormUI<ActivitySeineDto, ActivitySeineReference> ui) { String setSeineId = Optional.ofNullable(getBean().getSetSeine()).map(DataDtoReference::getId).orElse(null); ObserveFormHelper.getApplicationDataSourceContext(ui).setOpenSetSeineId(setSeineId); } @@ -179,15 +182,15 @@ public class ActivitySeineUIModel extends OpenDataFormUIModel<ActivitySeineDto, ui1.getAddDCP().setVisible(bean.isDcpOperation()); ui.getExtraActions().setVisible(isUpdatingMode()); - VesselActivitySeineReference activity6 = getActivity6Label(); - String activity6Label = ClientApplicationContext.get().getDecoratorService().getReferentialReferenceDecorator(VesselActivitySeineReference.class).toString(activity6); + VesselActivitySeineReference fishingOperationActivity = getFishingOperationActivity(); + String activity6Label = ClientApplicationContext.get().getDecoratorService().getReferentialReferenceDecorator(VesselActivitySeineReference.class).toString(fishingOperationActivity); String text = t("observe.common.ActivitySeineDto.vesselActivitySeine.comment", activity6Label); ui1.vesselActivityInformation.setText(text); ui1.vesselActivityInformation.setToolTipText(text); } - private VesselActivitySeineReference getActivity6Label() { + private VesselActivitySeineReference getFishingOperationActivity() { List<VesselActivitySeineReference> activities = getReferentialReferences(ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE); for (VesselActivitySeineReference vesselActivity : activities) { @@ -239,4 +242,46 @@ public class ActivitySeineUIModel extends OpenDataFormUIModel<ActivitySeineDto, } }; } + + @Override + public DecoratedNodeEntity[] getParentCandidates(OpenDataFormUI<ActivitySeineDto, ActivitySeineReference> ui) { + NavigationTreeNodeSupport oldParentNode = getOldParentNode(ui); + NavigationTreeNodeSupport routesNode = oldParentNode.getParent(); + String oldRouteId = oldParentNode.getId(); + int routeNb = routesNode.getChildCount(); + + ObserveClientApplicationContext applicationContext = ObserveClientApplicationContext.get(); + DataReferenceDecorator<RouteReference> decorator = applicationContext.getDecoratorService().getDataReferenceDecorator(RouteReference.class); + + //on crée un tableau avec une route en moins car on ne propose pas la route actuel + DecoratedNodeEntity[] decoratedRoutes = new DecoratedNodeEntity[routeNb - 1]; + + int j = 0; + for (int i = 0; i < routeNb; i++) { + RouteSeineNavigationTreeNode routeNode = (RouteSeineNavigationTreeNode) routesNode.getChildAt(i); + String routeId = routeNode.getId(); + if (!oldRouteId.equals(routeId)) { + decoratedRoutes[j++] = DecoratedNodeEntity.newDecoratedNodeEntity(routeNode, decorator); + } + } + return decoratedRoutes; + } + + + @Override + public String getMoveTitle() { + return t("observe.action.choose.route.title"); + } + + @Override + public String getMoveMessage() { + return t("observe.action.choose.route.message"); + } + + @Override + protected NavigationTreeNodeSupport getNewParentNode(NavigationTree tree, NavigationTreeNodeSupport oldParentNode, String newParentId) { + NavigationTreeNodeSupport routeNode = tree.getChild(oldParentNode.getParent(), newParentId); + String activitiesNodeId = ObserveI18nDecoratorHelper.getTypePluralI18nKey(ActivitySeineDto.class); + return tree.getChild(routeNode, activitiesNodeId); + } } ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/RouteUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/RouteUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/RouteUI.jaxx @@ -88,10 +88,12 @@ </Table> </JPanel> -  + <JButton id='create'/> + <JButton id='reset'/> + <JButton id='save'/> <JButton id='delete'/> <JButton id='openData'/> <JButton id='closeData'/> - <JButton id='create'/> + <JButton id='moveData'/> </fr.ird.observe.client.ds.editor.form.open.OpenDataFormUI> ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/RouteUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/RouteUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/RouteUI.jcss @@ -40,3 +40,9 @@ #delete { toolTipText:"observe.common.RouteDto.action.delete.tip"; } + +#moveData { + text:"observe.menu.navigation.action.move.route"; + toolTipText:"observe.menu.navigation.action.move.route"; + actionIcon:move-routes; +} ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/RouteUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/RouteUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/RouteUIModel.java @@ -30,13 +30,18 @@ import fr.ird.observe.client.ds.editor.form.open.OpenDataFormUI; import fr.ird.observe.client.ds.editor.form.open.OpenDataFormUILayoutFocusTraversalPolicy; import fr.ird.observe.client.ds.editor.form.open.OpenDataFormUIModel; import fr.ird.observe.client.ds.editor.form.spi.FormUIValidationMessageManager; +import fr.ird.observe.client.ds.editor.tree.navigation.NavigationTree; import fr.ird.observe.client.ds.editor.tree.navigation.ObserveNavigationTree; import fr.ird.observe.client.ds.editor.tree.navigation.nodes.NavigationTreeNodeSupport; +import fr.ird.observe.client.ds.editor.tree.navigation.nodes.seine.TripSeineNavigationTreeNode; +import fr.ird.observe.client.util.DecoratedNodeEntity; import fr.ird.observe.dto.data.seine.ActivitySeineDto; import fr.ird.observe.dto.data.seine.RouteDto; import fr.ird.observe.dto.data.seine.RouteReference; import fr.ird.observe.dto.data.seine.TripSeineDto; +import fr.ird.observe.dto.data.seine.TripSeineReference; import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; +import fr.ird.observe.dto.decoration.decorators.DataReferenceDecorator; import fr.ird.observe.dto.referential.seine.VesselActivitySeineHelper; import fr.ird.observe.dto.referential.seine.VesselActivitySeineReference; import fr.ird.observe.services.service.data.seine.RouteService; @@ -241,4 +246,50 @@ public class RouteUIModel extends OpenDataFormUIModel<RouteDto, RouteReference, } } + @Override + public DecoratedNodeEntity[] getParentCandidates(OpenDataFormUI<RouteDto, RouteReference> ui) { + + NavigationTreeNodeSupport oldTripSeineNode = getOldParentNode(ui); + + NavigationTreeNodeSupport programNode = oldTripSeineNode.getParent(); + String oldTripSeineId = oldTripSeineNode.getId(); + int tripSeineNb = programNode.getChildCount(); + + ClientApplicationContext applicationContext = ClientApplicationContext.get(); + DataReferenceDecorator decorator = applicationContext.getDecoratorService().getDataReferenceDecorator(TripSeineReference.class); + + //on crée un tableau avec une marée en moins car on ne propose pas la marée actuel + DecoratedNodeEntity[] decoratedTripSeines = new DecoratedNodeEntity[tripSeineNb - 1]; + + int j = 0; + for (int i = 0; i < tripSeineNb; i++) { + + TripSeineNavigationTreeNode tripSeineNode = (TripSeineNavigationTreeNode) programNode.getChildAt(i); + + String tripSeineId = tripSeineNode.getId(); + + if (!oldTripSeineId.equals(tripSeineId)) { + decoratedTripSeines[j++] = DecoratedNodeEntity.newDecoratedNodeEntity(tripSeineNode, decorator); + } + } + return decoratedTripSeines; + } + + + @Override + public String getMoveTitle() { + return t("observe.action.choose.tripSeine.title"); + } + + @Override + public String getMoveMessage() { + return t("observe.action.choose.tripSeine.message"); + } + + @Override + protected NavigationTreeNodeSupport getNewParentNode(NavigationTree tree, NavigationTreeNodeSupport oldParentNode, String newParentId) { + NavigationTreeNodeSupport tripNode = tree.getChild(oldParentNode.getParent(), newParentId); + String routesNodeId = ObserveI18nDecoratorHelper.getTypePluralI18nKey(RouteDto.class); + return tree.getChild(tripNode, routesNodeId); + } } ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/TripSeineUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/TripSeineUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/TripSeineUI.jaxx @@ -209,11 +209,12 @@ </tab> </JTabbedPane> </JPanel> + <JButton id='create'/> <JButton id='reset'/> <JButton id='save'/> <JButton id='delete'/> <JButton id='openData'/> <JButton id='closeData'/> - <JButton id='create'/> + <JButton id='moveData'/> </fr.ird.observe.client.ds.editor.form.open.OpenDataFormUI> ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/TripSeineUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/TripSeineUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/TripSeineUI.jcss @@ -54,3 +54,9 @@ #delete { toolTipText:"observe.common.TripDto.action.delete.tip"; } + +#moveData { + text:"observe.menu.navigation.action.move.tripSeine"; + toolTipText:"observe.menu.navigation.action.move.tripSeine"; + actionIcon:move-trips; +} ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/TripSeineUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/TripSeineUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/TripSeineUIModel.java @@ -32,19 +32,27 @@ import fr.ird.observe.client.ds.editor.form.open.OpenDataFormUI; import fr.ird.observe.client.ds.editor.form.open.OpenDataFormUILayoutFocusTraversalPolicy; import fr.ird.observe.client.ds.editor.form.open.OpenDataFormUIModel; import fr.ird.observe.client.ds.editor.form.spi.FormUIValidationMessageManager; +import fr.ird.observe.client.ds.editor.tree.navigation.NavigationTree; import fr.ird.observe.client.ds.editor.tree.navigation.ObserveNavigationTree; +import fr.ird.observe.client.ds.editor.tree.navigation.nodes.NavigationTreeNodeSupport; +import fr.ird.observe.client.ds.editor.tree.navigation.nodes.seine.TripSeineListNavigationTreeNode; +import fr.ird.observe.client.util.DecoratedNodeEntity; +import fr.ird.observe.dto.IdHelper; import fr.ird.observe.dto.data.seine.TripSeineDto; import fr.ird.observe.dto.data.seine.TripSeineReference; +import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.dto.reference.DtoReferenceCollection; import fr.ird.observe.dto.reference.ReferentialReferencesFilter; import fr.ird.observe.dto.referential.PersonHelper; import fr.ird.observe.dto.referential.PersonReference; +import fr.ird.observe.dto.referential.ProgramReference; import fr.ird.observe.dto.referential.VesselHelper; import fr.ird.observe.dto.referential.VesselReference; import fr.ird.observe.services.service.data.seine.TripSeineService; import java.awt.Component; import java.awt.Container; +import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -177,4 +185,50 @@ public class TripSeineUIModel extends OpenDataFormUIModel<TripSeineDto, TripSein ObserveFormHelper.getApplicationDataSourceContext(this).closeProgram(); super.closeData(); } + + @Override + public DecoratedNodeEntity[] getParentCandidates(OpenDataFormUI<TripSeineDto, TripSeineReference> ui) { + + NavigationTree treeHelper = ui.getDataSourceUI().getTree(); + + // racine + NavigationTreeNodeSupport rootNode = treeHelper.getRootNode(); + + //on crée un tableau avec un programme en moins car on ne propose pas le programme actuel + List<DecoratedNodeEntity> decoratedProgramList = new ArrayList<>(); + + ReferentialReferenceDecorator<ProgramReference> programDecorator = ui.getMainUI().getApplicationContext().getDecoratorService().getReferentialReferenceDecorator(ProgramReference.class); + + String parentId = getParentId(); + for (int i = 0, n = rootNode.getChildCount(); i < n; i++) { + + NavigationTreeNodeSupport programNode = (NavigationTreeNodeSupport) rootNode.getChildAt(i); + String programId = programNode.getId(); + + // si le noeud programme n'est pas le même que le parent actuel + // si le noeud est bien un noeud de programme + if (programId != null && IdHelper.isProgramId(programId) && !parentId.equals(programId)) { + if (programNode instanceof TripSeineListNavigationTreeNode) { + TripSeineListNavigationTreeNode node = (TripSeineListNavigationTreeNode) programNode; + decoratedProgramList.add(DecoratedNodeEntity.newDecoratedNodeEntity(node, programDecorator)); + } + } + } + return decoratedProgramList.toArray(new DecoratedNodeEntity[decoratedProgramList.size()]); + } + + @Override + public String getMoveTitle() { + return t("observe.action.choose.program.title"); + } + + @Override + public String getMoveMessage() { + return t("observe.action.choose.program.message"); + } + + @Override + protected NavigationTreeNodeSupport getNewParentNode(NavigationTree tree, NavigationTreeNodeSupport oldParentNode, String newParentId) { + return tree.getChild(oldParentNode.getParent(), newParentId); + } } ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/actions/OpenDataFormUIAddFloatingObject.java → client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/actions/AddFloatingObject.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/actions/OpenDataFormUIAddFloatingObject.java +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/actions/AddFloatingObject.java @@ -49,11 +49,11 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - dev(a)tchemit.fr * @since 6.0 */ -public class OpenDataFormUIAddFloatingObject extends OpenDataFormUIActionSupport<ActivitySeineDto, ActivitySeineReference> { +public class AddFloatingObject extends OpenDataFormUIActionSupport<ActivitySeineDto, ActivitySeineReference> { - private static final Log log = LogFactory.getLog(OpenDataFormUIAddFloatingObject.class); + private static final Log log = LogFactory.getLog(AddFloatingObject.class); - public OpenDataFormUIAddFloatingObject() { + public AddFloatingObject() { super(t("observe.common.ActivitySeineDto.action.addFloatingObject"), t("observe.common.ActivitySeineDto.action.addFloatingObject.tip"), "add", ObserveKeyStrokes.KEY_STROKE_ADD_DCP); } ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/actions/OpenDataFormUIAddSetSeine.java → client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/actions/AddSetSeine.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/actions/OpenDataFormUIAddSetSeine.java +++ b/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/actions/AddSetSeine.java @@ -41,9 +41,9 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - dev(a)tchemit.fr * @since 6.0 */ -public class OpenDataFormUIAddSetSeine extends OpenDataFormUIActionSupport<ActivitySeineDto, ActivitySeineReference> { +public class AddSetSeine extends OpenDataFormUIActionSupport<ActivitySeineDto, ActivitySeineReference> { - public OpenDataFormUIAddSetSeine() { + public AddSetSeine() { super(t("observe.common.ActivitySeineDto.action.addSet"), t("observe.common.ActivitySeineDto.action.addSet.tip"), "add", ObserveKeyStrokes.KEY_STROKE_ADD_SET_SEINE); } ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/actions/OpenDataFormUIMoveActivitySeine.java deleted ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/actions/OpenDataFormUIMoveActivitySeine.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * #%L - * ObServe :: Client - * %% - * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.client.ds.editor.form.open.seine.actions; - -import fr.ird.observe.client.ds.editor.form.MoveDataHelper; -import fr.ird.observe.client.ds.editor.form.open.actions.OpenDataFormUIMoveSingleDataActionSupport; -import fr.ird.observe.client.ds.editor.tree.navigation.NavigationTree; -import fr.ird.observe.client.ds.editor.tree.navigation.nodes.NavigationTreeNodeSupport; -import fr.ird.observe.dto.data.seine.ActivitySeineDto; -import fr.ird.observe.dto.data.seine.ActivitySeineReference; -import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; - -import java.util.Optional; - -import static org.nuiton.i18n.I18n.n; - -/** - * Action pour changer le programme d'une ou plusieurs marée dans la liste. - * - * @author Tony Chemit - dev(a)ultreia.io - * @since 5.0 - */ -public class OpenDataFormUIMoveActivitySeine extends OpenDataFormUIMoveSingleDataActionSupport<ActivitySeineDto, ActivitySeineReference> { - - public OpenDataFormUIMoveActivitySeine() { - super(n("observe.menu.navigation.action.move.activitySeine"), - n("observe.menu.navigation.action.move.activitySeine"), - "move-activities"); - } - - @Override - public Optional<String> getNewParentId() { - return MoveDataHelper.chooseNewRoute(getMainUI(), getOldParentNode()); - } - - @Override - public NavigationTreeNodeSupport getNewParentNode(String newParentId) { - NavigationTree tree = getDataSourceEditor().getTree(); - NavigationTreeNodeSupport routeNode = tree.getChild(getOldParentNode().getParent(), newParentId); - String activitiesNodeId = ObserveI18nDecoratorHelper.getTypePluralI18nKey(ActivitySeineDto.class); - return tree.getChild(routeNode, activitiesNodeId); - } - -} ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/actions/OpenDataFormUIMoveRoute.java deleted ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/actions/OpenDataFormUIMoveRoute.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * #%L - * ObServe :: Client - * %% - * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.client.ds.editor.form.open.seine.actions; - -import fr.ird.observe.client.ds.editor.form.MoveDataHelper; -import fr.ird.observe.client.ds.editor.form.open.actions.OpenDataFormUIMoveSingleDataActionSupport; -import fr.ird.observe.client.ds.editor.tree.navigation.NavigationTree; -import fr.ird.observe.client.ds.editor.tree.navigation.nodes.NavigationTreeNodeSupport; -import fr.ird.observe.dto.data.seine.RouteDto; -import fr.ird.observe.dto.data.seine.RouteReference; -import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; - -import java.util.Optional; - -import static org.nuiton.i18n.I18n.n; - -/** - * Action pour changer le programme d'une ou plusieurs marée dans la liste. - * - * @author Tony Chemit - dev(a)ultreia.io - * @since 5.0 - */ -public class OpenDataFormUIMoveRoute extends OpenDataFormUIMoveSingleDataActionSupport<RouteDto, RouteReference> { - - public OpenDataFormUIMoveRoute() { - super(n("observe.menu.navigation.action.move.route"), - n("observe.menu.navigation.action.move.route"), - "move-routes"); - } - - @Override - public Optional<String> getNewParentId() { - return MoveDataHelper.chooseNewTripSeine(getMainUI(), getOldParentNode()); - } - - @Override - public NavigationTreeNodeSupport getNewParentNode(String newParentId) { - NavigationTree tree = getDataSourceEditor().getTree(); - NavigationTreeNodeSupport tripNode = tree.getChild(getOldParentNode().getParent(), newParentId); - String routesNodeId = ObserveI18nDecoratorHelper.getTypePluralI18nKey(RouteDto.class); - return tree.getChild(tripNode, routesNodeId); - } - -} ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/actions/OpenDataFormUIMoveTripSeine.java deleted ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/actions/OpenDataFormUIMoveTripSeine.java +++ /dev/null @@ -1,44 +0,0 @@ -package fr.ird.observe.client.ds.editor.form.open.seine.actions; - -/*- - * #%L - * ObServe :: Client - * %% - * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.client.ds.editor.form.open.OpenDataFormUIMoveTripActionSupport; -import fr.ird.observe.dto.data.seine.TripSeineDto; -import fr.ird.observe.dto.data.seine.TripSeineReference; -import fr.ird.observe.dto.referential.GearType; - -import static org.nuiton.i18n.I18n.n; - -/** - * @author Tony Chemit - dev(a)tchemit.fr - * @since 5.0 - */ -public class OpenDataFormUIMoveTripSeine extends OpenDataFormUIMoveTripActionSupport<TripSeineDto, TripSeineReference> { - - public OpenDataFormUIMoveTripSeine() { - super(n("observe.menu.navigation.action.move.tripSeine"), - n("observe.menu.navigation.action.move.tripSeine"), - GearType.seine); - } - -} ===================================== client/src/main/java/fr/ird/observe/client/ds/editor/tree/ObserveNavigationTreeShowPopupAction.java deleted ===================================== --- a/client/src/main/java/fr/ird/observe/client/ds/editor/tree/ObserveNavigationTreeShowPopupAction.java +++ /dev/null @@ -1,357 +0,0 @@ -package fr.ird.observe.client.ds.editor.tree; - -/* - * #%L - * ObServe :: Client - * %% - * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import com.google.common.base.Preconditions; -import fr.ird.observe.client.ObserveClientApplicationContext; -import fr.ird.observe.client.ds.editor.form.FormUI; -import fr.ird.observe.client.ds.editor.form.open.OpenDataFormUI; -import fr.ird.observe.client.ds.editor.form.open.longline.actions.OpenDataFormUIMoveActivityLongline; -import fr.ird.observe.client.ds.editor.form.open.longline.actions.OpenDataFormUIMoveTripLongline; -import fr.ird.observe.client.ds.editor.form.open.seine.actions.OpenDataFormUIMoveActivitySeine; -import fr.ird.observe.client.ds.editor.form.open.seine.actions.OpenDataFormUIMoveRoute; -import fr.ird.observe.client.ds.editor.form.open.seine.actions.OpenDataFormUIMoveTripSeine; -import fr.ird.observe.client.ds.editor.tree.navigation.NavigationTree; -import fr.ird.observe.client.ds.editor.tree.navigation.nodes.NavigationTreeNodeSupport; -import fr.ird.observe.client.ds.editor.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport; -import fr.ird.observe.dto.data.longline.ActivityLonglineObsDto; -import fr.ird.observe.dto.data.longline.TripLonglineDto; -import fr.ird.observe.dto.data.seine.ActivitySeineDto; -import fr.ird.observe.dto.data.seine.RouteDto; -import fr.ird.observe.dto.data.seine.TripSeineDto; -import fr.ird.observe.spi.application.ObserveApplicationDataContext; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import javax.swing.JButton; -import javax.swing.JMenuItem; -import javax.swing.JPopupMenu; -import javax.swing.JScrollPane; -import javax.swing.MenuElement; -import javax.swing.SwingUtilities; -import javax.swing.tree.TreePath; -import java.awt.Point; -import java.awt.Rectangle; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; - -/** - * Created on 1/8/15. - * - * @author Tony Chemit - dev(a)tchemit.fr - * @since 3.11 - */ -public class ObserveNavigationTreeShowPopupAction { - - private static final Log log = LogFactory.getLog(ObserveNavigationTreeShowPopupAction.class); - - private static final String TRIP_SEINE_MENU_ITEMS = "tripSeine"; - private static final String TRIP_LONGLINE_MENU_ITEMS = "tripLongline"; - private static final String ROUTE_MENU_ITEMS = "route"; - private static final String ACTIVITY_SEINE_MENU_ITEMS = "activitySeine"; - private static final String ACTIVITY_LONGLINE_MENU_ITEMS = "activityLongline"; - - private final JPopupMenu popup; - - private final NavigationTree tree; - - private final JMenuItem noAction; - private final JMenuItem openAction; - private final JMenuItem closeAction; - private final JMenuItem moveAction; - private final JMenuItem deleteAction; - - public ObserveNavigationTreeShowPopupAction(NavigationTree tree, JScrollPane pane, JPopupMenu popup) { - - this.popup = popup; - this.tree = tree; - - JMenuItem noActionComponent = null; - // trip menus - JMenuItem moveComponent = null; - JMenuItem openActionComponent = null; - JMenuItem closeActionComponent = null; - JMenuItem deleteActionComponent = null; - - for (MenuElement menuElement : popup.getSubElements()) { - - if (menuElement.getComponent().getName().equals("navigationNoAction")) { - noActionComponent = (JMenuItem) menuElement.getComponent(); - } - if (menuElement.getComponent().getName().equals("navigationMoveAction")) { - moveComponent = (JMenuItem) menuElement.getComponent(); - } - if (menuElement.getComponent().getName().equals("navigationOpenAction")) { - openActionComponent = (JMenuItem) menuElement.getComponent(); - } - if (menuElement.getComponent().getName().equals("navigationCloseAction")) { - closeActionComponent = (JMenuItem) menuElement.getComponent(); - } - if (menuElement.getComponent().getName().equals("navigationDeleteAction")) { - deleteActionComponent = (JMenuItem) menuElement.getComponent(); - } - } - - this.noAction = noActionComponent; - this.openAction = openActionComponent; - this.closeAction = closeActionComponent; - this.moveAction = moveComponent; - this.deleteAction = deleteActionComponent; - - KeyAdapter keyAdapter = new KeyAdapter() { - @Override - public void keyPressed(KeyEvent e) { - if (tree.isEnabled()) { - openNodeMenu(e); - } - } - }; - tree.addKeyListener(keyAdapter); - pane.addKeyListener(keyAdapter); - - MouseAdapter mouseAdapter = new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - if (tree.isEnabled()) { - autoSelectNodeInTree(e); - } - } - }; - tree.addMouseListener(mouseAdapter); - pane.addMouseListener(mouseAdapter); - } - - private void autoSelectNodeInTree(MouseEvent e) { - - boolean rightClick = SwingUtilities.isRightMouseButton(e); - - if (rightClick) { - - // get the coordinates of the mouse click - Point p = e.getPoint(); - - int closestRowForLocation = tree.getClosestRowForLocation(e.getX(), e.getY()); - - int rowToSelect = -1; - - if (isRowSelected(closestRowForLocation)) { - - rowToSelect = closestRowForLocation; - } - - if (rowToSelect == -1) { - - // try to change selection - - TreePath pathForRow = tree.getPathForRow(closestRowForLocation); - tree.setSelectionPath(pathForRow); - - if (isRowSelected(closestRowForLocation)) { - - rowToSelect = closestRowForLocation; - } - - } - - if (rowToSelect != -1) { - - showPopup(rowToSelect, p); - - } - - } - } - - private void openNodeMenu(KeyEvent e) { - - if (e.getKeyCode() == KeyEvent.VK_CONTEXT_MENU && !tree.isSelectionEmpty()) { - - // get the lowest selected row - int lowestRow = getLowestSelectedRowCount(); - - // get the selected column - Rectangle r = tree.getRowBounds(lowestRow); - - // get the point in the middle lower of the cell - Point p = new Point(r.x + r.width / 2, r.y + r.height); - - if (log.isDebugEnabled()) { - log.debug("Row " + lowestRow + " found t point [" + p + "]"); - } - - showPopup(lowestRow, p); - - } - } - - private void showPopup(int row, Point p) { - - if (log.isInfoEnabled()) { - log.info("Will show popup from row: " + row); - } - - NavigationTreeNodeSupport selectedNode = (NavigationTreeNodeSupport) tree.getPathForRow(row).getLastPathComponent(); - - if (log.isInfoEnabled()) { - log.info("Found selected node: " + selectedNode); - } - - beforeOpenPopup(selectedNode); - - popup.show(tree, p.x, p.y); - - } - - private void beforeOpenPopup(NavigationTreeNodeSupport selectedNode) { - - // clean popup - popup.removeAll(); - - FormUI selectedContentUI = tree.getFormUIManager().getSelectedContentUI(); - ObserveApplicationDataContext openDataManager = ObserveClientApplicationContext.applicationDataContext(); - - boolean closeActionEnabled = false; - - if (selectedContentUI instanceof OpenDataFormUI) { - JButton closeButton = ((OpenDataFormUI) selectedContentUI).getCloseData(); - closeActionEnabled = closeButton.isEnabled(); - } - - Class dataType = selectedNode.getDataType(); - if (TripSeineDto.class.equals(dataType)) { - - beforeOpenMenu((ReferenceNavigationTreeNodeSupport) selectedNode, TRIP_SEINE_MENU_ITEMS); - - openAction.setEnabled(!openDataManager.isOpenTripSeine()); - closeAction.setEnabled(closeActionEnabled); - - } else if (TripLonglineDto.class.equals(dataType)) { - - beforeOpenMenu((ReferenceNavigationTreeNodeSupport) selectedNode, TRIP_LONGLINE_MENU_ITEMS); - - openAction.setEnabled(!openDataManager.isOpenTripLongline()); - closeAction.setEnabled(closeActionEnabled); - - } else if (RouteDto.class.equals(dataType)) { - - beforeOpenMenu((ReferenceNavigationTreeNodeSupport) selectedNode, ROUTE_MENU_ITEMS); - - openAction.setEnabled(!openDataManager.canOpenRoute()); - closeAction.setEnabled(closeActionEnabled); - - } else if (ActivitySeineDto.class.equals(dataType)) { - - beforeOpenMenu((ReferenceNavigationTreeNodeSupport) selectedNode, ACTIVITY_SEINE_MENU_ITEMS); - - openAction.setEnabled(openDataManager.canOpenActivitySeine()); - closeAction.setEnabled(closeActionEnabled); - - } else if (ActivityLonglineObsDto.class.equals(dataType)) { - - beforeOpenMenu((ReferenceNavigationTreeNodeSupport) selectedNode, ACTIVITY_LONGLINE_MENU_ITEMS); - - openAction.setEnabled(openDataManager.canOpenActivityLonglineObs()); - closeAction.setEnabled(closeActionEnabled); - - } else { - - popup.add(noAction); - } - } - - private void beforeOpenMenu(ReferenceNavigationTreeNodeSupport selectedNode, String nodeType) { - if (log.isInfoEnabled()) { - log.info("Will load popup for " + nodeType + " node."); - } - - if (selectedNode.isOpen()) { - - closeAction.putClientProperty("ui", tree.getFormUIManager().getSelectedContentUI()); - popup.add(closeAction); - - - } else { - - openAction.putClientProperty("ui", tree.getFormUIManager().getSelectedContentUI()); - popup.add(openAction); - - } - - Class dataType = selectedNode.getDataType(); - - if (TripSeineDto.class.equals(dataType)) { - moveAction.setAction(new OpenDataFormUIMoveTripSeine()); - } else if (TripLonglineDto.class.equals(dataType)) { - moveAction.setAction(new OpenDataFormUIMoveTripLongline()); - } else if (RouteDto.class.equals(dataType)) { - moveAction.setAction(new OpenDataFormUIMoveRoute()); - } else if (ActivitySeineDto.class.equals(dataType)) { - moveAction.setAction(new OpenDataFormUIMoveActivitySeine()); - } else if (ActivityLonglineObsDto.class.equals(dataType)) { - moveAction.setAction(new OpenDataFormUIMoveActivityLongline()); - } - popup.add(moveAction); - - deleteAction.putClientProperty("ui", tree.getFormUIManager().getSelectedContentUI()); - deleteAction.setEnabled(selectedNode.isOpen()); - popup.add(deleteAction); - } - - private boolean isRowSelected(int requiredRow) { - - boolean result = false; - - int[] selectedRows = tree.getSelectionRows(); - if (selectedRows != null) { - for (int selectedRow : selectedRows) { - if (requiredRow == selectedRow) { - - // match - result = true; - break; - } - } - } - - return result; - - } - - private int getLowestSelectedRowCount() { - - Preconditions.checkState(!tree.isSelectionEmpty()); - - int[] selectedRows = tree.getSelectionRows(); - int lowestRow = -1; - if (selectedRows != null) { - for (int row : selectedRows) { - lowestRow = Math.max(lowestRow, row); - } - } - return lowestRow; - - } - -} ===================================== dto/src/main/models/Observe.model ===================================== --- a/dto/src/main/models/Observe.model +++ b/dto/src/main/models/Observe.model @@ -41,6 +41,8 @@ interface reference.ReferentialReference > fr.ird.observe.dto.ObserveDto abstract Id >> ObserveDto | skip id + {*:1} String lastUpdateDate + {*:1} Date +version + {*:1} long +createDate + {*:1} Date abstract data.Data > Id | skip @@ -55,8 +57,6 @@ code + {*:1} String status + {*:1} !fr.ird.observe.dto.referential.ReferenceStatus uri + {*:1} String needComment + {*:1} boolean -version + {*:1} long -createDate + {*:1} Date abstract referential.I18nReferential > referential.Referential | skip label1 + {*:1} String ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -145,6 +145,7 @@  <observe.model.version>6.904</observe.model.version> <lib.version.java4all.toolkit>2.0-alpha-2-SNAPSHOT</lib.version.java4all.toolkit> + <lib.version.java4all.jaxx>3.0-alpha-23-SNAPSHOT</lib.version.java4all.jaxx>  <license.licenseName>gpl_v3</license.licenseName> ===================================== services-local/src/test/java/fr/ird/observe/spi/persistence/PersistenceModuleHelperTest.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/spi/persistence/PersistenceModuleHelperTest.java +++ b/services-local/src/test/java/fr/ird/observe/spi/persistence/PersistenceModuleHelperTest.java @@ -10,12 +10,12 @@ package fr.ird.observe.spi.persistence; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -37,13 +37,14 @@ import fr.ird.observe.services.test.ServiceTestSupport; import fr.ird.observe.services.test.spi.DatabaseNameConfiguration; import fr.ird.observe.spi.dto.DtoModelClasses; import fr.ird.observe.test.ObserveFixtures; -import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Test; import org.nuiton.topia.persistence.TopiaDao; +import java.util.List; + /** * Created on 26/11/15. * @@ -66,7 +67,7 @@ public class PersistenceModuleHelperTest extends ServiceTestSupport { } @Test - public void testTransformEntityToReferentialDto() throws Exception { + public void testTransformEntityToReferentialDto() { for (Class<? extends ReferentialDto> dtoType : DtoModelClasses.REFERENTIAL_TYPES) { transformReferentialEntityToDto(dtoType); @@ -74,7 +75,7 @@ public class PersistenceModuleHelperTest extends ServiceTestSupport { } @Test - public void testTransformEntityToDataDtoForSeine() throws Exception { + public void testTransformEntityToDataDtoForSeine() { for (Class<? extends DataDto> dataType : DtoModelClasses.ALL_DATA_TYPES) { transformDataEntityToDto(dataType); } @@ -82,7 +83,7 @@ public class PersistenceModuleHelperTest extends ServiceTestSupport { @DatabaseNameConfiguration(DatabaseName.dataForTestLongline) @Test - public void testTransformEntityToDataDtoForLongline() throws Exception { + public void testTransformEntityToDataDtoForLongline() { transformDataEntityToDto(SetLonglineObsCatchDto.class); // for (Class<? extends DataDto> dataType : DtoModelClasses.ALL_DATA_TYPES) { // transformDataEntityToDto(dataType); @@ -107,12 +108,12 @@ public class PersistenceModuleHelperTest extends ServiceTestSupport { for (E entity : Iterables.limit(entities, ObserveFixtures.ENTITIES_LIMIT_SIZE)) { log.debug("transform " + entity.getTopiaId() + " to " + dtoType.getName()); - D dto = typeContext.toDto(ReferentialLocale.FR, dtoType, entity); + D dto = typeContext.toDto(ReferentialLocale.FR, entity); Assert.assertNotNull(dto); Assert.assertEquals(entity.getTopiaId(), dto.getId()); -// Assert.assertEquals(entity.getTopiaCreateDate(), dto.getCreateDate()); -// Assert.assertEquals(entity.getTopiaVersion(), dto.getTestPropertyAsVersion()); + Assert.assertEquals(entity.getTopiaCreateDate(), dto.getCreateDate()); + Assert.assertEquals(entity.getTopiaVersion(), dto.getVersion()); E entity2 = dao.forTopiaIdEquals(entity.getTopiaId()).findUnique(); typeContext.copyToEntity(ReferentialLocale.FR, dto, entity2); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/6587ac5e3549fd2254b709f698… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/6587ac5e3549fd2254b709f698… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] fix validation
by Tony CHEMIT Dec. 21, 2017

Dec. 21, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6587ac5e by Tony CHEMIT at 2017-12-21T09:20:23+01:00 fix validation - - - - - 2 changed files: - services-test/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java - validation/src/main/java/fr/ird/observe/validation/validators/AbstractSpeciesFieldDtoValidator.java Changes: ===================================== services-test/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java ===================================== --- a/services-test/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java +++ b/services-test/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java @@ -291,7 +291,7 @@ public class ValidateServiceTest extends ServiceTestSupport { assertValidateResult(result, TripSeineDto.class, 4); assertValidateResult(result, RouteDto.class, 38); // 55 - assertValidateResult(result, ActivitySeineDto.class, 67); // 1516 + assertValidateResult(result, ActivitySeineDto.class, 64); // 1516 assertValidateResult(result, TransmittingBuoyDto.class, 1); assertValidateResult(result, SetSeineDto.class, 3); assertValidateResult(result, NonTargetCatchDto.class, 2); ===================================== validation/src/main/java/fr/ird/observe/validation/validators/AbstractSpeciesFieldDtoValidator.java ===================================== --- a/validation/src/main/java/fr/ird/observe/validation/validators/AbstractSpeciesFieldDtoValidator.java +++ b/validation/src/main/java/fr/ird/observe/validation/validators/AbstractSpeciesFieldDtoValidator.java @@ -8,12 +8,12 @@ * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -72,8 +72,8 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup private Float ratio; private String speciesField = "species"; - public void setRatio(float ratio) { - this.ratio = ratio; + public void setRatio(String ratio) { + this.ratio = Float.valueOf(ratio); } public void setExpression(String expression) { @@ -84,8 +84,8 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup return enable; } - public void setEnable(boolean enable) { - this.enable = enable; + public void setEnable(String enable) { + this.enable = Boolean.valueOf(enable); } @Override View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6587ac5e3549fd2254b709f6989… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6587ac5e3549fd2254b709f6989… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] continue ui storm + update topia and other libs
by Tony CHEMIT Dec. 20, 2017

Dec. 20, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c84f6bfa by Tony CHEMIT at 2017-12-20T22:51:40+01:00 continue ui storm + update topia and other libs - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/RunObserveClient.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/ObserveFormHelper.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/CommonOpenDataFormUI.jcss - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/ActivityLonglineObsUI.jcss - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/TripLonglineUI.jaxx - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/TripLonglineUI.jcss - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/TripLonglineUIModel.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUICloseActivityLonglineObs.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUICloseTripLongline.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUICreateActivityLonglineObs.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUICreateTripLongline.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUIDeleteActivityLonglineObs.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUIDeleteTripLongline.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUIOpenActivityLonglineObs.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUIOpenTripLongline.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUI.jcss - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/RouteUI.jcss - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/TripSeineUI.jcss - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/TripSeineUIModel.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/actions/OpenDataFormUICloseActivitySeine.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/actions/OpenDataFormUICloseRoute.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/actions/OpenDataFormUICloseTripSeine.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/actions/OpenDataFormUICreateActivitySeine.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/actions/OpenDataFormUICreateRoute.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/actions/OpenDataFormUICreateTripSeine.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/actions/OpenDataFormUIDeleteActivitySeine.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/actions/OpenDataFormUIDeleteRoute.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/actions/OpenDataFormUIDeleteTripSeine.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/actions/OpenDataFormUIOpenActivitySeine.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/actions/OpenDataFormUIOpenRoute.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c84f6bfa1a941c7776aee7e4f44… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c84f6bfa1a941c7776aee7e4f44… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: start open form storm
by Tony CHEMIT Dec. 15, 2017

Dec. 15, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d12457bc by Tony CHEMIT at 2017-12-14T16:53:11+01:00 start open form storm - - - - - 52343b4a by Tony CHEMIT at 2017-12-15T11:41:17+01:00 Remove handler from OpenFormUI \o/ and in fact not so specialized code at all (at least for the save action) - - - - - a6ae1669 by Tony CHEMIT at 2017-12-15T14:36:02+01:00 update pom - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/ObserveCommon.jcss - client/src/main/java/fr/ird/observe/client/ds/editor/form/ObserveFormHelper.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/TripUI.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/CommonOpenDataFormUI.jcss - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/OpenDataFormUIMoveTripActionSupport.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/ActivityLonglineObsUI.jaxx - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/ActivityLonglineObsUI.jcss - − client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/ActivityLonglineObsUIHandler.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/ActivityLonglineObsUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/TripLonglineUI.jcss - − client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/TripLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/TripLonglineUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUIAddSetLonglineObs.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUICloseActivityLonglineObs.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUICloseTripLongline.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUICreateActivityLonglineObs.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUICreateTripLongline.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUIDeleteActivityLonglineObs.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUIDeleteTripLongline.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUIMoveActivityLongline.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUIMoveTripLongline.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUIOpenActivityLonglineObs.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUIOpenTripLongline.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUI.jaxx - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUI.jcss - − client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUIHandler.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/ActivitySeineUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/RouteUI.jcss - − client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/RouteUIHandler.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/RouteUIModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/bdcf6d62098b7eeff279b170c7… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/bdcf6d62098b7eeff279b170c7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] use last class mapping version
by Tony CHEMIT Dec. 14, 2017

Dec. 14, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bdcf6d62 by Tony CHEMIT at 2017-12-14T09:20:45+01:00 use last class mapping version - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -145,6 +145,8 @@  <observe.model.version>6.904</observe.model.version> <lib.version.java4all.toolkit>2.0-alpha-2-SNAPSHOT</lib.version.java4all.toolkit> + + <lib.version.java4all.class-mapping>1.0.2</lib.version.java4all.class-mapping> <lib.version.java4all.jaxx>3.0-alpha-22-SNAPSHOT</lib.version.java4all.jaxx>  View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bdcf6d62098b7eeff279b170c79… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bdcf6d62098b7eeff279b170c79… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: review some pacgaes
by Tony CHEMIT Dec. 13, 2017

Dec. 13, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 181ebc87 by Tony CHEMIT at 2017-12-13T10:01:19+01:00 review some pacgaes - - - - - 721d849a by Tony CHEMIT at 2017-12-13T13:18:30+01:00 reformat code + continue referential ui + remove any abstract handler from here - - - - - 89e356dc by Tony CHEMIT at 2017-12-13T20:32:21+01:00 use new jaxx resource ui api + then normalize incoming ui resources - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/ObserveClientApplicationContext.java - client/src/main/java/fr/ird/observe/client/spi/ObserveClientImplementationFactory.java → client/src/main/java/fr/ird/observe/client/ObserveClientImplementationFactory.java - client/src/main/java/fr/ird/observe/client/ObserveCommon.jcss - + client/src/main/java/fr/ird/observe/client/ObserveUIResourcesProvider.java - client/src/main/java/fr/ird/observe/client/RunObserveClient.java - client/src/main/java/fr/ird/observe/client/ui/admin/AdminActionModel.java → client/src/main/java/fr/ird/observe/client/admin/AdminActionModel.java - client/src/main/java/fr/ird/observe/client/ui/admin/AdminActionWorker.java → client/src/main/java/fr/ird/observe/client/admin/AdminActionWorker.java - client/src/main/java/fr/ird/observe/client/ui/admin/AdminStep.java → client/src/main/java/fr/ird/observe/client/admin/AdminStep.java - client/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUI.jaxx → client/src/main/java/fr/ird/observe/client/admin/AdminTabUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUI.jcss → client/src/main/java/fr/ird/observe/client/admin/AdminTabUI.jcss - client/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUIHandler.java → client/src/main/java/fr/ird/observe/client/admin/AdminTabUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/admin/AdminUI.jaxx → client/src/main/java/fr/ird/observe/client/admin/AdminUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/admin/AdminUI.jcss → client/src/main/java/fr/ird/observe/client/admin/AdminUI.jcss - client/src/main/java/fr/ird/observe/client/ui/admin/AdminUIHandler.java → client/src/main/java/fr/ird/observe/client/admin/AdminUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/admin/AdminUILauncher.java → client/src/main/java/fr/ird/observe/client/admin/AdminUILauncher.java - client/src/main/java/fr/ird/observe/client/ui/admin/AdminUIModel.java → client/src/main/java/fr/ird/observe/client/admin/AdminUIModel.java - client/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigModel.java → client/src/main/java/fr/ird/observe/client/admin/config/ConfigModel.java - client/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigUI.jaxx → client/src/main/java/fr/ird/observe/client/admin/config/ConfigUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigUI.jcss → client/src/main/java/fr/ird/observe/client/admin/config/ConfigUI.jcss - client/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigUIHandler.java → client/src/main/java/fr/ird/observe/client/admin/config/ConfigUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataModel.java → client/src/main/java/fr/ird/observe/client/admin/config/SelectDataModel.java - client/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataUI.jaxx → client/src/main/java/fr/ird/observe/client/admin/config/SelectDataUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataUI.jcss → client/src/main/java/fr/ird/observe/client/admin/config/SelectDataUI.jcss - client/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataUIHandler.java → client/src/main/java/fr/ird/observe/client/admin/config/SelectDataUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateModel.java → client/src/main/java/fr/ird/observe/client/admin/consolidate/ConsolidateModel.java - client/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUI.jaxx → client/src/main/java/fr/ird/observe/client/admin/consolidate/ConsolidateUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUI.jcss → client/src/main/java/fr/ird/observe/client/admin/consolidate/ConsolidateUI.jcss - client/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUIHandler.java → client/src/main/java/fr/ird/observe/client/admin/consolidate/ConsolidateUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/admin/export/ExportModel.java → client/src/main/java/fr/ird/observe/client/admin/export/ExportModel.java - client/src/main/java/fr/ird/observe/client/ui/admin/export/ExportUI.jaxx → client/src/main/java/fr/ird/observe/client/admin/export/ExportUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/cdab08fd405b9180178ce93c4e… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/cdab08fd405b9180178ce93c4e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 8 commits: do not add license on some resources files
by Tony CHEMIT Dec. 13, 2017

Dec. 13, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d50d715f by Tony CHEMIT at 2017-12-11T14:22:11+01:00 do not add license on some resources files - - - - - 6b6f9dc2 by Tony CHEMIT at 2017-12-11T14:22:35+01:00 fix jobs (always ask to reload snapshots) - - - - - 75b8687d by Tony CHEMIT at 2017-12-11T14:22:53+01:00 one next pom - - - - - 8269cb2b by Tony CHEMIT at 2017-12-12T11:07:58+01:00 continue ui storm + improve ProgramDto model - - - - - 82708df5 by Tony CHEMIT at 2017-12-12T14:02:16+01:00 review focus policy (set in from model) - - - - - b5efd952 by Tony CHEMIT at 2017-12-12T20:18:42+01:00 continue referential edit - - - - - 74237c2b by Tony CHEMIT at 2017-12-12T22:40:22+01:00 use new referential form api \o/ - - - - - cdab08fd by Tony CHEMIT at 2017-12-13T09:17:32+01:00 update pom and license - - - - - 30 changed files: - .gitlab-ci.yml - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties - client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties - client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties - client/pom.xml - client/src/main/java/fr/ird/observe/client/ObserveClientApplicationContext.java - client/src/main/java/fr/ird/observe/client/ObserveCommon.jcss - − client/src/main/java/fr/ird/observe/client/ds/editor/form/FormUIFocusManager.java - + client/src/main/java/fr/ird/observe/client/ds/editor/form/ObserveFormHelper.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/ObserveFormUIHandler.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/CommonOpenDataFormUI.jcss - − client/src/main/java/fr/ird/observe/client/ds/editor/form/open/ObserveOpenDataFormUIHandler.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/OpenDataFormUIMoveTripActionSupport.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/ActivityLonglineObsUIHandler.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/ActivityLonglineObsUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/TripLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/TripLonglineUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUIAddSetLonglineObs.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUICloseActivityLonglineObs.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUICloseTripLongline.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUICreateActivityLonglineObs.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUICreateTripLongline.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUIDeleteActivityLonglineObs.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUIDeleteTripLongline.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUIMoveActivityLongline.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUIMoveTripLongline.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUIOpenActivityLonglineObs.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/longline/actions/OpenDataFormUIOpenTripLongline.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/3bbfda275b4ec87f6d6d9bfa94… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/3bbfda275b4ec87f6d6d9bfa94… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Use ui handler from toolkit (that's a new try)
by Tony CHEMIT Dec. 11, 2017

Dec. 11, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0bb67b1f by Tony CHEMIT at 2017-12-10T15:58:03+01:00 Use ui handler from toolkit (that's a new try) - - - - - 3bbfda27 by Tony CHEMIT at 2017-12-11T10:46:31+01:00 review validation classes + finally do no more use ui handler for open list form type (should be the same for other forms soon) - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/ObserveClientApplicationContext.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/ObserveOpenDataFormUIHandler.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/open/seine/RouteUIHandler.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/ObserveOpenDataListFormUIHandler.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/OpenableDataDtoListCellRenderer.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/ActivityLonglineObsListUIHandler.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/TripLonglineListUIHandler.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/TripLonglineListUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/longline/actions/OpenDataListFormUICreateActivityLonglineObs.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/ActivitySeineListUIHandler.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/RouteListUIHandler.java - − client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/TripSeineListUIHandler.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/TripSeineListUIModel.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/openlist/seine/actions/OpenDataListFormUICreateActivitySeine.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/referential/ObserveReferentialFormUIHandler.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/simple/ObserveSimpleDataFormUIHandler.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/simplelist/ObserveSimpleDataListFormUIHandler.java - client/src/main/java/fr/ird/observe/client/ds/editor/form/table/ObserveDataTableFormUIHandler.java - − client/src/main/java/fr/ird/observe/client/validation/ClientValidationContext.java - client/src/main/java/fr/ird/observe/client/validation/ObserveSwingValidator.java - client/src/main/resources/META-INF/ui/FormUIContextProvider.properties - client/src/main/resources/i18n/client_en_GB.properties - client/src/main/resources/i18n/client_es_ES.properties - client/src/main/resources/i18n/client_fr_FR.properties - pom.xml - services-local/src/main/java/fr/ird/observe/services/local/service/actions/validate/EntityInterceptor.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/validate/ValidationMessageDetector.java - services-test/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTest.java - services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationRequest.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/9fa5a9fd02f04be390d21ccd2d… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/9fa5a9fd02f04be390d21ccd2d… You're receiving this email because of your account on gitlab.com.

1 0