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 c05dbc0ac563438dd5cd11d3eae1a6224f09a8cc Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Feb 11 17:25:10 2015 +0100 rename generic format actions --- ...ruiseAction.java => ExportGenericFormatCruiseAction.java} | 8 ++++---- ...ion.java => ExportGenericFormatProgramCruisesAction.java} | 8 ++++---- .../ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css | 12 ++++++++++-- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportGenericFormatCruiseAction.java similarity index 89% rename from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java rename to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportGenericFormatCruiseAction.java index 6d2535e..ad7b3f7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportGenericFormatCruiseAction.java @@ -42,14 +42,14 @@ import static org.nuiton.i18n.I18n.t; * @author tchemit <chemit@codelutin.com> * @since 2.0 */ -public class ExportCruiseAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { +public class ExportGenericFormatCruiseAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { /** Logger. */ - private static final Log log = LogFactory.getLog(ExportCruiseAction.class); + private static final Log log = LogFactory.getLog(ExportGenericFormatCruiseAction.class); protected File file; - public ExportCruiseAction(SelectCruiseUIHandler handler) { + public ExportGenericFormatCruiseAction(SelectCruiseUIHandler handler) { super(handler, true); } @@ -93,7 +93,7 @@ public class ExportCruiseAction extends AbstractTuttiAction<SelectCruiseUIModel, log.info("Will save cruise " + cruise.getId() + " to file: " + file); } - GenericFormatExportService service = getContext().getTuttiExportService(); + GenericFormatExportService service = getContext().getGenericFormatExportService(); int nbSteps = service.getExportCruiseNbSteps(); createProgressionModelIfRequired(nbSteps); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProgramAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportGenericFormatProgramCruisesAction.java similarity index 89% rename from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProgramAction.java rename to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportGenericFormatProgramCruisesAction.java index d0bda41..d2cf969 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProgramAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportGenericFormatProgramCruisesAction.java @@ -42,14 +42,14 @@ import static org.nuiton.i18n.I18n.t; * @author tchemit <chemit@codelutin.com> * @since 2.0 */ -public class ExportProgramAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { +public class ExportGenericFormatProgramCruisesAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { /** Logger. */ - private static final Log log = LogFactory.getLog(ExportProgramAction.class); + private static final Log log = LogFactory.getLog(ExportGenericFormatProgramCruisesAction.class); protected File file; - public ExportProgramAction(SelectCruiseUIHandler handler) { + public ExportGenericFormatProgramCruisesAction(SelectCruiseUIHandler handler) { super(handler, true); } @@ -91,7 +91,7 @@ public class ExportProgramAction extends AbstractTuttiAction<SelectCruiseUIModel log.info("Will save program " + program.getId() + " to file: " + file); } - GenericFormatExportService service = getContext().getTuttiExportService(); + GenericFormatExportService service = getContext().getGenericFormatExportService(); int nbSteps = service.getExportProgramNbSteps(program.getId()); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css index d69cbf4..d3d1adf 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css @@ -72,11 +72,19 @@ BeanFilterableComboBox { #exportProgramButton { actionIcon: export; text: "tutti.selectCruise.action.exportProgram"; - _applicationAction: {fr.ifremer.tutti.ui.swing.action.ExportProgramAction.class}; + _applicationAction: {fr.ifremer.tutti.ui.swing.action.ExportGenericFormatProgramCruisesAction.class}; toolTipText: "tutti.selectCruise.action.exportProgram.tip"; _help: {"tutti.selectCruise.action.exportProgram.help"}; } +#importProgramButton { + actionIcon: import; + text: "tutti.selectCruise.action.importProgram"; + _applicationAction: {fr.ifremer.tutti.ui.swing.action.ImportGenericFormatProgramCruisesAction.class}; + toolTipText: "tutti.selectCruise.action.importProgram.tip"; + _help: {"tutti.selectCruise.action.importProgram.help"}; +} + #newProgramButton { actionIcon: add; text: "tutti.selectCruise.action.newProgram"; @@ -118,7 +126,7 @@ BeanFilterableComboBox { #exportCruiseButton { actionIcon: export; text: "tutti.selectCruise.action.exportCruise"; - _applicationAction: {fr.ifremer.tutti.ui.swing.action.ExportCruiseAction.class}; + _applicationAction: {fr.ifremer.tutti.ui.swing.action.ExportGenericFormatCruiseAction.class}; toolTipText: "tutti.selectCruise.action.exportCruise.tip"; _help: {"tutti.selectCruise.action.exportCruise.help"}; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.