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 142ade7881a1789c5018224ea7ae18685368e3d2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 4 13:30:00 2016 +0100 refs #8429 Revue des raccourcis sur les écrans d'édition de référentiel --- .../BackToReferentialListUIAction.java} | 31 ++++++--------- .../CreateNewReferentialUIAction.java} | 30 ++++++-------- .../EditReferentialUIAction.java} | 30 ++++++-------- .../actions/global/DeleteDataGlobalUIAction.java | 16 ++++++-- .../actions/global/NewNextDataGlobalUIAction.java | 4 ++ .../ui/actions/global/SaveDataGlobalUIAction.java | 2 - .../swing/ui/content/open/ContentOpenableUI.jcss | 2 +- .../swing/ui/content/ref/ContentReferenceUI.jaxx | 14 +++++-- .../swing/ui/content/ref/ContentReferenceUI.jcss | 46 +++++++++++----------- .../ui/content/ref/ContentReferenceUIHandler.java | 12 ++---- 10 files changed, 88 insertions(+), 99 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/SaveDataGlobalUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/BackToReferentialListUIAction.java similarity index 53% copy from application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/SaveDataGlobalUIAction.java copy to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/BackToReferentialListUIAction.java index bd8a4a0..c9fbadd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/SaveDataGlobalUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/BackToReferentialListUIAction.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.actions.global; +package fr.ird.observe.application.swing.ui.actions.content; /*- * #%L @@ -22,39 +22,30 @@ package fr.ird.observe.application.swing.ui.actions.global; * #L% */ -import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.ObserveMainUI; -import fr.ird.observe.application.swing.ui.actions.global.AbstractGlobalUIAction; import fr.ird.observe.application.swing.ui.content.ContentUI; +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI; -import javax.swing.JButton; -import java.awt.event.ActionEvent; +import static org.nuiton.i18n.I18n.t; /** - * Created on 11/11/16. + * Created on 10/11/16. * * @author Tony Chemit - chemit@codelutin.com * @since 6.0 */ -public class SaveDataGlobalUIAction extends AbstractGlobalUIAction { +public class BackToReferentialListUIAction extends AbstractContentUIAction { - public static final String ACTION_NAME = "saveDataGlobal"; + public static final String ACTION_NAME = "BackToReferentialListUIAction"; - public SaveDataGlobalUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, "pressed F5"); + public BackToReferentialListUIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, t("observe.action.back.to.list"), t("observe.action.back.to.list.tip"), "go-back", "ctrl pressed B"); } - @Override - public void actionPerformed(ActionEvent e) { - - ContentUI<?, ?> contentUI = ObserveSwingApplicationContext.get().getContentUIManager().getSelectedContentUI(); - - JButton button = (JButton) contentUI.getObjectById("save"); - if (button != null) { - button.getAction().actionPerformed(e); - } - + protected void actionPerformed(ContentUI<?, ?> ui) { + ContentReferenceUI contentReferenceUI = (ContentReferenceUI) ui; + contentReferenceUI.getHandler().backToList(); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/SaveDataGlobalUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CreateNewReferentialUIAction.java similarity index 53% copy from application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/SaveDataGlobalUIAction.java copy to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CreateNewReferentialUIAction.java index bd8a4a0..d0cc1d5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/SaveDataGlobalUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CreateNewReferentialUIAction.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.actions.global; +package fr.ird.observe.application.swing.ui.actions.content; /*- * #%L @@ -22,38 +22,30 @@ package fr.ird.observe.application.swing.ui.actions.global; * #L% */ -import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.ObserveMainUI; -import fr.ird.observe.application.swing.ui.actions.global.AbstractGlobalUIAction; import fr.ird.observe.application.swing.ui.content.ContentUI; +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI; -import javax.swing.JButton; -import java.awt.event.ActionEvent; +import static org.nuiton.i18n.I18n.t; /** - * Created on 11/11/16. + * Created on 10/11/16. * * @author Tony Chemit - chemit@codelutin.com * @since 6.0 */ -public class SaveDataGlobalUIAction extends AbstractGlobalUIAction { +public class CreateNewReferentialUIAction extends AbstractContentUIAction { - public static final String ACTION_NAME = "saveDataGlobal"; + public static final String ACTION_NAME = "CreateNewReferentialUIAction"; - public SaveDataGlobalUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, "pressed F5"); + public CreateNewReferentialUIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, t("observe.action.create"), "", "add", "ctrl pressed N"); } - @Override - public void actionPerformed(ActionEvent e) { - - ContentUI<?, ?> contentUI = ObserveSwingApplicationContext.get().getContentUIManager().getSelectedContentUI(); - - JButton button = (JButton) contentUI.getObjectById("save"); - if (button != null) { - button.getAction().actionPerformed(e); - } + protected void actionPerformed(ContentUI<?, ?> ui) { + ContentReferenceUI contentReferenceUI = (ContentReferenceUI) ui; + contentReferenceUI.getHandler().createUI(); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/SaveDataGlobalUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditReferentialUIAction.java similarity index 53% copy from application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/SaveDataGlobalUIAction.java copy to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditReferentialUIAction.java index bd8a4a0..6703cd2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/SaveDataGlobalUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditReferentialUIAction.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.actions.global; +package fr.ird.observe.application.swing.ui.actions.content; /*- * #%L @@ -22,38 +22,30 @@ package fr.ird.observe.application.swing.ui.actions.global; * #L% */ -import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.ObserveMainUI; -import fr.ird.observe.application.swing.ui.actions.global.AbstractGlobalUIAction; import fr.ird.observe.application.swing.ui.content.ContentUI; +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI; -import javax.swing.JButton; -import java.awt.event.ActionEvent; +import static org.nuiton.i18n.I18n.t; /** - * Created on 11/11/16. + * Created on 10/11/16. * * @author Tony Chemit - chemit@codelutin.com * @since 6.0 */ -public class SaveDataGlobalUIAction extends AbstractGlobalUIAction { +public class EditReferentialUIAction extends AbstractContentUIAction { - public static final String ACTION_NAME = "saveDataGlobal"; + public static final String ACTION_NAME = "EditReferentialUIAction"; - public SaveDataGlobalUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, "pressed F5"); + public EditReferentialUIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, t("observe.action.modify"), "", "go-detail", "ctrl pressed M"); } - @Override - public void actionPerformed(ActionEvent e) { - - ContentUI<?, ?> contentUI = ObserveSwingApplicationContext.get().getContentUIManager().getSelectedContentUI(); - - JButton button = (JButton) contentUI.getObjectById("save"); - if (button != null) { - button.getAction().actionPerformed(e); - } + protected void actionPerformed(ContentUI<?, ?> ui) { + ContentReferenceUI contentReferenceUI = (ContentReferenceUI) ui; + contentReferenceUI.getHandler().modifyUI(); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/DeleteDataGlobalUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/DeleteDataGlobalUIAction.java index 6cc5caf..7dc4a25 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/DeleteDataGlobalUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/DeleteDataGlobalUIAction.java @@ -24,12 +24,13 @@ package fr.ird.observe.application.swing.ui.actions.global; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.ObserveMainUI; -import fr.ird.observe.application.swing.ui.actions.global.AbstractGlobalUIAction; import fr.ird.observe.application.swing.ui.content.ContentUI; +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI; import fr.ird.observe.application.swing.ui.content.table.ContentTableUI; import javax.swing.JButton; import java.awt.event.ActionEvent; +import java.util.Objects; /** * Created on 11/11/16. @@ -55,12 +56,19 @@ public class DeleteDataGlobalUIAction extends AbstractGlobalUIAction { if (contentUI instanceof ContentTableUI) { ContentTableUI ui = (ContentTableUI) contentUI; button = ui.getDeleteEntry(); + } else if (contentUI instanceof ContentReferenceUI) { + ContentReferenceUI ui = (ContentReferenceUI) contentUI; + if (ui.getModel().isEditing()) { + button = ui.getDeleteFromDetail(); + } else { + button = ui.getDeleteFromList(); + } } else { button = (JButton) contentUI.getObjectById("delete"); } - if (button != null) { - button.getAction().actionPerformed(e); - } + Objects.requireNonNull(button); + + button.getAction().actionPerformed(e); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/NewNextDataGlobalUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/NewNextDataGlobalUIAction.java index 5730650..8c4ec9a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/NewNextDataGlobalUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/NewNextDataGlobalUIAction.java @@ -28,6 +28,7 @@ import fr.ird.observe.application.swing.ui.actions.global.AbstractGlobalUIAction import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.list.ContentListUI; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUI; +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI; import fr.ird.observe.application.swing.ui.content.table.ContentTableUI; import java.awt.event.ActionEvent; @@ -60,6 +61,9 @@ public class NewNextDataGlobalUIAction extends AbstractGlobalUIAction { } else if (contentUI instanceof ContentTableUI) { ContentTableUI ui = (ContentTableUI) contentUI; ui.getNewEntry().getAction().actionPerformed(e); + } else if (contentUI instanceof ContentReferenceUI) { + ContentReferenceUI ui = (ContentReferenceUI) contentUI; + ui.getCreate().getAction().actionPerformed(e); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/SaveDataGlobalUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/SaveDataGlobalUIAction.java index bd8a4a0..b4e0856 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/SaveDataGlobalUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/SaveDataGlobalUIAction.java @@ -24,7 +24,6 @@ package fr.ird.observe.application.swing.ui.actions.global; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.ObserveMainUI; -import fr.ird.observe.application.swing.ui.actions.global.AbstractGlobalUIAction; import fr.ird.observe.application.swing.ui.content.ContentUI; import javax.swing.JButton; @@ -44,7 +43,6 @@ public class SaveDataGlobalUIAction extends AbstractGlobalUIAction { super(mainUI, ACTION_NAME, "pressed F5"); } - @Override public void actionPerformed(ActionEvent e) { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUI.jcss index 0769247..28daf2d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUI.jcss @@ -26,10 +26,10 @@ #reset { _observeAction:{ResetEditUIAction.ACTION_NAME}; + _globalAction:{ResetDataGlobalUIAction.ACTION_NAME}; visible:{!model.isReadingMode()}; enabled:{model.isCreatingMode() ? true : model.isModified()}; horizontalTextPosition:{SwingConstants.RIGHT}; - _globalAction:{ResetDataGlobalUIAction.ACTION_NAME}; } #save { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jaxx index 35732ba..19de298 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jaxx @@ -29,10 +29,18 @@ fr.ird.observe.services.dto.referential.ReferentialReference fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper fr.ird.observe.application.swing.ui.UIHelper + fr.ird.observe.application.swing.ui.actions.content.BackToReferentialListUIAction + fr.ird.observe.application.swing.ui.actions.content.CreateNewReferentialUIAction fr.ird.observe.application.swing.ui.actions.content.DeleteReferenceUIAction + fr.ird.observe.application.swing.ui.actions.content.EditReferentialUIAction fr.ird.observe.application.swing.ui.actions.content.ResetEditUIAction fr.ird.observe.application.swing.ui.actions.content.SaveEditUIAction + fr.ird.observe.application.swing.ui.actions.global.DeleteDataGlobalUIAction + fr.ird.observe.application.swing.ui.actions.global.NewNextDataGlobalUIAction + fr.ird.observe.application.swing.ui.actions.global.ResetDataGlobalUIAction + fr.ird.observe.application.swing.ui.actions.global.SaveDataGlobalUIAction + jaxx.runtime.swing.editor.bean.BeanListHeader jaxx.runtime.validator.swing.SwingValidator @@ -145,13 +153,13 @@ viewLayout.addLayoutComponent(editView, DETAIL_VIEW); <Table id="listActions" fill="both" weightx="1" insets="1" visible='{!model.isEditing()}'> <row> <cell> - <JButton id='create' onActionPerformed='getHandler().createUI()'/> + <JButton id='create'/> </cell> <cell> - <JButton id='modify' onActionPerformed='getHandler().modifyUI()'/> + <JButton id='modify' styleClass="edit"/> </cell> <cell> - <JButton id='detail' onActionPerformed='getHandler().modifyUI()'/> + <JButton id='detail' styleClass="edit"/> </cell> <cell> <JButton id='deleteFromList' styleClass='delete'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jcss index e325e6d..15cacec 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jcss @@ -20,6 +20,19 @@ * #L% */ +.edit { + _observeAction:{EditReferentialUIAction.ACTION_NAME}; + enabled:{model.getSelectedBean() != null}; +} + +.delete { + _observeAction:"DeleteReferenceUIAction.ACTION_NAME"; + _globalAction:{DeleteDataGlobalUIAction.ACTION_NAME}; + toolTipText:{deleteToolTip}; + visible:{model.isUpdatingMode()}; + enabled:{model.getSelectedBean() != null}; +} + #model { modified:{getValidator().isChanged()}; valid:{getValidator().isValid()}; @@ -33,7 +46,6 @@ } #viewLayout { - /*useOnlyVisibleComponentDimension:true;*/ selected:{getHandler().updateView(model.isEditing())}; } @@ -58,26 +70,22 @@ } #create { - text:"observe.action.create"; - actionIcon:"add"; - toolTipText:{createToolTip}; + _observeAction:{CreateNewReferentialUIAction.ACTION_NAME}; + _globalAction:{NewNextDataGlobalUIAction.ACTION_NAME}; + _toolTipText:{createToolTip}; visible:{model.isUpdatingMode()}; } #modify { - text:"observe.action.modify"; - actionIcon:"go-detail"; - toolTipText:{modifyToolTip}; + _text:{t("observe.action.modify")}; + _toolTipText:{modifyToolTip}; visible:{model.isUpdatingMode()}; - enabled:{model.getSelectedBean() != null}; } #detail { - text:"observe.action.detail"; + _text:{t("observe.action.detail")}; actionIcon:"go-detail"; - toolTipText:{detailToolTip}; visible:{model.isReadingMode()}; - enabled:{model.getSelectedBean() != null}; } #editTable { @@ -93,28 +101,21 @@ visible:{getHandler().canSeeI18nTable(model.getBean())}; } -.delete { - _observeAction:"DeleteReferenceUIAction.ACTION_NAME"; - toolTipText:{deleteToolTip}; - visible:{model.isUpdatingMode()}; - enabled:{model.getSelectedBean() != null}; -} - -#reset{ +#reset { _observeAction:"ResetEditUIAction.ACTION_NAME"; + _globalAction:{ResetDataGlobalUIAction.ACTION_NAME}; enabled:{model.isModified()}; visible:{model.isUpdatingMode()}; } #save { _observeAction:"SaveEditUIAction.ACTION_NAME"; + _globalAction:{SaveDataGlobalUIAction.ACTION_NAME}; enabled:{model.isModified() && model.isValid()}; } #backToList { - text:"observe.action.back.to.list"; - actionIcon:"go-back"; - toolTipText:"observe.action.back.to.list.tip"; + _observeAction:{BackToReferentialListUIAction.ACTION_NAME}; } #showUsages { @@ -136,4 +137,3 @@ #showTechnicalInformations { enabled:{!model.isCreatingMode() && (model.isEditing() || model.getSelectedBean() != null)}; } - diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java index 1e713aa..a727c25 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java @@ -441,6 +441,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto, U extends Conte if (mode != ContentMode.READ) { //FIXME le binding ne marche pas en init ui.processDataBinding(ContentReferenceUI.BINDING_DELETE_FROM_LIST_ENABLED); + ui.processDataBinding(ContentReferenceUI.BINDING_MODIFY_ENABLED); } } @@ -538,12 +539,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto, U extends Conte validationContext.setEditingReferentielList(data); } -// @Override -// public boolean closeUI() throws Exception { -// return super.closeUI(); -// } - - void createUI() { + public void createUI() { ContentReferenceUI<E, U> ui = getUi(); @@ -560,7 +556,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto, U extends Conte ui.startEdit(null); } - void modifyUI() { + public void modifyUI() { ContentReferenceUIModel<E> model = getModel(); if (model.getMode() != ContentMode.READ) { @@ -607,7 +603,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto, U extends Conte } } - void backToList() { + public void backToList() { ContentReferenceUIModel<E> model = getModel(); if (!model.isModified() || checkEdit(getUi())) { getUi().stopEdit(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.