This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit af885ae93c2c6ba496063ea6b4e4eaa2976de6f6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 6 12:44:52 2016 +0100 refs #8429 Revue des nœuds de création et de leur raccourcis claviers --- .../application/swing/ui/ObserveMainUI.jcss | 6 +++ .../content/AddActivityLonglineSetUIAction.java | 34 ++++++++++++ .../AddActivitySeineFloatingObjectUIAction.java | 34 ++++++++++++ .../content/AddActivitySeineSetUIAction.java | 34 ++++++++++++ .../ui/actions/content/CancelCreateUIAction.java | 63 ---------------------- .../application/swing/ui/content/Common.jcss | 8 +-- .../ui/content/impl/longline/SetLonglineUI.jaxx | 4 -- .../ui/content/impl/longline/SetLonglineUI.jcss | 4 -- .../ui/content/impl/seine/FloatingObjectUI.jaxx | 12 ++--- .../ui/content/impl/seine/FloatingObjectUI.jcss | 9 ---- .../swing/ui/content/impl/seine/SetSeineUI.jaxx | 4 -- .../swing/ui/content/impl/seine/SetSeineUI.jcss | 4 -- .../open/impl/longline/ActivityLonglineUI.jaxx | 14 +++-- .../open/impl/longline/ActivityLonglineUI.jcss | 10 ++++ .../content/open/impl/seine/ActivitySeineUI.jaxx | 31 +++++------ .../content/open/impl/seine/ActivitySeineUI.jcss | 16 +++--- .../navigation/nodes/ClassNavigationTreeNode.java | 1 - .../nodes/NavigationTreeNodeSupport.java | 2 +- .../nodes/ReferenceNavigationTreeNodeSupport.java | 11 +++- .../ActivityLonglineNavigationTreeNode.java | 6 ++- .../longline/SetLonglineNavigationTreeNode.java | 7 +++ .../longline/TripLonglineNavigationTreeNode.java | 5 ++ .../seine/ActivitySeineNavigationTreeNode.java | 17 +++--- .../FloatingObjectSeineNavigationTreeNode.java | 7 +++ .../nodes/seine/RouteSeineNavigationTreeNode.java | 5 ++ .../nodes/seine/RoutesSeineNavigationTreeNode.java | 4 +- .../nodes/seine/SetSeineNavigationTreeNode.java | 12 +++++ .../nodes/seine/TripSeineNavigationTreeNode.java | 10 ++-- .../observe/services/dto/AbstractReference.java | 4 ++ 29 files changed, 226 insertions(+), 152 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss index 61fe6a2..a05caa6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss @@ -237,26 +237,32 @@ JSplitPane { #menuNavigationProgram { _observeAction:{GotoOpenProgramAction.ACTION_NAME}; + enabled:{dataContext.isOpenProgram()}; } #menuNavigationTrip { _observeAction:{GotoOpenTripAction.ACTION_NAME}; + enabled:{dataContext.isOpenTrip()}; } #menuNavigationRoute { _observeAction:{GotoOpenRouteAction.ACTION_NAME}; + enabled:{dataContext.isOpenRoute()}; } #menuNavigationActivity { _observeAction:{GotoOpenActivityAction.ACTION_NAME}; + enabled:{dataContext.isOpenActivity()}; } #menuNavigationSet { _observeAction:{GotoOpenSetAction.ACTION_NAME}; + enabled:{dataContext.isOpenSet()}; } #menuNavigationReferentiel { _observeAction:{GotoReferentialAction.ACTION_NAME}; + enabled:true; } #menuHelp { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivityLonglineSetUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivityLonglineSetUIAction.java new file mode 100644 index 0000000..c78fb95 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivityLonglineSetUIAction.java @@ -0,0 +1,34 @@ +package fr.ird.observe.application.swing.ui.actions.content; + +import fr.ird.observe.application.swing.ui.ObserveMainUI; +import fr.ird.observe.application.swing.ui.content.ContentUI; +import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; +import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; +import fr.ird.observe.services.dto.longline.SetLonglineDto; + +import static fr.ird.observe.application.swing.ui.content.ContentUIHandler.getTreeHelper; +import static org.nuiton.i18n.I18n.t; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class AddActivityLonglineSetUIAction extends AbstractContentUIAction { + + public static final String ACTION_NAME = AddActivityLonglineSetUIAction.class.getSimpleName(); + + public AddActivityLonglineSetUIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, t("observe.action.add.setLongline"), t("observe.action.add.setLongline.tip"), "add", "ctrl pressed L"); + } + + @Override + protected void actionPerformed(ContentUI<?, ?> contentUI) { + + NavigationTree treeHelper = getTreeHelper(contentUI); + NavigationTreeNodeSupport parentNode = treeHelper.getSelectedNode(); + treeHelper.addUnsavedNode(parentNode, SetLonglineDto.class); + + } +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineFloatingObjectUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineFloatingObjectUIAction.java new file mode 100644 index 0000000..a0b05e4 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineFloatingObjectUIAction.java @@ -0,0 +1,34 @@ +package fr.ird.observe.application.swing.ui.actions.content; + +import fr.ird.observe.application.swing.ui.ObserveMainUI; +import fr.ird.observe.application.swing.ui.content.ContentUI; +import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; +import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; +import fr.ird.observe.services.dto.seine.FloatingObjectDto; + +import static fr.ird.observe.application.swing.ui.content.ContentUIHandler.getTreeHelper; +import static org.nuiton.i18n.I18n.t; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class AddActivitySeineFloatingObjectUIAction extends AbstractContentUIAction { + + public static final String ACTION_NAME = AddActivitySeineFloatingObjectUIAction.class.getSimpleName(); + + public AddActivitySeineFloatingObjectUIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, t("observe.action.add.floatingObject"), t("observe.action.add.floatingObject.tip"), "add", "ctrl pressed P"); + } + + @Override + protected void actionPerformed(ContentUI<?, ?> contentUI) { + + NavigationTree treeHelper = getTreeHelper(contentUI); + NavigationTreeNodeSupport parentNode = treeHelper.getSelectedNode(); + treeHelper.addUnsavedNode(parentNode, FloatingObjectDto.class); + + } +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineSetUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineSetUIAction.java new file mode 100644 index 0000000..52e7215 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineSetUIAction.java @@ -0,0 +1,34 @@ +package fr.ird.observe.application.swing.ui.actions.content; + +import fr.ird.observe.application.swing.ui.ObserveMainUI; +import fr.ird.observe.application.swing.ui.content.ContentUI; +import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; +import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; +import fr.ird.observe.services.dto.seine.SetSeineDto; + +import static fr.ird.observe.application.swing.ui.content.ContentUIHandler.getTreeHelper; +import static org.nuiton.i18n.I18n.t; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class AddActivitySeineSetUIAction extends AbstractContentUIAction { + + public static final String ACTION_NAME = AddActivitySeineSetUIAction.class.getSimpleName(); + + public AddActivitySeineSetUIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, t("observe.action.add.set"), t("observe.action.add.set.tip"), "add", "ctrl pressed L"); + } + + @Override + protected void actionPerformed(ContentUI<?, ?> contentUI) { + + NavigationTree treeHelper = getTreeHelper(contentUI); + NavigationTreeNodeSupport parentNode = treeHelper.getSelectedNode(); + treeHelper.addUnsavedNode(parentNode, SetSeineDto.class); + + } +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CancelCreateUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CancelCreateUIAction.java deleted file mode 100644 index 8147b0b..0000000 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CancelCreateUIAction.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * #%L - * ObServe :: Application Swing - * %% - * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit - * %% - * 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.application.swing.ui.actions.content; - -import fr.ird.observe.application.swing.ui.ObserveMainUI; -import fr.ird.observe.application.swing.ui.content.ContentUI; -import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; -import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; - -import static org.nuiton.i18n.I18n.n; - -/** - * Action pour sélectionner un noeud (attaché à l'éditeur) dans l'arbre de - * navigation. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 1.4 - */ -public class CancelCreateUIAction extends AbstractContentUIAction { - - private static final long serialVersionUID = 1L; - - public static final String ACTION_NAME = "cancelCreate"; - - public CancelCreateUIAction(ObserveMainUI mainUI) { - super(mainUI, - ACTION_NAME, - n("observe.action.cancel"), - n("observe.action.cancel.create.tip"), - "cancel", - "ctrl pressed R" - ); - } - - @Override - protected void actionPerformed(ContentUI<?, ?> ui) { - ui.stopEdit(); - NavigationTree tree = getMainUI().getNavigation(); - NavigationTreeNodeSupport parentNode = tree.getSelectedNode().getParent(); - tree.removeNode(tree.getSelectedNode()); - tree.selectNode(parentNode); - } - -} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/Common.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/Common.jcss index 643d755..047d88a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/Common.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/Common.jcss @@ -55,15 +55,9 @@ BeanComboBox { text:{getStringValue(bean.getComment())}; } -#cancel { - _observeAction:{CancelCreateUIAction.ACTION_NAME}; - visible:{model.isCreatingMode()}; -} - #reset { _observeAction:{ResetEditUIAction.ACTION_NAME}; - visible:{model.isUpdatingMode()}; - enabled:{model.isModified()}; + enabled:{model.isCreatingMode() || model.isModified()}; } #save { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jaxx index eca9510..ec02721 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jaxx @@ -32,7 +32,6 @@ fr.ird.observe.services.dto.referential.longline.LightsticksTypeDto fr.ird.observe.services.dto.referential.longline.LightsticksColorDto - fr.ird.observe.application.swing.ui.actions.content.CancelCreateUIAction fr.ird.observe.application.swing.ui.actions.content.DeleteDataUIAction fr.ird.observe.application.swing.ui.actions.content.ResetEditUIAction fr.ird.observe.application.swing.ui.actions.content.SaveEditUIAction @@ -412,9 +411,6 @@ <Table id="actions" fill='both' weightx='1' insets='0'> <row> <cell weightx="0.5" fill="both"> - <JButton id='cancel'/> - </cell> - <cell weightx="0.5"> <JButton id='reset'/> </cell> <cell weightx="0.5"> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jcss index bd32966..d8205ee 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jcss @@ -415,10 +415,6 @@ _globalAction:{SaveDataGlobalUIAction.ACTION_NAME}; } -#cancel { - _globalAction:{ResetDataGlobalUIAction.ACTION_NAME}; -} - #reset { _globalAction:{ResetDataGlobalUIAction.ACTION_NAME}; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx index f9824f2..c4d6e7b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx @@ -24,12 +24,12 @@ contentTitle='{n("observe.content.floatingObject.title")}'> <import> + fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.seine.FloatingObjectDto fr.ird.observe.services.dto.referential.ReferentialReference fr.ird.observe.services.dto.referential.seine.ObjectFateDto fr.ird.observe.services.dto.referential.seine.ObjectOperationDto fr.ird.observe.services.dto.referential.seine.ObjectTypeDto - fr.ird.observe.application.swing.ui.actions.content.CancelCreateUIAction fr.ird.observe.application.swing.ui.actions.content.DeleteDataUIAction fr.ird.observe.application.swing.ui.actions.content.ResetEditUIAction fr.ird.observe.application.swing.ui.actions.content.SaveEditUIAction @@ -46,6 +46,8 @@ static org.nuiton.i18n.I18n.n </import> + <style source="../../Common.jcss"/> + <!-- handler --> <FloatingObjectUIHandler id='handler'/> @@ -67,9 +69,8 @@ <JLabel id='objectOperationLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <BeanComboBox id='objectOperation' constructorParams='this' - genericType='ReferentialReference<ObjectOperationDto>' - _entityClass='ObjectOperationDto.class'/> + <BeanComboBox id='objectOperation' constructorParams='this' _entityClass='ObjectOperationDto.class' + genericType='ReferentialReference<ObjectOperationDto>'/> </cell> </row> <row> @@ -112,9 +113,6 @@ <Table id="actions" fill='both' weightx='1' insets='0'> <row> <cell weightx="0.5" fill="both"> - <JButton id='cancel'/> - </cell> - <cell weightx="0.5"> <JButton id='reset'/> </cell> <cell weightx="0.5"> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss index f3f1efa..b535eba 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss @@ -86,17 +86,8 @@ BeanComboBox { text:{getStringValue(bean.getComment())}; } -#cancel { - _observeAction:{CancelCreateUIAction.ACTION_NAME}; - _globalAction:{ResetDataGlobalUIAction.ACTION_NAME}; - visible:{model.isCreatingMode()}; -} - #reset { - _observeAction:{ResetEditUIAction.ACTION_NAME}; _globalAction:{ResetDataGlobalUIAction.ACTION_NAME}; - visible:{model.isUpdatingMode()}; - enabled:{model.isModified()}; } #save { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx index 6643322..252f7c4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx @@ -28,7 +28,6 @@ fr.ird.observe.services.dto.seine.SetSeineDto fr.ird.observe.services.dto.referential.ReferentialReference fr.ird.observe.services.dto.referential.seine.ReasonForNullSetDto - fr.ird.observe.application.swing.ui.actions.content.CancelCreateUIAction fr.ird.observe.application.swing.ui.actions.content.DeleteDataUIAction fr.ird.observe.application.swing.ui.actions.content.ResetEditUIAction fr.ird.observe.application.swing.ui.actions.content.SaveEditUIAction @@ -235,9 +234,6 @@ <Table id="actions" fill='both' weightx='1' insets='0'> <row> <cell weightx="0.5" fill="both"> - <JButton id='cancel'/> - </cell> - <cell weightx="0.5"> <JButton id='reset'/> </cell> <cell weightx="0.5"> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jcss index 6d0b394..4d47341 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jcss @@ -223,10 +223,6 @@ _globalAction:{SaveDataGlobalUIAction.ACTION_NAME}; } -#cancel { - _globalAction:{ResetDataGlobalUIAction.ACTION_NAME}; -} - #reset { _globalAction:{ResetDataGlobalUIAction.ACTION_NAME}; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUI.jaxx index 46ee176..22aaa39 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUI.jaxx @@ -33,6 +33,7 @@ fr.ird.observe.services.dto.referential.ReferentialReference fr.ird.observe.services.dto.referential.FpaZoneDto fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto + fr.ird.observe.application.swing.ui.actions.content.AddActivityLonglineSetUIAction fr.ird.observe.application.swing.ui.actions.content.DeleteDataUIAction jaxx.runtime.swing.editor.NumberEditor @@ -57,11 +58,8 @@ <ActivityLonglineDto id='bean'/> <!-- validator --> - <BeanValidator id='validator' - autoField='true' - beanClass='fr.ird.observe.services.dto.longline.ActivityLonglineDto' - errorTableModel='{getErrorTableModel()}' - context='ui-create'> + <BeanValidator id='validator' autoField='true' beanClass='fr.ird.observe.services.dto.longline.ActivityLonglineDto' + errorTableModel='{getErrorTableModel()}' context='ui-create'> <field name='longitude' component='coordinatesEditor'/> <field name='latitude' component='coordinatesEditor'/> @@ -70,7 +68,7 @@ </BeanValidator> <!-- formulaire --> - <JPanel id="body" layout='{new BorderLayout()}'> + <JPanel id="body"> <Table fill='both' constraints="BorderLayout.CENTER"> <!-- date - time --> @@ -136,10 +134,10 @@ <JButton id='closeAndCreate'/> <JButton id='actionDown'/> - <Table id='extraActions' fill="both" weightx="1" insets='2' visible='{model.isUpdatingMode()}'> + <Table id='extraActions' fill="both" weightx="1" insets='2'> <row> <cell weightx="0.5" fill="both"> - <JButton id='addSet' onActionPerformed='getHandler().addChild(SetLonglineDto.class)'/> + <JButton id='addSet'/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUI.jcss index 4797dac..84127bb 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUI.jcss @@ -26,6 +26,14 @@ valid:{validator.isValid()}; } +#body { + layout:{new BorderLayout()}; +} + +#extraActions { + visible:{model.isUpdatingMode()}; +} + #timeStamp { propertyDate:{ActivityLonglineDto.PROPERTY_TIME_STAMP}; propertyDayDate:{ActivityLonglineUIModel.PROPERTY_DATE}; @@ -101,4 +109,6 @@ text:"observe.action.add.setLongline"; toolTipText:"observe.action.add.setLongline.tip"; enabled:{!model.isModified() && model.isValid() && model.isSetOperation() && ! bean.isHasSetLongline()}; + _observeAction:{AddActivityLonglineSetUIAction.ACTION_NAME}; + } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jaxx index 360e22f..b65709a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jaxx @@ -40,6 +40,8 @@ fr.ird.observe.services.dto.referential.seine.WindDto fr.ird.observe.application.swing.ui.actions.content.DeleteDataUIAction + fr.ird.observe.application.swing.ui.actions.content.AddActivitySeineSetUIAction + fr.ird.observe.application.swing.ui.actions.content.AddActivitySeineFloatingObjectUIAction jaxx.runtime.swing.editor.NumberEditor jaxx.runtime.swing.editor.bean.BeanComboBox @@ -65,11 +67,8 @@ <ActivitySeineDto id='bean'/> <!-- validator --> - <BeanValidator id='validator' - autoField='true' - beanClass='fr.ird.observe.services.dto.seine.ActivitySeineDto' - errorTableModel='{getErrorTableModel()}' - context='ui-create'> + <BeanValidator id='validator' autoField='true' beanClass='fr.ird.observe.services.dto.seine.ActivitySeineDto' + errorTableModel='{getErrorTableModel()}' context='ui-create'> <field name='longitude' component='coordinatesEditor'/> <field name='latitude' component='coordinatesEditor'/> @@ -91,7 +90,7 @@ void $afterCompleteSetup() { </script> <!-- formulaire --> - <JPanel id="body" layout='{new BorderLayout()}'> + <JPanel id="body"> <Table insets="0" fill="both" constraints='BorderLayout.CENTER'> <row> <cell anchor="north" weightx="1"> @@ -264,9 +263,8 @@ void $afterCompleteSetup() { <row> <cell columns="2" fill="both" weighty="0.7"> <JScrollPane id='observedSystemPane' onFocusGained='observedSystem.requestFocus()'> - <FilterableDoubleList id='observedSystem' - genericType='ReferentialReference<ObservedSystemDto>' - _entityClass='ObservedSystemDto.class'/> + <FilterableDoubleList id='observedSystem' _entityClass='ObservedSystemDto.class' + genericType='ReferentialReference<ObservedSystemDto>'/> </JScrollPane> </cell> </row> @@ -289,10 +287,8 @@ void $afterCompleteSetup() { <!-- comment --> <row> <cell columns='2' weighty="1"> - <JScrollPane id='comment' - onFocusGained='comment2.requestFocus()'> - <JTextArea id='comment2' - onKeyReleased='getBean().setComment(comment2.getText())'/> + <JScrollPane id='comment' onFocusGained='comment2.requestFocus()'> + <JTextArea id='comment2' onKeyReleased='getBean().setComment(comment2.getText())'/> </JScrollPane> </cell> </row> @@ -306,16 +302,13 @@ void $afterCompleteSetup() { <JButton id='closeAndCreate'/> <JButton id='actionDown'/> - <Table id='extraActions' fill="both" weightx="1" insets='2' - visible='{model.isUpdatingMode()}'> + <Table id='extraActions' fill="both" weightx="1" insets='2'> <row> <cell weightx="0.5" fill="both"> - <JButton id='addSet' - onActionPerformed='getHandler().addChild(SetSeineDto.class)'/> + <JButton id='addSet'/> </cell> <cell weightx="0.5" fill="both"> - <JButton id='addDCP' - onActionPerformed='getHandler().addChild(FloatingObjectDto.class)'/> + <JButton id='addDCP'/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jcss index b82835e..8315928 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jcss @@ -26,6 +26,14 @@ valid:{validator.isValid()}; } +#body { + layout:{new BorderLayout()}; +} + +#extraActions { + visible:{model.isUpdatingMode()}; +} + #time { propertyTime:{ActivitySeineDto.PROPERTY_TIME}; bean:{bean}; @@ -247,15 +255,11 @@ #addSet { enabled:{!model.isModified() && model.isValid()}; visible:{bean.isSetOperation() && bean.getSetSeine() == null}; - text:"observe.action.add.set"; - toolTipText:"observe.action.add.set.tip"; - actionIcon:"add"; + _observeAction:{AddActivitySeineSetUIAction.ACTION_NAME}; } #addDCP { enabled:{!model.isModified() && model.isValid()}; visible:{bean.isDcpOperation()}; - text:"observe.action.add.floatingObject"; - toolTipText:"observe.action.add.floatingObject.tip"; - actionIcon:"add"; + _observeAction:{AddActivitySeineFloatingObjectUIAction.ACTION_NAME}; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/ClassNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/ClassNavigationTreeNode.java index 20d9f5c..fde9af1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/ClassNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/ClassNavigationTreeNode.java @@ -23,7 +23,6 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes; */ import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; -import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTreeModel; import fr.ird.observe.services.dto.IdDto; import static org.nuiton.i18n.I18n.t; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/NavigationTreeNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/NavigationTreeNodeSupport.java index a207820..b2d3ed0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/NavigationTreeNodeSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/NavigationTreeNodeSupport.java @@ -58,7 +58,7 @@ public abstract class NavigationTreeNodeSupport<O> extends ObserveTreeNodeSuppor public abstract Class<? extends ContentUI<?, ?>> getContentClass(); public void updateNode() { - loaded=false; + loaded = false; reload(); if (withChildsToLoad()) { populateChilds(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/ReferenceNavigationTreeNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/ReferenceNavigationTreeNodeSupport.java index 161e69d..d98befb 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/ReferenceNavigationTreeNodeSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/ReferenceNavigationTreeNodeSupport.java @@ -27,6 +27,8 @@ import fr.ird.observe.services.dto.AbstractReference; import fr.ird.observe.services.dto.IdDto; import org.nuiton.decorator.Decorator; +import java.awt.Color; + /** * Created on 14/11/16. * @@ -41,7 +43,12 @@ public abstract class ReferenceNavigationTreeNodeSupport<D extends IdDto, O exte } protected ReferenceNavigationTreeNodeSupport(O data, boolean allowChildren) { - super(data, allowChildren && data.getId() != null); + super(data, allowChildren && data.isPersisted()); + } + + @Override + public Color getColor() { + return isPersisted() ? super.getColor() : Color.RED; } @Override @@ -50,7 +57,7 @@ public abstract class ReferenceNavigationTreeNodeSupport<D extends IdDto, O exte } public boolean isOpen() { - return getId() == null || ObserveSwingApplicationContext.get().getOpenDataManager().isOpen(getId()); + return isPersisted() || ObserveSwingApplicationContext.get().getOpenDataManager().isOpen(getId()); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ActivityLonglineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ActivityLonglineNavigationTreeNode.java index 571f2f4..f387341 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ActivityLonglineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ActivityLonglineNavigationTreeNode.java @@ -39,7 +39,6 @@ import static org.nuiton.i18n.I18n.t; */ public class ActivityLonglineNavigationTreeNode extends ReferenceNavigationTreeNodeSupport<ActivityLonglineDto, DataReference<ActivityLonglineDto>> { - public ActivityLonglineNavigationTreeNode(DataReference<ActivityLonglineDto> data) { super(data, true); if (isPersisted()) { @@ -60,6 +59,11 @@ public class ActivityLonglineNavigationTreeNode extends ReferenceNavigationTreeN } @Override + public boolean isLeaf() { + return !isPersisted(); + } + + @Override public void reload() { DataReference<ActivityLonglineDto> data = getMainDataSourceServicesProvider().newActivityLonglineService().loadReferenceToRead(getId()); setData(data); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/SetLonglineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/SetLonglineNavigationTreeNode.java index d158d05..d12967d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/SetLonglineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/SetLonglineNavigationTreeNode.java @@ -27,6 +27,8 @@ import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNaviga import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.SetLonglineDto; +import static org.nuiton.i18n.I18n.t; + /** * Created on 14/11/16. * @@ -57,6 +59,11 @@ public class SetLonglineNavigationTreeNode extends ReferenceNavigationTreeNodeSu } @Override + public String getText() { + return isPersisted() ? super.getText() : t("observe.type.setLongline.unsaved"); + } + + @Override public boolean isOpen() { return getParent().isOpen(); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/TripLonglineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/TripLonglineNavigationTreeNode.java index 6bd379d..2dc92fe 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/TripLonglineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/TripLonglineNavigationTreeNode.java @@ -53,6 +53,11 @@ public class TripLonglineNavigationTreeNode extends ReferenceNavigationTreeNodeS } @Override + public boolean isLeaf() { + return !isPersisted(); + } + + @Override public String getText() { return isPersisted() ? (super.getText() + " (" + TripLonglineHelper.getActivityCount(getData()) + ")") : t("observe.type.tripLongline.unsaved"); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ActivitySeineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ActivitySeineNavigationTreeNode.java index 0db9e11..420f541 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ActivitySeineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ActivitySeineNavigationTreeNode.java @@ -44,12 +44,12 @@ public class ActivitySeineNavigationTreeNode extends ReferenceNavigationTreeNode public ActivitySeineNavigationTreeNode(DataReference<ActivitySeineDto> data) { super(data, true); - if (isPersisted()) { - DataReference<SetSeineDto> set = ActivitySeineHelper.getSetSeine(data); - if (set != null) { - add(new SetSeineNavigationTreeNode(set)); - } - } +// if (isPersisted()) { +// DataReference<SetSeineDto> set = ActivitySeineHelper.getSetSeine(data); +// if (set != null) { +// add(new SetSeineNavigationTreeNode(set)); +// } +// } } @Override @@ -64,6 +64,11 @@ public class ActivitySeineNavigationTreeNode extends ReferenceNavigationTreeNode } @Override + public boolean isLeaf() { + return !isPersisted(); + } + + @Override public Class<ActivitySeineUI> getContentClass() { return ActivitySeineUI.class; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/FloatingObjectSeineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/FloatingObjectSeineNavigationTreeNode.java index 7a14993..00a4137 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/FloatingObjectSeineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/FloatingObjectSeineNavigationTreeNode.java @@ -27,6 +27,8 @@ import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNaviga import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.FloatingObjectDto; +import static org.nuiton.i18n.I18n.t; + /** * Created on 14/11/16. * @@ -51,6 +53,11 @@ public class FloatingObjectSeineNavigationTreeNode extends ReferenceNavigationTr } @Override + public String getText() { + return isPersisted() ? super.getText() : t("observe.type.floatingObject.unsaved"); + } + + @Override public boolean isLeaf() { return !isPersisted(); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/RouteSeineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/RouteSeineNavigationTreeNode.java index 7ecb0e4..eff78bc 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/RouteSeineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/RouteSeineNavigationTreeNode.java @@ -51,6 +51,11 @@ public class RouteSeineNavigationTreeNode extends ReferenceNavigationTreeNodeSup } @Override + public boolean isLeaf() { + return !isPersisted(); + } + + @Override public String getText() { return isPersisted() ? super.getText() : t("observe.type.route.unsaved"); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/RoutesSeineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/RoutesSeineNavigationTreeNode.java index 46a4b36..bcfda0c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/RoutesSeineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/RoutesSeineNavigationTreeNode.java @@ -68,10 +68,8 @@ public class RoutesSeineNavigationTreeNode extends ClassNavigationTreeNode<Route @Override public void reloadChilds() { - removeAllChildren(); - String id = getId(); RouteService routeService = ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newRouteService(); - DataReferenceSet<RouteDto> referenceSet = routeService.getRouteByTripSeine(id); + DataReferenceSet<RouteDto> referenceSet = routeService.getRouteByTripSeine(getId()); for (DataReference<RouteDto> reference : referenceSet.getReferences()) { add(new RouteSeineNavigationTreeNode(reference)); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/SetSeineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/SetSeineNavigationTreeNode.java index 44eb3a7..5da8ade 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/SetSeineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/SetSeineNavigationTreeNode.java @@ -28,6 +28,8 @@ import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.service.data.seine.SetSeineService; +import static org.nuiton.i18n.I18n.t; + /** * Created on 14/11/16. * @@ -59,6 +61,16 @@ public class SetSeineNavigationTreeNode extends ReferenceNavigationTreeNodeSuppo } @Override + public boolean isLeaf() { + return !isPersisted(); + } + + @Override + public String getText() { + return isPersisted() ? super.getText() : t("observe.type.setSeine.unsaved"); + } + + @Override public boolean isOpen() { return getParent().isOpen(); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/TripSeineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/TripSeineNavigationTreeNode.java index 0e499d1..568b3f8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/TripSeineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/TripSeineNavigationTreeNode.java @@ -23,7 +23,6 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes.seine; */ import fr.ird.observe.application.swing.ui.content.open.impl.seine.TripSeineUI; -import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTreeModel; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.TripSeineDto; @@ -41,7 +40,7 @@ public class TripSeineNavigationTreeNode extends ReferenceNavigationTreeNodeSupp public TripSeineNavigationTreeNode(DataReference<TripSeineDto> data) { super(data, true); - if (data.getId() != null) { + if (isPersisted()) { add(new GearUseFeaturesSeineNavigationTreeNode()); add(new RoutesSeineNavigationTreeNode()); } @@ -54,8 +53,13 @@ public class TripSeineNavigationTreeNode extends ReferenceNavigationTreeNodeSupp } @Override + public boolean isLeaf() { + return !isPersisted(); + } + + @Override public String getText() { - return getId() == null ? t("observe.type.tripSeine.unsaved") : (super.getText() + " (" + TripSeineHelper.getRouteCount(getData()) + ")"); + return isPersisted() ? (super.getText() + " (" + TripSeineHelper.getRouteCount(getData()) + ")") : t("observe.type.tripSeine.unsaved"); } @Override diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/AbstractReference.java b/services-dto/src/main/java/fr/ird/observe/services/dto/AbstractReference.java index 16deea1..2ad91a4 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/AbstractReference.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/AbstractReference.java @@ -121,6 +121,10 @@ public abstract class AbstractReference<D extends IdDto> implements ObserveDto, this.id = id; } + public boolean isPersisted() { + return id!=null; + } + public Date getCreateDate() { return createDate; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.