This is an automated email from the git hooks/post-receive script. New commit to branch feature/6690 in repository tutti. See http://git.codelutin.com/tutti.git commit 236d7c7d67f90f36a6c69480eac7a06528dbd8c5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Feb 19 11:50:51 2015 +0100 utilisation helper d'action et ajout todos --- .../util/attachment/AttachmentEditorUIHandler.java | 1 + .../ui/swing/util/catches/EnterWeightUIHandler.java | 18 +++--------------- .../ui/swing/util/comment/CommentEditorUIHandler.java | 1 + 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java index dd326ec..8ef42ca 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java @@ -93,6 +93,7 @@ public class AttachmentEditorUIHandler extends AbstractTuttiUIHandler<TuttiUICon } }; + //TODO Use fr.ifremer.tutti.ui.swing.util.TuttiUIUtil.prepareAction() openAction = new AbstractAction() { private static final long serialVersionUID = 1L; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/catches/EnterWeightUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/catches/EnterWeightUIHandler.java index cc26339..4147f6c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/catches/EnterWeightUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/catches/EnterWeightUIHandler.java @@ -25,6 +25,7 @@ package fr.ifremer.tutti.ui.swing.util.catches; import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; +import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import jaxx.runtime.JAXXUtil; import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidator; @@ -88,14 +89,7 @@ public class EnterWeightUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, } }; JButton cancelButton = ui.getCancelButton(); - - cancelAction.putValue(Action.SMALL_ICON, cancelButton.getIcon()); - cancelAction.putValue(Action.LARGE_ICON_KEY, cancelButton.getIcon()); - cancelAction.putValue(Action.ACTION_COMMAND_KEY, CANCEL_ACTION); - cancelAction.putValue(Action.NAME, cancelButton.getText()); - cancelAction.putValue(Action.SHORT_DESCRIPTION, cancelButton.getToolTipText()); - cancelAction.putValue(Action.MNEMONIC_KEY, cancelButton.getMnemonic()); - cancelButton.setAction(cancelAction); + TuttiUIUtil.prepareAction(cancelButton, cancelAction, CANCEL_ACTION); Action validateAction = new AbstractAction() { @@ -110,13 +104,7 @@ public class EnterWeightUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, }; JButton validateButton = ui.getValidateButton(); - validateAction.putValue(Action.SMALL_ICON, validateButton.getIcon()); - validateAction.putValue(Action.LARGE_ICON_KEY, validateButton.getIcon()); - validateAction.putValue(Action.ACTION_COMMAND_KEY, VALIDATE_ACTION); - validateAction.putValue(Action.NAME, validateButton.getText()); - validateAction.putValue(Action.SHORT_DESCRIPTION, validateButton.getToolTipText()); - validateAction.putValue(Action.MNEMONIC_KEY, validateButton.getMnemonic()); - validateButton.setAction(validateAction); + TuttiUIUtil.prepareAction(validateButton, validateAction, VALIDATE_ACTION); JRootPane rootPane = ui.getRootPane(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUIHandler.java index b2672fb..e8ec789 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUIHandler.java @@ -111,6 +111,7 @@ public class CommentEditorUIHandler implements UIHandler<CommentEditorUI> { } }; + //TODO Use fr.ifremer.tutti.ui.swing.util.TuttiUIUtil.prepareAction() ImageIcon actionIcon = SwingUtil.createActionIcon("close-dialog"); closeAction.putValue(Action.SMALL_ICON, actionIcon); closeAction.putValue(Action.LARGE_ICON_KEY, actionIcon); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.