This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 9aad0ca72fd0aa239c7206760ccd2f5eedc0ab0a Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jan 1 15:55:29 2015 +0100 renommage des actions ecrans Species + formatage --- .../SpeciesFrequencyLogCellComponent.java | 8 ++--- .../species/frequency/SpeciesFrequencyUI.css | 27 --------------- .../species/frequency/SpeciesFrequencyUI.jaxx | 38 ++++++++++------------ .../frequency/SpeciesFrequencyUIHandler.java | 12 +++---- ...iesFrequencyLengthStepCaracteristicAction.java} | 4 +-- ...java => ApplySpeciesFrequencyRafaleAction.java} | 6 ++-- ....java => CancelEditSpeciesFrequencyAction.java} | 8 ++--- ...ava => DeleteSpeciesFrequencyLogRowAction.java} | 4 +-- ...GenerateSpeciesFrequencyLengthStepsAction.java} | 4 +-- ...ction.java => ResetSpeciesFrequencyAction.java} | 4 +-- ...ava => SaveAndCloseSpeciesFrequencyAction.java} | 6 ++-- ... => SaveAndContinueSpeciesFrequencyAction.java} | 6 ++-- 12 files changed, 48 insertions(+), 79 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyLogCellComponent.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyLogCellComponent.java index c7d306f..01fb088 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyLogCellComponent.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyLogCellComponent.java @@ -22,7 +22,7 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency; * #L% */ -import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.actions.DeleteLogRowAction; +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.actions.DeleteSpeciesFrequencyLogRowAction; import jaxx.runtime.swing.JAXXWidgetUtil; import javax.swing.AbstractCellEditor; @@ -50,7 +50,7 @@ public class SpeciesFrequencyLogCellComponent extends JPanel { private JLabel label = new JLabel(); - public SpeciesFrequencyLogCellComponent(DeleteLogRowAction action) { + public SpeciesFrequencyLogCellComponent(DeleteSpeciesFrequencyLogRowAction action) { setLayout(new BorderLayout()); @@ -93,7 +93,7 @@ public class SpeciesFrequencyLogCellComponent extends JPanel { private SpeciesFrequencyLogRowModel row; public FrequencyLogCellEditor(SpeciesFrequencyUI speciesFrequencyUI) { - component = new SpeciesFrequencyLogCellComponent(new DeleteLogRowAction(speciesFrequencyUI, this)); + component = new SpeciesFrequencyLogCellComponent(new DeleteSpeciesFrequencyLogRowAction(speciesFrequencyUI, this)); } public void setRow(SpeciesFrequencyLogRowModel row) { @@ -153,4 +153,4 @@ public class SpeciesFrequencyLogCellComponent extends JPanel { } -} +} \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css index ece6954..8bea573 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css @@ -285,28 +285,16 @@ ComputableDataEditor { #generateButton { action: {generateLengthStepsAction}; - /*actionIcon: generate; - text: "tutti.editSpeciesFrequencies.action.generate"; - toolTipText: "tutti.editSpeciesFrequencies.action.generate.tip"; - i18nMnemonic: "tutti.editSpeciesFrequencies.action.generate.mnemonic"; - enabled: {model.isCanGenerate()};*/ _help: {"tutti.editSpeciesFrequencies.action.generate.help"}; } #addLengthStepCaracteristicButton { action: {addLengthStepCaracteristicAction}; - /*text: "tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic"; - toolTipText: "tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic.tip"; - i18nMnemonic: "tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic.mnemonic";*/ _help: {"tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic.help"}; } #cancelButton { action: {cancelAction}; - /*actionIcon: cancel; - text: "tutti.editSpeciesFrequencies.action.cancel"; - toolTipText: "tutti.editSpeciesFrequencies.action.cancel.tip"; - i18nMnemonic: "tutti.editSpeciesFrequencies.action.cancel.mnemonic";*/ _help: {"tutti.editSpeciesFrequencies.action.cancel.help"}; } @@ -316,11 +304,6 @@ ComputableDataEditor { #saveAndContinueButton { action: {saveAndContinueAction}; - /*actionIcon: save; - text: "tutti.editSpeciesFrequencies.action.saveAndContinue"; - toolTipText: "tutti.editSpeciesFrequencies.action.saveAndContinue.tip"; - i18nMnemonic: "tutti.editSpeciesFrequencies.action.saveAndContinue.mnemonic"; - enabled: {model.getNextEditableRowIndex() != null && model.isValid()};*/ _help: {"tutti.editSpeciesFrequencies.action.saveAndContinue.help"}; } @@ -330,20 +313,10 @@ ComputableDataEditor { #saveAndCloseButton { action: {saveAndCloseAction}; - /*actionIcon: save; - text: "tutti.editSpeciesFrequencies.action.saveAndClose"; - toolTipText: "tutti.editSpeciesFrequencies.action.saveAndClose.tip"; - i18nMnemonic: "tutti.editSpeciesFrequencies.action.saveAndClose.mnemonic"; - enabled: {model.isValid()};*/ _help: {"tutti.editSpeciesFrequencies.action.saveAndClose.help"}; } #resetButton { action: {resetAction}; - /*actionIcon: reset; - text: "tutti.editSpeciesFrequencies.action.reset"; - toolTipText: "tutti.editSpeciesFrequencies.action.reset.tip"; - i18nMnemonic: "tutti.editSpeciesFrequencies.action.reset.mnemonic";*/ _help: {"tutti.editSpeciesFrequencies.action.reset.help"}; } - diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx index 058784c..57b33b1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx @@ -27,12 +27,12 @@ fr.ifremer.tutti.ui.swing.TuttiHelpBroker fr.ifremer.tutti.ui.swing.content.operation.catches.FrequencyConfigurationMode - fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.actions.AddLengthStepCaracteristicAction - fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.actions.CancelAction - fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.actions.GenerateLengthStepsAction - fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.actions.ResetAction - fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.actions.SaveAndCloseAction - fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.actions.SaveAndContinueAction + fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.actions.AddSpeciesFrequencyLengthStepCaracteristicAction + fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.actions.CancelEditSpeciesFrequencyAction + fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.actions.GenerateSpeciesFrequencyLengthStepsAction + fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.actions.ResetSpeciesFrequencyAction + fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.actions.SaveAndCloseSpeciesFrequencyAction + fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.actions.SaveAndContinueSpeciesFrequencyAction fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil fr.ifremer.tutti.ui.swing.util.computable.ComputableDataEditor @@ -61,10 +61,8 @@ public SpeciesFrequencyUI(TuttiUI parentUI) { <SpeciesFrequencyUIModel id='model' initializer='getContextValue(SpeciesFrequencyUIModel.class)'/> - <BeanValidator id='validator' bean='model' - uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> - <field name='lengthStepCaracteristic' - component='lengthStepCaracteristicComboBox'/> + <BeanValidator id='validator' bean='model' uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> + <field name='lengthStepCaracteristic' component='lengthStepCaracteristicComboBox'/> <field name='step' component='stepField'/> <field name='rows' component='tableScrollPane'/> <field name='totalWeight' component='totalWeightField'/> @@ -76,17 +74,16 @@ public SpeciesFrequencyUI(TuttiUI parentUI) { <CardLayout2Ext id='dataFieldLayout' constructorParams='this, "dataFieldPanel"'/> - <AddLengthStepCaracteristicAction id="addLengthStepCaracteristicAction" constructorParams="this"/> - <GenerateLengthStepsAction id="generateLengthStepsAction" constructorParams="this"/> - <CancelAction id="cancelAction" constructorParams="this"/> - <ResetAction id="resetAction" constructorParams="this"/> - <SaveAndCloseAction id="saveAndCloseAction" constructorParams="this"/> - <SaveAndContinueAction id="saveAndContinueAction" constructorParams="this"/> + <AddSpeciesFrequencyLengthStepCaracteristicAction id="addLengthStepCaracteristicAction" constructorParams="this"/> + <GenerateSpeciesFrequencyLengthStepsAction id="generateLengthStepsAction" constructorParams="this"/> + <CancelEditSpeciesFrequencyAction id="cancelAction" constructorParams="this"/> + <ResetSpeciesFrequencyAction id="resetAction" constructorParams="this"/> + <SaveAndCloseSpeciesFrequencyAction id="saveAndCloseAction" constructorParams="this"/> + <SaveAndContinueSpeciesFrequencyAction id="saveAndContinueAction" constructorParams="this"/> <JPanel id='configurationPanel' layout='{new BorderLayout()}' constraints='BorderLayout.NORTH'> - <VBox id='modePanel' constraints='BorderLayout.WEST' - verticalAlignment='{SwingConstants.CENTER}'> + <VBox id='modePanel' constraints='BorderLayout.WEST' verticalAlignment='{SwingConstants.CENTER}'> <JRadioButton id='autoGenModeButton' onActionPerformed='model.setConfigurationMode(FrequencyConfigurationMode.AUTO_GEN)'/> <JRadioButton id='rafaleModeButton' @@ -141,8 +138,7 @@ public SpeciesFrequencyUI(TuttiUI parentUI) { </row> </Table> </JPanel> - <JPanel id='simpleCountingModePanel' constraints='"simpleCountingMode"' - layout='{new BorderLayout()}'> + <JPanel id='simpleCountingModePanel' constraints='"simpleCountingMode"' layout='{new BorderLayout()}'> <JLabel id='simpleCountingModeLabel' constraints='BorderLayout.CENTER'/> </JPanel> </JPanel> @@ -233,4 +229,4 @@ public SpeciesFrequencyUI(TuttiUI parentUI) { <JButton id='saveAndCloseButton'/> </JPanel> -</JPanel> +</JPanel> \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java index 397af8d..16d0999 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java @@ -39,7 +39,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.FrequencyConfigurationMode; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyCellComponent.FrequencyCellEditor; -import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.actions.ApplyRafaleAction; +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.actions.ApplySpeciesFrequencyRafaleAction; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiNumberTickUnitSource; import fr.ifremer.tutti.ui.swing.util.TuttiUI; @@ -108,7 +108,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci */ protected final FeedReaderListener feedReaderListener; - ApplyRafaleAction applyRafaleAction; + protected ApplySpeciesFrequencyRafaleAction applySpeciesFrequencyRafaleAction; public SpeciesFrequencyUIHandler() { @@ -217,7 +217,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci @Override public void beforeInit(SpeciesFrequencyUI ui) { - this.applyRafaleAction = new ApplyRafaleAction(ui); + this.applySpeciesFrequencyRafaleAction = new ApplySpeciesFrequencyRafaleAction(ui); super.beforeInit(ui); this.weightUnit = getConfig().getSpeciesWeightUnit(); @@ -283,7 +283,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci model.setMinStep(null); model.setMaxStep(null); - this.ui.getRafaleStepField().getTextField().addKeyListener(new KeyAdapter() { + ui.getRafaleStepField().getTextField().addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { @@ -291,7 +291,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci e.consume(); Float step = (Float) SpeciesFrequencyUIHandler.this.ui.getRafaleStepField().getModel(); - applyRafaleAction.applyRafaleStep(step, false); + applySpeciesFrequencyRafaleAction.applyRafaleStep(step, false); //select text JTextField field = (JTextField) e.getSource(); @@ -685,7 +685,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci } - applyRafaleAction.applyRafaleStep(length, true); + applySpeciesFrequencyRafaleAction.applyRafaleStep(length, true); } else { throw new ApplicationBusinessException( diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/AddLengthStepCaracteristicAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/AddSpeciesFrequencyLengthStepCaracteristicAction.java similarity index 93% rename from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/AddLengthStepCaracteristicAction.java rename to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/AddSpeciesFrequencyLengthStepCaracteristicAction.java index 8576a5e..a6b167a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/AddLengthStepCaracteristicAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/AddSpeciesFrequencyLengthStepCaracteristicAction.java @@ -19,13 +19,13 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.11 */ -public class AddLengthStepCaracteristicAction extends AbstractAction { +public class AddSpeciesFrequencyLengthStepCaracteristicAction extends AbstractAction { private static final long serialVersionUID = 1L; final SpeciesFrequencyUI ui; - public AddLengthStepCaracteristicAction(SpeciesFrequencyUI ui) { + public AddSpeciesFrequencyLengthStepCaracteristicAction(SpeciesFrequencyUI ui) { this.ui = ui; putValue(NAME, t("tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic")); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ApplyRafaleAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ApplySpeciesFrequencyRafaleAction.java similarity index 94% rename from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ApplyRafaleAction.java rename to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ApplySpeciesFrequencyRafaleAction.java index 1d5f74d..f4520e4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ApplyRafaleAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ApplySpeciesFrequencyRafaleAction.java @@ -25,14 +25,14 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.11 */ -public class ApplyRafaleAction { +public class ApplySpeciesFrequencyRafaleAction { /** Logger. */ - private static final Log log = LogFactory.getLog(ApplyRafaleAction.class); + private static final Log log = LogFactory.getLog(ApplySpeciesFrequencyRafaleAction.class); private final SpeciesFrequencyUI ui; - public ApplyRafaleAction(SpeciesFrequencyUI ui) { + public ApplySpeciesFrequencyRafaleAction(SpeciesFrequencyUI ui) { this.ui = ui; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/CancelAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/CancelEditSpeciesFrequencyAction.java similarity index 83% rename from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/CancelAction.java rename to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/CancelEditSpeciesFrequencyAction.java index a25142c..c43b135 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/CancelAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/CancelEditSpeciesFrequencyAction.java @@ -16,16 +16,16 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.11 */ -public class CancelAction extends AbstractAction { +public class CancelEditSpeciesFrequencyAction extends AbstractAction { /** Logger. */ - private static final Log log = LogFactory.getLog(CancelAction.class); - + private static final Log log = LogFactory.getLog(CancelEditSpeciesFrequencyAction.class); + private static final long serialVersionUID = 1L; final SpeciesFrequencyUI ui; - public CancelAction(SpeciesFrequencyUI ui) { + public CancelEditSpeciesFrequencyAction(SpeciesFrequencyUI ui) { this.ui = ui; putValue(NAME, t("tutti.editSpeciesFrequencies.action.cancel")); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/DeleteLogRowAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/DeleteSpeciesFrequencyLogRowAction.java similarity index 91% rename from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/DeleteLogRowAction.java rename to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/DeleteSpeciesFrequencyLogRowAction.java index bfe9821..4902b82 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/DeleteLogRowAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/DeleteSpeciesFrequencyLogRowAction.java @@ -20,7 +20,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.11 */ -public class DeleteLogRowAction extends AbstractAction { +public class DeleteSpeciesFrequencyLogRowAction extends AbstractAction { private static final long serialVersionUID = 1L; @@ -28,7 +28,7 @@ public class DeleteLogRowAction extends AbstractAction { private final SpeciesFrequencyLogCellComponent.FrequencyLogCellEditor component; - public DeleteLogRowAction(SpeciesFrequencyUI ui, SpeciesFrequencyLogCellComponent.FrequencyLogCellEditor component) { + public DeleteSpeciesFrequencyLogRowAction(SpeciesFrequencyUI ui, SpeciesFrequencyLogCellComponent.FrequencyLogCellEditor component) { this.ui = ui; this.component = component; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/GenerateLengthStepsAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/GenerateSpeciesFrequencyLengthStepsAction.java similarity index 94% rename from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/GenerateLengthStepsAction.java rename to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/GenerateSpeciesFrequencyLengthStepsAction.java index baa3bd8..65b3c31 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/GenerateLengthStepsAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/GenerateSpeciesFrequencyLengthStepsAction.java @@ -26,13 +26,13 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.11 */ -public class GenerateLengthStepsAction extends AbstractAction { +public class GenerateSpeciesFrequencyLengthStepsAction extends AbstractAction { private static final long serialVersionUID = 1L; final SpeciesFrequencyUI ui; - public GenerateLengthStepsAction(SpeciesFrequencyUI ui) { + public GenerateSpeciesFrequencyLengthStepsAction(SpeciesFrequencyUI ui) { this.ui = ui; putValue(NAME, t("tutti.editSpeciesFrequencies.action.generate")); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ResetAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ResetSpeciesFrequencyAction.java similarity index 90% rename from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ResetAction.java rename to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ResetSpeciesFrequencyAction.java index a25a4f3..fbb7570 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ResetAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ResetSpeciesFrequencyAction.java @@ -16,13 +16,13 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.11 */ -public class ResetAction extends AbstractAction { +public class ResetSpeciesFrequencyAction extends AbstractAction { private static final long serialVersionUID = 1L; final SpeciesFrequencyUI ui; - public ResetAction(SpeciesFrequencyUI ui) { + public ResetSpeciesFrequencyAction(SpeciesFrequencyUI ui) { this.ui = ui; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveAndCloseAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveAndCloseSpeciesFrequencyAction.java similarity index 89% rename from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveAndCloseAction.java rename to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveAndCloseSpeciesFrequencyAction.java index 187078b..5c9e33d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveAndCloseAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveAndCloseSpeciesFrequencyAction.java @@ -16,14 +16,14 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.11 */ -public class SaveAndCloseAction extends SaveSupportAction { +public class SaveAndCloseSpeciesFrequencyAction extends SaveSupportAction { /** Logger. */ - private static final Log log = LogFactory.getLog(SaveAndCloseAction.class); + private static final Log log = LogFactory.getLog(SaveAndCloseSpeciesFrequencyAction.class); private static final long serialVersionUID = 1L; - public SaveAndCloseAction(SpeciesFrequencyUI ui) { + public SaveAndCloseSpeciesFrequencyAction(SpeciesFrequencyUI ui) { super(ui); putValue(NAME, t("tutti.editSpeciesFrequencies.action.saveAndClose")); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveAndContinueAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveAndContinueSpeciesFrequencyAction.java similarity index 87% rename from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveAndContinueAction.java rename to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveAndContinueSpeciesFrequencyAction.java index 4ae45c8..cf47406 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveAndContinueAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveAndContinueSpeciesFrequencyAction.java @@ -15,14 +15,14 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.11 */ -public class SaveAndContinueAction extends SaveSupportAction { +public class SaveAndContinueSpeciesFrequencyAction extends SaveSupportAction { /** Logger. */ - private static final Log log = LogFactory.getLog(SaveAndContinueAction.class); + private static final Log log = LogFactory.getLog(SaveAndContinueSpeciesFrequencyAction.class); private static final long serialVersionUID = 1L; - public SaveAndContinueAction(SpeciesFrequencyUI ui) { + public SaveAndContinueSpeciesFrequencyAction(SpeciesFrequencyUI ui) { super(ui); putValue(NAME, t("tutti.editSpeciesFrequencies.action.saveAndContinue")); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.