branch develop updated (2e5b8bf -> b9e4944)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 2e5b8bf fixes #6887: Mettre à jour l'aide en ligne new 9df592d refs #6889: [EXPORT GENERIQUE] Supprimer les actions d'export générique new b9e4944 fixes #6889: [EXPORT GENERIQUE] Supprimer les actions d'export générique Merge branch 'feature/6889' into develop The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit b9e49441801908a03c292d6b2b8aa666042b9183 Merge: 2e5b8bf 9df592d Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 2 11:55:41 2015 +0200 fixes #6889: [EXPORT GENERIQUE] Supprimer les actions d'export générique Merge branch 'feature/6889' into develop commit 9df592d40160e311fe397009743b3ed4cdd21ccf Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 2 11:55:20 2015 +0200 refs #6889: [EXPORT GENERIQUE] Supprimer les actions d'export générique Summary of changes: .../tutti/ui/swing/content/home/SelectCruiseUI.css | 24 +--- .../ui/swing/content/home/SelectCruiseUI.jaxx | 9 +- .../swing/content/home/SelectCruiseUIHandler.java | 34 ------ .../actions/ExportGenericFormatCruiseAction.java | 136 --------------------- .../ExportGenericFormatProgramCruisesAction.java | 132 -------------------- 5 files changed, 3 insertions(+), 332 deletions(-) delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/ExportGenericFormatCruiseAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/ExportGenericFormatProgramCruisesAction.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 9df592d40160e311fe397009743b3ed4cdd21ccf Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 2 11:55:20 2015 +0200 refs #6889: [EXPORT GENERIQUE] Supprimer les actions d'export générique --- .../tutti/ui/swing/content/home/SelectCruiseUI.css | 24 +--- .../ui/swing/content/home/SelectCruiseUI.jaxx | 9 +- .../swing/content/home/SelectCruiseUIHandler.java | 34 ------ .../actions/ExportGenericFormatCruiseAction.java | 136 --------------------- .../ExportGenericFormatProgramCruisesAction.java | 132 -------------------- 5 files changed, 3 insertions(+), 332 deletions(-) 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 6280f7a..ad2e9e3 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 @@ -55,12 +55,6 @@ BeanFilterableComboBox { _help: {"tutti.selectCruise.field.program.help"}; } -#editProgramComboBox { - model: {SwingUtil.newComboModel(editProgramButton, exportProgramButton)}; - enabled: {model.isProgramFound()}; - renderer: {new ActionListCellRenderer()}; -} - #editProgramButton { actionIcon: edit; text: "tutti.selectCruise.action.editProgram"; @@ -69,14 +63,6 @@ BeanFilterableComboBox { _help: {"tutti.selectCruise.action.editProgram.help"}; } -#exportProgramButton { - actionIcon: export; - text: "tutti.selectCruise.action.exportProgram"; - _applicationAction: {fr.ifremer.tutti.ui.swing.content.home.actions.ExportGenericFormatProgramCruisesAction.class}; - toolTipText: "tutti.selectCruise.action.exportProgram.tip"; - _help: {"tutti.selectCruise.action.exportProgram.help"}; -} - #newProgramButton { actionIcon: add; text: "tutti.selectCruise.action.newProgram"; @@ -102,7 +88,7 @@ BeanFilterableComboBox { } #editCruiseComboBox { - model: {SwingUtil.newComboModel(editCruiseButton, exportCruiseButton, sendCruiseReportButton, exportCruiseForSumatraButton, speciesToConfirmReportForCruiseButton)}; + model: {SwingUtil.newComboModel(editCruiseButton, sendCruiseReportButton, exportCruiseForSumatraButton, speciesToConfirmReportForCruiseButton)}; enabled: {model.isProgramFound() && model.isCruiseFound()}; renderer: {new ActionListCellRenderer()}; } @@ -115,14 +101,6 @@ BeanFilterableComboBox { _help: {"tutti.selectCruise.action.editCruise.help"}; } -#exportCruiseButton { - actionIcon: export; - text: "tutti.selectCruise.action.exportCruise"; - _applicationAction: {fr.ifremer.tutti.ui.swing.content.home.actions.ExportGenericFormatCruiseAction.class}; - toolTipText: "tutti.selectCruise.action.exportCruise.tip"; - _help: {"tutti.selectCruise.action.exportCruise.help"}; -} - #sendCruiseReportButton { actionIcon: email; text: "tutti.selectCruise.action.sendCruiseReport"; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx index 90eb8b3..095a7c3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx @@ -61,10 +61,8 @@ <TuttiHelpBroker id='broker' constructorParams='"tutti.selectCruise.help"'/> - <JButton id='editProgramButton'/> - <JButton id='exportProgramButton'/> + <JButton id='editCruiseButton'/> - <JButton id='exportCruiseButton'/> <JButton id='sendCruiseReportButton'/> <JButton id='exportCruiseForSumatraButton'/> <JButton id='speciesToConfirmReportForCruiseButton'/> @@ -92,10 +90,7 @@ </cell> <cell> <JPanel layout='{new GridLayout(1,0)}'> - <JComboBox id='editProgramComboBox' - onMouseEntered='handler.showActions(editProgramComboBox, 300)' - onMouseClicked='handler.startComboFirstAction(event)' - onActionPerformed='handler.startEditProgramAction(event)'/> + <JButton id='editProgramButton'/> <JButton id='newProgramButton'/> </JPanel> </cell> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java index 0a641b0..a306968 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java @@ -151,7 +151,6 @@ public class SelectCruiseUIHandler extends AbstractTuttiUIHandler<SelectCruiseUI model.getProtocols(), model.getProtocol()); - initActionComboBox(ui.getEditProgramComboBox()); initActionComboBox(ui.getEditCruiseComboBox()); initActionComboBox(ui.getEditProtocolComboBox()); initActionComboBox(ui.getNewProtocolComboBox()); @@ -252,19 +251,8 @@ public class SelectCruiseUIHandler extends AbstractTuttiUIHandler<SelectCruiseUI protected boolean resetNewProtocolAction; - protected boolean resetEditProgramAction; - protected boolean resetEditCruiseAction; - public void resetNewProtolAction() { - resetNewProtocolAction = true; - try { - ui.getNewProtocolComboBox().setSelectedIndex(0); - } finally { - resetNewProtocolAction = false; - } - } - public void resetEditProtolAction() { resetEditProtocolAction = true; try { @@ -274,24 +262,6 @@ public class SelectCruiseUIHandler extends AbstractTuttiUIHandler<SelectCruiseUI } } - public void resetEditCruiseAction() { - resetEditCruiseAction = true; - try { - ui.getEditCruiseComboBox().setSelectedIndex(0); - } finally { - resetEditCruiseAction = false; - } - } - - public void resetEditProgramAction() { - resetEditProgramAction = true; - try { - ui.getEditProgramComboBox().setSelectedIndex(0); - } finally { - resetEditProgramAction = false; - } - } - @Override public void onCloseUI() { if (log.isDebugEnabled()) { @@ -306,10 +276,6 @@ public class SelectCruiseUIHandler extends AbstractTuttiUIHandler<SelectCruiseUI timer.cancel(); } - public void startEditProgramAction(ActionEvent event) { - startEditAction(!resetEditProgramAction, event); - } - public void startEditCruiseAction(ActionEvent event) { startEditAction(!resetEditCruiseAction, event); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/ExportGenericFormatCruiseAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/ExportGenericFormatCruiseAction.java deleted file mode 100644 index bf9cd13..0000000 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/ExportGenericFormatCruiseAction.java +++ /dev/null @@ -1,136 +0,0 @@ -package fr.ifremer.tutti.ui.swing.content.home.actions; - -/* - * #%L - * Tutti :: UI - * %% - * Copyright (C) 2012 - 2014 Ifremer - * %% - * 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% - */ - -import com.google.common.base.Joiner; -import com.google.common.base.Preconditions; -import fr.ifremer.tutti.persistence.ProgressionModel; -import fr.ifremer.tutti.persistence.entities.data.Cruise; -import fr.ifremer.tutti.persistence.entities.data.Program; -import fr.ifremer.tutti.service.genericformat.GenericFormatExportConfiguration; -import fr.ifremer.tutti.service.genericformat.GenericFormatExportResult; -import fr.ifremer.tutti.service.genericformat.GenericFormatExportService; -import fr.ifremer.tutti.ui.swing.content.home.SelectCruiseUI; -import fr.ifremer.tutti.ui.swing.content.home.SelectCruiseUIHandler; -import fr.ifremer.tutti.ui.swing.content.home.SelectCruiseUIModel; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.jaxx.application.ApplicationBusinessException; - -import java.io.File; -import java.util.List; - -import static org.nuiton.i18n.I18n.t; - -/** - * To export a selected cruise. - * - * @author tchemit <chemit@codelutin.com> - * @since 2.0 - */ -public class ExportGenericFormatCruiseAction extends LongActionSupport<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { - - /** Logger. */ - private static final Log log = LogFactory.getLog(ExportGenericFormatCruiseAction.class); - - protected File file; - - private GenericFormatExportResult exportResult; - - public ExportGenericFormatCruiseAction(SelectCruiseUIHandler handler) { - super(handler, true); - } - - @Override - public boolean prepareAction() throws Exception { - - boolean doAction = super.prepareAction(); - - if (doAction) { - - Cruise cruise = getModel().getCruise(); - - // choose file to export - file = saveFileWithStartDirectory( - getConfig().getExportBackupDirectory(), - false, - "exportCruise-" + cruise.getName(), - "zip", - t("tutti.selectCruise.title.choose.exportCruiseFile"), - t("tutti.selectCruise.action.chooseCruiseExportFile"), - "^.+\\.zip$", t("tutti.common.file.genericFormat") - ); - doAction = file != null; - } - return doAction; - } - - @Override - public void releaseAction() { - exportResult = null; - file = null; - handler.resetEditCruiseAction(); - super.releaseAction(); - } - - @Override - public void doAction() throws Exception { - - Program program = getModel().getProgram(); - Preconditions.checkNotNull(program); - - Cruise cruise = getModel().getCruise(); - Preconditions.checkNotNull(cruise); - - Preconditions.checkNotNull(file); - - if (log.isInfoEnabled()) { - log.info("Will save cruise " + cruise.getId() + " to file: " + file); - } - - GenericFormatExportService service = getContext().getGenericFormatExportService(); - - createProgressionModelIfRequired(1); - - ProgressionModel progressionModel = getProgressionModel(); - progressionModel.increments(t("tutti.exportCruise.action.computeNbSteps")); - - GenericFormatExportConfiguration exportConfiguration = service.createExportConfigurationForCruise(program.getId(), cruise.getId(), file); - int nbSteps = service.getExportNbSteps(exportConfiguration); - progressionModel.adaptTotal(nbSteps); - - exportResult = service.export(exportConfiguration, progressionModel); - - sendMessage(t("tutti.exportCruise.action.success", cruise.getName(), file.getName())); - - if (!exportResult.isSuccess()) { - - List<String> errorsByCruise = exportResult.getErrorsByCruise(); - String errorMessage = t("tutti.exportCruise.action.exportErrors", cruise.getName(), Joiner.on('\n').join(errorsByCruise)); - throw new ApplicationBusinessException(errorMessage); - } - - } - -} diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/ExportGenericFormatProgramCruisesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/ExportGenericFormatProgramCruisesAction.java deleted file mode 100644 index b046527..0000000 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/ExportGenericFormatProgramCruisesAction.java +++ /dev/null @@ -1,132 +0,0 @@ -package fr.ifremer.tutti.ui.swing.content.home.actions; - -/* - * #%L - * Tutti :: UI - * %% - * Copyright (C) 2012 - 2014 Ifremer - * %% - * 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% - */ - -import com.google.common.base.Joiner; -import com.google.common.base.Preconditions; -import fr.ifremer.tutti.persistence.ProgressionModel; -import fr.ifremer.tutti.persistence.entities.data.Program; -import fr.ifremer.tutti.service.genericformat.GenericFormatExportConfiguration; -import fr.ifremer.tutti.service.genericformat.GenericFormatExportResult; -import fr.ifremer.tutti.service.genericformat.GenericFormatExportService; -import fr.ifremer.tutti.ui.swing.content.home.SelectCruiseUI; -import fr.ifremer.tutti.ui.swing.content.home.SelectCruiseUIHandler; -import fr.ifremer.tutti.ui.swing.content.home.SelectCruiseUIModel; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.jaxx.application.ApplicationBusinessException; - -import java.io.File; -import java.util.List; - -import static org.nuiton.i18n.I18n.t; - -/** - * To export a selected program. - * - * @author tchemit <chemit@codelutin.com> - * @since 2.0 - */ -public class ExportGenericFormatProgramCruisesAction extends LongActionSupport<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { - - /** Logger. */ - private static final Log log = LogFactory.getLog(ExportGenericFormatProgramCruisesAction.class); - - protected File file; - - private GenericFormatExportResult exportResult; - - public ExportGenericFormatProgramCruisesAction(SelectCruiseUIHandler handler) { - super(handler, true); - } - - @Override - public boolean prepareAction() throws Exception { - - boolean doAction = super.prepareAction(); - - Program program = getModel().getProgram(); - if (doAction) { - - // choose file to export - file = saveFileWithStartDirectory( - getConfig().getExportBackupDirectory(), - false, - "exportProgram-" + program.getName(), - "zip", - t("tutti.selectCruise.title.choose.exportProgramFile"), - t("tutti.selectCruise.action.chooseProgramExportFile"), - "^.+\\.zip$", t("tutti.common.file.genericFormat") - ); - doAction = file != null; - } - return doAction; - } - - @Override - public void releaseAction() { - file = null; - exportResult = null; - handler.resetEditProgramAction(); - super.releaseAction(); - } - - @Override - public void doAction() throws Exception { - Program program = getModel().getProgram(); - Preconditions.checkNotNull(program); - Preconditions.checkNotNull(file); - - if (log.isInfoEnabled()) { - log.info("Will save program " + program.getId() + " to file: " + file); - } - - GenericFormatExportService service = getContext().getGenericFormatExportService(); - - createProgressionModelIfRequired(1); - - ProgressionModel progressionModel = getProgressionModel(); - - progressionModel.increments(t("tutti.exportProgram.action.computeNbSteps")); - - GenericFormatExportConfiguration exportConfiguration = service.createExportConfigurationForProgram(program.getId(), file); - int nbSteps = service.getExportNbSteps(exportConfiguration); - progressionModel.adaptTotal(nbSteps); - - exportResult = service.export(exportConfiguration, progressionModel); - - sendMessage(t("tutti.exportProgram.action.success", program.getName(), file.getName())); - - if (exportResult.isSuccess()) { - - List<String> errorsByCruise = exportResult.getErrorsByCruise(); - String errorMessage; - errorMessage = t("tutti.exportProgram.action.exportErrors", program.getName(), Joiner.on('\n').join(errorsByCruise)); - - throw new ApplicationBusinessException(errorMessage); - } - - } - -} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 b9e49441801908a03c292d6b2b8aa666042b9183 Merge: 2e5b8bf 9df592d Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 2 11:55:41 2015 +0200 fixes #6889: [EXPORT GENERIQUE] Supprimer les actions d'export générique Merge branch 'feature/6889' into develop .../tutti/ui/swing/content/home/SelectCruiseUI.css | 24 +--- .../ui/swing/content/home/SelectCruiseUI.jaxx | 9 +- .../swing/content/home/SelectCruiseUIHandler.java | 34 ------ .../actions/ExportGenericFormatCruiseAction.java | 136 --------------------- .../ExportGenericFormatProgramCruisesAction.java | 132 -------------------- 5 files changed, 3 insertions(+), 332 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm