branch develop updated (5792aca -> 1372d97)
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 5792aca refs #6105 (renommage des actions + fix NPE quand capture non modifiée new 0105696 suppression de l'action d'import casino new 4f6fe70 ne pas conserver des champs pour rien... new 8320b30 renseigner automatiquement l'autre champs lors de la modification de l'un + amélioration css new 1372d97 fixes #6108: [CAPTURE] autocompléter le champ .car dès que le champ .tnk est renseigné 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 1372d97db9ab6b96be450006cb2edd3d8e1b1c49 Merge: 5792aca 8320b30 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 16 16:58:34 2014 +0100 fixes #6108: [CAPTURE] autocompléter le champ .car dès que le champ .tnk est renseigné commit 8320b30b95fc2b48a7c2e3142c73214e1d6fb7a5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 16 16:58:15 2014 +0100 renseigner automatiquement l'autre champs lors de la modification de l'un + amélioration css commit 4f6fe703eaabf0f88261233b671fcc625965fbb9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 16 16:57:25 2014 +0100 ne pas conserver des champs pour rien... commit 0105696d9c5c0db2b692c8b3f18ae403b970b4a1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 16 16:13:45 2014 +0100 suppression de l'action d'import casino Summary of changes: .../tutti/ui/swing/action/ImportCasinoAction.java | 44 ----------- .../tutti/ui/swing/action/ImportPupitriAction.java | 8 +- .../catches/species/ImportPupitriPopupUI.css | 10 ++- .../catches/species/ImportPupitriPopupUI.jaxx | 10 +-- .../species/ImportPupitriPopupUIHandler.java | 86 +++++++++++++++++++++- 5 files changed, 93 insertions(+), 65 deletions(-) delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportCasinoAction.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 0105696d9c5c0db2b692c8b3f18ae403b970b4a1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 16 16:13:45 2014 +0100 suppression de l'action d'import casino --- .../tutti/ui/swing/action/ImportCasinoAction.java | 44 ---------------------- 1 file changed, 44 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportCasinoAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportCasinoAction.java deleted file mode 100644 index 70ddc3a..0000000 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportCasinoAction.java +++ /dev/null @@ -1,44 +0,0 @@ -package fr.ifremer.tutti.ui.swing.action; - -/* - * #%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 fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUI; -import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUIHandler; -import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUIModel; - -/** - * @author tchemit <chemit@codelutin.com> - * @since 1.0 - */ -public class ImportCasinoAction extends AbstractTuttiAction<EditFishingOperationUIModel, EditFishingOperationUI, EditFishingOperationUIHandler> { - - public ImportCasinoAction(EditFishingOperationUIHandler handler) { - super(handler, false); - } - - @Override - public void doAction() throws Exception { - //TODO - } - -} -- 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 4f6fe703eaabf0f88261233b671fcc625965fbb9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 16 16:57:25 2014 +0100 ne pas conserver des champs pour rien... --- .../fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java index 554aef1..3f91d48 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java @@ -25,7 +25,6 @@ package fr.ifremer.tutti.ui.swing.action; import com.google.common.base.Joiner; import com.google.common.collect.Lists; import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId; -import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId2; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; @@ -58,8 +57,6 @@ public class ImportPupitriAction extends AbstractTuttiAction<SpeciesBatchUIModel protected File importedCarrouselFile; - protected ImportPupitriPopupUI importPupitriDialog; - protected PersistenceService persistenceService; protected EditFishingOperationAction editAction; @@ -69,7 +66,6 @@ public class ImportPupitriAction extends AbstractTuttiAction<SpeciesBatchUIModel public ImportPupitriAction(SpeciesBatchUIHandler handler) { super(handler, false); persistenceService = getContext().getPersistenceService(); - importPupitriDialog = new ImportPupitriPopupUI(handler.getContext()); } public EditFishingOperationAction getEditAction() { @@ -127,6 +123,8 @@ public class ImportPupitriAction extends AbstractTuttiAction<SpeciesBatchUIModel } if (result) { + + ImportPupitriPopupUI importPupitriDialog = new ImportPupitriPopupUI(handler.getContext()); importPupitriDialog.open(); importedTrunkFile = importPupitriDialog.getTrunkFile().getSelectedFile(); importedCarrouselFile = importPupitriDialog.getCarrouselFile().getSelectedFile(); @@ -163,9 +161,9 @@ public class ImportPupitriAction extends AbstractTuttiAction<SpeciesBatchUIModel @Override public void releaseAction() { - super.releaseAction(); importedTrunkFile = null; importedCarrouselFile = null; + super.releaseAction(); } @Override -- 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 8320b30b95fc2b48a7c2e3142c73214e1d6fb7a5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 16 16:58:15 2014 +0100 renseigner automatiquement l'autre champs lors de la modification de l'un + amélioration css --- .../catches/species/ImportPupitriPopupUI.css | 10 ++- .../catches/species/ImportPupitriPopupUI.jaxx | 10 +-- .../species/ImportPupitriPopupUIHandler.java | 86 +++++++++++++++++++++- 3 files changed, 90 insertions(+), 16 deletions(-) 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 a583c44..4630a75 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 @@ -20,6 +20,12 @@ * #L% */ +FileEditor { + showReset:true; + directoryEnabled: false; + acceptAllFileFilterUsed: false; +} + #importPupitriDialog { modal: true; title: "tutti.importPupitri.title"; @@ -31,10 +37,8 @@ } #trunkFile { - directoryEnabled: false; exts: {t("tutti.importPupitri.trunkFile.extension")}; extsDescription: {t("tutti.importPupitri.trunkFile.extension.description")}; - acceptAllFileFilterUsed: false; } #carrouselFileLabel { @@ -43,10 +47,8 @@ } #carrouselFile { - directoryEnabled: false; exts: {t("tutti.importPupitri.carrouselFile.extension")}; extsDescription: {t("tutti.importPupitri.carrouselFile.extension.description")}; - acceptAllFileFilterUsed: false; } #cancelButton { 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 504f775..c6db5c9 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 @@ -26,8 +26,6 @@ fr.ifremer.tutti.ui.swing.util.TuttiUIUtil jaxx.runtime.swing.editor.FileEditor - org.jdesktop.swingx.JXTitledPanel - javax.swing.JComponent </import> <script><![CDATA[ @@ -42,10 +40,6 @@ public void open() { } ]]></script> - <!-- if true, display the form to add attachments - and the button to remove existing attachments --> - <Boolean id='editable' javaBean='true'/> - <Table id='mainPanel' fill='both'> <row> @@ -53,7 +47,7 @@ public void open() { <JLabel id='trunkFileLabel'/> </cell> <cell weightx='1'> - <FileEditor id='trunkFile'/> + <FileEditor id='trunkFile' onActionPerformed='handler.updateCarrouselFile()'/> </cell> </row> @@ -62,7 +56,7 @@ public void open() { <JLabel id='carrouselFileLabel'/> </cell> <cell weightx='1'> - <FileEditor id='carrouselFile'/> + <FileEditor id='carrouselFile' onActionPerformed='handler.updateTrunkFile()'/> </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 dbbec94..0cb0e8a 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 @@ -22,11 +22,15 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species; * #L% */ +import com.google.common.io.Files; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import jaxx.runtime.SwingUtil; 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; @@ -37,6 +41,9 @@ import static org.nuiton.i18n.I18n.t; */ public class ImportPupitriPopupUIHandler implements UIHandler<ImportPupitriPopupUI> { + /** Logger. */ + private static final Log log = LogFactory.getLog(ImportPupitriPopupUIHandler.class); + protected ImportPupitriPopupUI ui; @Override @@ -52,9 +59,72 @@ public class ImportPupitriPopupUIHandler implements UIHandler<ImportPupitriPopup ui.setResizable(true); } - protected void resetFields() { - ui.getTrunkFile().setSelectedFilePath(null); - ui.getCarrouselFile().setSelectedFilePath(null); + private boolean objectIsAdjusting; + + public void updateTrunkFile() { + + if (objectIsAdjusting) { + // avoid re-entrant code + return; + } + File carrouselFile = ui.getCarrouselFile().getSelectedFile(); + + if (carrouselFile != null) { + String nameWithoutExtension = Files.getNameWithoutExtension(carrouselFile.getName()); + File trunkFile = new File(carrouselFile.getParentFile(), nameWithoutExtension + ".tnk"); + if (trunkFile.exists()) { + + if (log.isInfoEnabled()) { + log.info("Select from carrousel file, trunk file: " + trunkFile); + } + + objectIsAdjusting = true; + try { + ui.getTrunkFile().setSelectedFile(trunkFile); + } finally { + objectIsAdjusting = false; + } + + } else { + if (log.isDebugEnabled()) { + log.debug("No trunk file at " + trunkFile); + } + } + } + + } + + public void updateCarrouselFile() { + + if (objectIsAdjusting) { + // avoid re-entrant code + return; + } + + File trunkFile = ui.getTrunkFile().getSelectedFile(); + if (trunkFile != null) { + String nameWithoutExtension = Files.getNameWithoutExtension(trunkFile.getName()); + File carrouselFile = new File(trunkFile.getParentFile(), nameWithoutExtension + ".car"); + if (carrouselFile.exists()) { + + if (log.isInfoEnabled()) { + log.info("Select from trunk file, carrousel file: " + carrouselFile); + } + + objectIsAdjusting = true; + try { + ui.getCarrouselFile().setSelectedFile(carrouselFile); + } finally { + objectIsAdjusting = false; + } + + } else { + if (log.isDebugEnabled()) { + log.debug("No carrousel file at " + carrouselFile); + } + } + } + } public void open() { @@ -70,7 +140,10 @@ public class ImportPupitriPopupUIHandler implements UIHandler<ImportPupitriPopup public void validate() { if (ui.getTrunkFile().getSelectedFile() != null - && ui.getCarrouselFile().getSelectedFile() != null) { + && ui.getTrunkFile().getSelectedFile().exists() + && ui.getCarrouselFile().getSelectedFile() != null + && ui.getCarrouselFile().getSelectedFile().exists()) { + ui.dispose(); } else { @@ -81,4 +154,9 @@ public class ImportPupitriPopupUIHandler implements UIHandler<ImportPupitriPopup } } + protected void resetFields() { + ui.getTrunkFile().setSelectedFilePath(null); + ui.getCarrouselFile().setSelectedFilePath(null); + } + } -- 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 1372d97db9ab6b96be450006cb2edd3d8e1b1c49 Merge: 5792aca 8320b30 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 16 16:58:34 2014 +0100 fixes #6108: [CAPTURE] autocompléter le champ .car dès que le champ .tnk est renseigné .../tutti/ui/swing/action/ImportCasinoAction.java | 44 ----------- .../tutti/ui/swing/action/ImportPupitriAction.java | 8 +- .../catches/species/ImportPupitriPopupUI.css | 10 ++- .../catches/species/ImportPupitriPopupUI.jaxx | 10 +-- .../species/ImportPupitriPopupUIHandler.java | 86 +++++++++++++++++++++- 5 files changed, 93 insertions(+), 65 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm