branch feature/6805 created (now 8d4b9cb)
This is an automated email from the git hooks/post-receive script. New change to branch feature/6805 in repository tutti. See http://git.codelutin.com/tutti.git at 8d4b9cb correction des actions simples manquantes This branch includes the following new commits: new 4bd9c93 correction des mises à jour de référentiels new d43dc20 correction d'un test erronne lors de l'import de navires new 00c676b amelioration de la cinematique lors de l'ouverture de l'ui de remplacement des referentiels new 8d4b9cb correction des actions simples manquantes The 4 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 8d4b9cb80a5450ee11da3b0f09811fe7d6a24ea0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 11 22:30:05 2015 +0100 correction des actions simples manquantes commit 00c676b8c23ae4ea9c15a4201a9e5b4fd1411f7b Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 11 22:29:41 2015 +0100 amelioration de la cinematique lors de l'ouverture de l'ui de remplacement des referentiels commit d43dc2009c62045497796f6ef349dfe7722e17a4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 11 22:29:03 2015 +0100 correction d'un test erronne lors de l'import de navires commit 4bd9c93772190bfb5e289cc35510fd14e34c3901 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 11 22:28:44 2015 +0100 correction des mises à jour de référentiels -- 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 feature/6805 in repository tutti. See http://git.codelutin.com/tutti.git commit 4bd9c93772190bfb5e289cc35510fd14e34c3901 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 11 22:28:44 2015 +0100 correction des mises à jour de référentiels --- .../referential/GearPersistenceServiceImpl.java | 33 ++++++++++------- .../referential/PersonPersistenceServiceImpl.java | 11 ++++++ .../referential/VesselPersistenceServiceImpl.java | 41 +++++++++++++++++----- 3 files changed, 65 insertions(+), 20 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceImpl.java index 91191b4..45b9aeb 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceImpl.java @@ -30,6 +30,7 @@ import fr.ifremer.adagio.core.dao.referential.StatusCode; import fr.ifremer.adagio.core.dao.referential.gear.FishingGearExtendDao; import fr.ifremer.adagio.core.dao.referential.gear.GearClassification; import fr.ifremer.adagio.core.dao.referential.gear.GearClassificationId; +import fr.ifremer.adagio.core.dao.referential.gear.GearClassificationImpl; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Gears; import org.hibernate.type.IntegerType; @@ -213,12 +214,7 @@ public class GearPersistenceServiceImpl extends ReferentialPersistenceServiceSup Preconditions.checkNotNull(source.getLabel()); Preconditions.checkNotNull(source.getName()); - Integer gearClassificationId; - if (source.isScientificGear()) { - gearClassificationId = GearClassificationId.SCIENTIFIC_CRUISE.getValue(); - } else { - gearClassificationId = GearClassificationId.FAO.getValue(); - } + Integer gearClassificationId = getGearClassificationId(source); Gear result; if (source.getId() != null) { @@ -246,12 +242,7 @@ public class GearPersistenceServiceImpl extends ReferentialPersistenceServiceSup Preconditions.checkNotNull(source.getName()); Preconditions.checkArgument(source.getId() == null || Gears.isTemporaryId(source.getIdAsInt())); - Integer gearClassificationId; - if (source.isScientificGear()) { - gearClassificationId = GearClassificationId.SCIENTIFIC_CRUISE.getValue(); - } else { - gearClassificationId = GearClassificationId.FAO.getValue(); - } + Integer gearClassificationId = getGearClassificationId(source); fr.ifremer.adagio.core.dao.referential.gear.Gear target = fishingGearDao.createAsTemporary(source.getLabel(), source.getName(), gearClassificationId); Gear result = Gears.newGear(); @@ -281,10 +272,28 @@ public class GearPersistenceServiceImpl extends ReferentialPersistenceServiceSup result.setName(source.getName()); result.setScientificGear(source.isScientificGear()); setStatus(status, result); + + fr.ifremer.adagio.core.dao.referential.gear.FishingGear toUpdate = fishingGearDao.load(source.getIdAsInt()); + toUpdate.setLabel(result.getLabel()); + toUpdate.setName(result.getName()); + Integer gearClassificationId = getGearClassificationId(source); + toUpdate.setGearClassification(load(GearClassificationImpl.class, gearClassificationId)); + fishingGearDao.update(toUpdate); + return result; } + private Integer getGearClassificationId(Gear source) { + Integer gearClassificationId; + if (source.isScientificGear()) { + gearClassificationId = GearClassificationId.SCIENTIFIC_CRUISE.getValue(); + } else { + gearClassificationId = GearClassificationId.FAO.getValue(); + } + return gearClassificationId; + } + protected Gear linkTemporaryGear(Gear source) { Preconditions.checkNotNull(source); diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceImpl.java index 6e2081f..0c52656 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceImpl.java @@ -30,6 +30,7 @@ import fr.ifremer.adagio.core.dao.administration.user.DepartmentId; import fr.ifremer.adagio.core.dao.administration.user.PersonExtendDao; import fr.ifremer.adagio.core.dao.administration.user.UserProfilId; import fr.ifremer.adagio.core.dao.referential.StatusCode; +import fr.ifremer.adagio.core.vo.administration.user.PersonVO; import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.Persons; import org.hibernate.type.IntegerType; @@ -252,6 +253,16 @@ public class PersonPersistenceServiceImpl extends ReferentialPersistenceServiceS result.setLastName(source.getLastName()); result.setFirstName(source.getFirstName()); setStatus(status, result); + + PersonVO toUpdate = new PersonVO(); + toUpdate.setId(source.getIdAsInt()); + toUpdate.setLastname(source.getLastName()); + toUpdate.setFirstname(source.getFirstName()); + toUpdate.setDepartmentId(DepartmentId.UNKNOWN_RECORDER_DEPARTMENT.getValue()); + toUpdate.setCreationDate(personDao.load(source.getIdAsInt()).getCreationDate()); + toUpdate.setStatusCode(status.getCode()); + personDao.save(toUpdate); + return result; } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceServiceImpl.java index e77f8d8..fb6e7bc 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceServiceImpl.java @@ -217,12 +217,20 @@ public class VesselPersistenceServiceImpl extends ReferentialPersistenceServiceS @Override public List<Vessel> updateTemporaryVessels(List<Vessel> vessels) { + Integer countryLocationId = + locationDao.getLocationIdByLabelAndLocationLevel( + LocationLabel.FRANCE.getValue(), + new Integer[]{LocationLevelId.PAYS_ISO3.getValue()}); + if (countryLocationId == null) { + throw new DataIntegrityViolationException("Default country location not found, with label=" + LocationLabel.FRANCE.getValue()); + } + fr.ifremer.adagio.core.dao.referential.Status status = statusDao.load(StatusCode.TEMPORARY.getValue()); List<Vessel> result = Lists.newArrayList(); for (Vessel source : vessels) { - Vessel updated = updateTemporaryVessel(source, status); + Vessel updated = updateTemporaryVessel(source, countryLocationId, status); result.add(updated); } return Collections.unmodifiableList(result); @@ -330,12 +338,7 @@ public class VesselPersistenceServiceImpl extends ReferentialPersistenceServiceS Preconditions.checkNotNull(source.getInternationalRegistrationCode()); Preconditions.checkArgument(StringUtils.isBlank(source.getId()) || Vessels.isTemporaryId(source.getId())); - Integer vesselTypeId; - if (source.isScientificVessel()) { - vesselTypeId = VesselTypeId.SCIENTIFIC_RESEARCH_VESSEL.getValue(); - } else { - vesselTypeId = VesselTypeId.FISHING_VESSEL.getValue(); - } + Integer vesselTypeId = getVesselTypeId(source); fr.ifremer.adagio.core.dao.data.vessel.Vessel target = vesselExtendDao.createAsTemporary( @@ -357,7 +360,7 @@ public class VesselPersistenceServiceImpl extends ReferentialPersistenceServiceS } - protected Vessel updateTemporaryVessel(Vessel source, Status status) { + protected Vessel updateTemporaryVessel(Vessel source, Integer countryLocationId, Status status) { Preconditions.checkNotNull(source); Preconditions.checkNotNull(source.getId()); @@ -372,10 +375,32 @@ public class VesselPersistenceServiceImpl extends ReferentialPersistenceServiceS result.setInternationalRegistrationCode(source.getInternationalRegistrationCode()); result.setScientificVessel(source.isScientificVessel()); setStatus(status, result); + + Integer vesselTypeId = getVesselTypeId(source); + + vesselExtendDao.updateTemporaryVessel( + source.getId(), + source.getRegistrationCode(), + source.getInternationalRegistrationCode(), + countryLocationId, + source.getName(), + vesselTypeId, + false); + return result; } + private Integer getVesselTypeId(Vessel source) { + Integer vesselTypeId; + if (source.isScientificVessel()) { + vesselTypeId = VesselTypeId.SCIENTIFIC_RESEARCH_VESSEL.getValue(); + } else { + vesselTypeId = VesselTypeId.FISHING_VESSEL.getValue(); + } + return vesselTypeId; + } + protected Vessel linkTemporaryVessel(Vessel source) { Preconditions.checkNotNull(source); -- 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 feature/6805 in repository tutti. See http://git.codelutin.com/tutti.git commit d43dc2009c62045497796f6ef349dfe7722e17a4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 11 22:29:03 2015 +0100 correction d'un test erronne lors de l'import de navires --- .../service/referential/consumer/CsvConsumerForTemporaryVessel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporaryVessel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporaryVessel.java index 29c03ac..b5ec8cd 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporaryVessel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporaryVessel.java @@ -223,7 +223,7 @@ public class CsvConsumerForTemporaryVessel extends CsvComsumer<VesselRow, Vessel throw new ApplicationBusinessException(t("tutti.service.referential.import.vessel.error.noRegistrationCode", id)); } - if (!internationalRegistrationCode.equals(vessel.getName()) && !requestResult.addExistingNaturalId(internationalRegistrationCode)) { + if (!internationalRegistrationCode.equals(vessel.getInternationalRegistrationCode()) && !requestResult.addExistingNaturalId(internationalRegistrationCode)) { throw new ApplicationBusinessException(t("tutti.service.referential.import.vessel.error.existingRegistrationCode", internationalRegistrationCode)); } -- 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 feature/6805 in repository tutti. See http://git.codelutin.com/tutti.git commit 00c676b8c23ae4ea9c15a4201a9e5b4fd1411f7b Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 11 22:29:41 2015 +0100 amelioration de la cinematique lors de l'ouverture de l'ui de remplacement des referentiels --- .../AbstractOpenReplaceTemporaryUIAction.java | 64 ++++++++++++---------- 1 file changed, 35 insertions(+), 29 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/AbstractOpenReplaceTemporaryUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/AbstractOpenReplaceTemporaryUIAction.java index 4950ce7..c36268a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/AbstractOpenReplaceTemporaryUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/AbstractOpenReplaceTemporaryUIAction.java @@ -27,7 +27,6 @@ package fr.ifremer.tutti.ui.swing.content.referential.actions; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.referential.TuttiReferentialEntity; import fr.ifremer.tutti.service.PersistenceService; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import fr.ifremer.tutti.ui.swing.content.MainUI; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIHandler; @@ -36,13 +35,13 @@ import fr.ifremer.tutti.ui.swing.content.referential.replace.AbstractReplaceTemp import fr.ifremer.tutti.ui.swing.content.referential.replace.AbstractReplaceTemporaryUIModel; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import jaxx.runtime.SwingUtil; import jaxx.runtime.context.JAXXInitialContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import javax.swing.JButton; -import javax.swing.SwingUtilities; import java.util.List; import static org.nuiton.i18n.I18n.t; @@ -73,6 +72,10 @@ public abstract class AbstractOpenReplaceTemporaryUIAction<E extends TuttiRefere protected E target; + protected List<E> targetList; + + protected List<E> sourceList; + protected AbstractOpenReplaceTemporaryUIAction(ManageTemporaryReferentialUIHandler handler) { super(handler, true); } @@ -96,78 +99,81 @@ public abstract class AbstractOpenReplaceTemporaryUIAction<E extends TuttiRefere @Override public void releaseAction() { source = target = null; + targetList = sourceList = null; super.releaseAction(); } @Override public void doAction() throws Exception { - // Load model - - M model = createNewModel(); - PersistenceService persistenceService = getContext().getPersistenceService(); String entityLabel = getEntityLabel(); - getProgressionModel().increments(t("tutti.openReplaceTemporaryUI.loading.target", entityLabel)); - // Get target list - List<E> targetList = getTargetList(persistenceService); + getProgressionModel().increments(t("tutti.openReplaceTemporaryUI.loading.target", entityLabel)); + targetList = getTargetList(persistenceService); + log.info("Loaded official referentials: " + targetList.size()); + // Get source list getProgressionModel().increments(t("tutti.openReplaceTemporaryUI.loading.source", entityLabel)); + sourceList = retainTemporaryList(persistenceService, targetList); + log.info("Loaded temporary referentials: " + sourceList.size()); - // Get source list - List<E> sourceList = retainTemporaryList(persistenceService, targetList); + } - log.info("Loaded temporary referentials: " + sourceList.size()); - log.info("Loaded official referentials: " + targetList.size()); + @Override + public void postSuccessAction() { boolean showDialog = true; + String entityLabel = getEntityLabel(); + + M model = createNewModel(); + if (targetList.isEmpty()) { + showDialog = false; displayWarningMessage(t("tutti.title.openReplaceTemporaryUI.noTarget", entityLabel), t("tutti.message.openReplaceTemporaryUI.noTarget", entityLabel)); - showDialog = false; + } else { + + model.setTargetList(targetList); + } if (sourceList.isEmpty()) { + showDialog = false; + displayWarningMessage(t("tutti.title.openReplaceTemporaryUI.noSource", entityLabel), t("tutti.message.openReplaceTemporaryUI.noSource", entityLabel)); - showDialog = false; + } else { + + model.setSourceList(sourceList); + } if (showDialog) { getProgressionModel().increments(t("tutti.openReplaceTemporaryUI.open.dialog")); - model.setTargetList(targetList); - model.setSourceList(sourceList); - JAXXInitialContext ctx = new JAXXInitialContext(); ctx.add(getUI()); ctx.add(model); - final UI dialog = createUI(ctx); + UI dialog = createUI(ctx); MainUI mainUI = TuttiUIUtil.getApplicationContext(dialog).getMainUI(); SwingUtil.setComponentHeight(dialog, 400); SwingUtil.setComponentWidth(dialog, mainUI.getWidth() - 100); SwingUtil.center(mainUI, dialog); - SwingUtilities.invokeLater( - new Runnable() { - @Override - public void run() { - dialog.setContextValue(getUI(), "owner"); - dialog.setVisible(true); - ((TuttiUI) dialog).getHandler().onCloseUI(); - } - } - ); + dialog.setContextValue(getUI(), "owner"); + dialog.setVisible(true); + ((TuttiUI) dialog).getHandler().onCloseUI(); + } } -- 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 feature/6805 in repository tutti. See http://git.codelutin.com/tutti.git commit 8d4b9cb80a5450ee11da3b0f09811fe7d6a24ea0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 11 22:30:05 2015 +0100 correction des actions simples manquantes --- .../operation/catches/MultiPostImportLogDialog.css | 2 +- .../catches/MultiPostImportLogDialog.jaxx | 3 +- .../catches/species/ImportPupitriPopupUI.css | 2 + .../catches/species/ImportPupitriPopupUI.jaxx | 4 +- .../species/ImportPupitriPopupUIHandler.java | 26 +------------ .../species/actions/ImportPupitriAction.java | 3 +- .../actions/ImportPupitriPopupCancelAction.java | 28 ++++++++++++++ .../actions/ImportPupitriPopupValidateAction.java | 45 ++++++++++++++++++++++ .../MultiPostImportLogCloseDialogAction.java | 24 ++++++++++++ .../replace/AbstractReplaceTemporaryUI.css | 1 + .../replace/AbstractReplaceTemporaryUI.jaxx | 2 +- .../replace/actions/CloseReplaceUIAction.java | 27 +++++++++++++ 12 files changed, 134 insertions(+), 33 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.css index ed02da0..0bc6201 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.css @@ -45,5 +45,5 @@ text: "tutti.multiPostImportLog.close"; toolTipText: "tutti.multiPostImportLog.close.tip"; i18nMnemonic: "tutti.multiPostImportLog.close.mnemonic"; - _skipAction: true; + _simpleaction: {fr.ifremer.tutti.ui.swing.content.operation.catches.species.actions.MultiPostImportLogCloseDialogAction.class}; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.jaxx index ff4ea83..6039ed1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.jaxx @@ -27,7 +27,6 @@ <JTextArea id="batchList"/> </JScrollPane> - <JButton id="closeButton" constraints='BorderLayout.SOUTH' - onActionPerformed='dispose();'/> + <JButton id="closeButton" constraints='BorderLayout.SOUTH'/> </JDialog> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.css index 4630a75..3b0de25 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.css @@ -56,6 +56,7 @@ FileEditor { text: "tutti.common.cancel"; toolTipText: "tutti.common.cancel"; i18nMnemonic: "tutti.common.cancel.mnemonic"; + _simpleAction: {fr.ifremer.tutti.ui.swing.content.operation.catches.species.actions.ImportPupitriPopupCancelAction.class}; } #validateButton { @@ -63,5 +64,6 @@ FileEditor { text: "tutti.common.validate"; toolTipText: "tutti.common.validate"; i18nMnemonic: "tutti.common.validate.mnemonic"; + _simpleAction: {fr.ifremer.tutti.ui.swing.content.operation.catches.species.actions.ImportPupitriPopupValidateAction.class}; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.jaxx index c6db5c9..1e88b04 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.jaxx @@ -63,8 +63,8 @@ public void open() { <row> <cell columns='2'> <JPanel layout='{new GridLayout(1,0)}'> - <JButton id='cancelButton' onActionPerformed='handler.cancel()'/> - <JButton id='validateButton' onActionPerformed='handler.validate()'/> + <JButton id='cancelButton'/> + <JButton id='validateButton'/> </JPanel> </cell> </row> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java index 0cb0e8a..304ad95 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java @@ -29,11 +29,8 @@ import jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.JOptionPane; import java.io.File; -import static org.nuiton.i18n.I18n.t; - /** * @author kmorin <morin@codelutin.com> * @author tchemit <chemit@codelutin.com> @@ -133,28 +130,7 @@ public class ImportPupitriPopupUIHandler implements UIHandler<ImportPupitriPopup ui.setVisible(true); } - public void cancel() { - resetFields(); - ui.dispose(); - } - - public void validate() { - if (ui.getTrunkFile().getSelectedFile() != null - && ui.getTrunkFile().getSelectedFile().exists() - && ui.getCarrouselFile().getSelectedFile() != null - && ui.getCarrouselFile().getSelectedFile().exists()) { - - ui.dispose(); - - } else { - JOptionPane.showMessageDialog(ui, - t("tutti.importPupitri.error.fileMissing.message"), - t("tutti.importPupitri.error.fileMissing.title"), - JOptionPane.ERROR_MESSAGE); - } - } - - protected void resetFields() { + public void resetFields() { ui.getTrunkFile().setSelectedFilePath(null); ui.getCarrouselFile().setSelectedFilePath(null); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriAction.java index 17b3ea3..74162aa 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriAction.java @@ -140,8 +140,7 @@ public class ImportPupitriAction extends LongActionSupport<SpeciesBatchUIModel, importPupitriDialog.open(); importedTrunkFile = importPupitriDialog.getTrunkFile().getSelectedFile(); importedCarrouselFile = importPupitriDialog.getCarrouselFile().getSelectedFile(); - result = importedTrunkFile != null - && importedCarrouselFile != null; + result = importedTrunkFile != null && importedCarrouselFile != null; } return result; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriPopupCancelAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriPopupCancelAction.java new file mode 100644 index 0000000..4aef8ba --- /dev/null +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriPopupCancelAction.java @@ -0,0 +1,28 @@ +package fr.ifremer.tutti.ui.swing.content.operation.catches.species.actions; + +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.ImportPupitriPopupUI; +import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; + +/** + * Created on 3/11/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.15 + */ +public class ImportPupitriPopupCancelAction extends SimpleActionSupport<ImportPupitriPopupUI> { + + private static final long serialVersionUID = 1L; + + public ImportPupitriPopupCancelAction(ImportPupitriPopupUI ui) { + super(ui); + } + + @Override + protected void onActionPerformed(ImportPupitriPopupUI ui) { + + ui.getTrunkFile().setSelectedFilePath(null); + ui.getCarrouselFile().setSelectedFilePath(null); + ui.dispose(); + + } +} diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriPopupValidateAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriPopupValidateAction.java new file mode 100644 index 0000000..3404580 --- /dev/null +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriPopupValidateAction.java @@ -0,0 +1,45 @@ +package fr.ifremer.tutti.ui.swing.content.operation.catches.species.actions; + +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.ImportPupitriPopupUI; +import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; + +import javax.swing.JOptionPane; + +import java.io.File; + +import static org.nuiton.i18n.I18n.t; + +/** + * Created on 3/11/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.15 + */ +public class ImportPupitriPopupValidateAction extends SimpleActionSupport<ImportPupitriPopupUI> { + + private static final long serialVersionUID = 1L; + + public ImportPupitriPopupValidateAction(ImportPupitriPopupUI ui) { + super(ui); + } + + @Override + protected void onActionPerformed(ImportPupitriPopupUI ui) { + + File trunkFile = ui.getTrunkFile().getSelectedFile(); + File carousselFile = ui.getCarrouselFile().getSelectedFile(); + if (trunkFile != null && trunkFile.exists() && carousselFile != null && carousselFile.exists()) { + + ui.dispose(); + + } else { + + JOptionPane.showMessageDialog(ui, + t("tutti.importPupitri.error.fileMissing.message"), + t("tutti.importPupitri.error.fileMissing.title"), + JOptionPane.ERROR_MESSAGE); + + } + + } +} diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/MultiPostImportLogCloseDialogAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/MultiPostImportLogCloseDialogAction.java new file mode 100644 index 0000000..61ef6b9 --- /dev/null +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/MultiPostImportLogCloseDialogAction.java @@ -0,0 +1,24 @@ +package fr.ifremer.tutti.ui.swing.content.operation.catches.species.actions; + +import fr.ifremer.tutti.ui.swing.content.operation.catches.MultiPostImportLogDialog; +import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; + +/** + * Created on 3/11/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.15 + */ +public class MultiPostImportLogCloseDialogAction extends SimpleActionSupport<MultiPostImportLogDialog> { + + private static final long serialVersionUID = 1L; + + public MultiPostImportLogCloseDialogAction(MultiPostImportLogDialog ui) { + super(ui); + } + + @Override + protected void onActionPerformed(MultiPostImportLogDialog ui) { + ui.dispose(); + } +} diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.css index 82bcf0c..0213e8b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.css @@ -80,5 +80,6 @@ BeanFilterableComboBox { text: "tutti.replaceTemporaryReferential.action.cancel"; toolTipText: "tutti.replaceTemporaryReferential.action.cancel.tip"; i18nMnemonic: "tutti.replaceTemporaryReferential.action.cancel.mnemonic"; + _simpleAction:{fr.ifremer.tutti.ui.swing.content.referential.replace.actions.CloseReplaceUIAction.class}; _help: {"tutti.replaceTemporaryReferential.action.cancel.help"}; } \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.jaxx index 18e8810..63313dd 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.jaxx @@ -87,7 +87,7 @@ <row anchor='south'> <cell columns='2' fill="both"> <JPanel layout='{new GridLayout(1, 0)}'> - <JButton id='cancelButton' onActionPerformed='model.setValid(false); dispose();'/> + <JButton id='cancelButton'/> <JButton id='replaceButton'/> </JPanel> </cell> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/CloseReplaceUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/CloseReplaceUIAction.java new file mode 100644 index 0000000..ff9e20d --- /dev/null +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/CloseReplaceUIAction.java @@ -0,0 +1,27 @@ +package fr.ifremer.tutti.ui.swing.content.referential.replace.actions; + +import fr.ifremer.tutti.ui.swing.content.referential.replace.AbstractReplaceTemporaryUI; +import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; + +/** + * Created on 3/11/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.15 + */ +public class CloseReplaceUIAction extends SimpleActionSupport<AbstractReplaceTemporaryUI>{ + + private static final long serialVersionUID = 1L; + + public CloseReplaceUIAction(AbstractReplaceTemporaryUI ui) { + super(ui); + } + + @Override + protected void onActionPerformed(AbstractReplaceTemporaryUI ui) { + + ui.getModel().setValid(false); + ui.dispose(); + + } +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm