February 2014 - Tutti-commits - mailman.cloud.codelutin.com

r1584 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth
by tchemit＠users.forge.codelutin.com Feb. 11, 2014

Feb. 11, 2014

Author: tchemit Date: 2014-02-11 12:53:19 +0100 (Tue, 11 Feb 2014) New Revision: 1584 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1584 Log: fixes #4299: [TECH] T?\195?\169l?\195?\169chargement base de donn?\195?\169es : Position de la fen?\195?\170tre demandant de saisir les logins Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java 2014-02-08 15:51:31 UTC (rev 1583) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java 2014-02-11 11:53:19 UTC (rev 1584) @@ -24,6 +24,8 @@ * #L% */ +import fr.ifremer.tutti.ui.swing.TuttiUIContext; +import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import jaxx.runtime.SwingUtil; import jaxx.runtime.spi.UIHandler; @@ -43,9 +45,12 @@ protected AuthenticationInfo authenticationInfo; + protected TuttiUIContext context; + @Override public void beforeInit(LoginUI ui) { this.ui = ui; + this.context = TuttiUIUtil.getApplicationContext(ui); } @Override @@ -59,7 +64,7 @@ ui.getPasswordField().setText(authenticationInfo == null ? null : new String(authenticationInfo.getPassword())); ui.pack(); - Container parent = ui.getParent(); + Container parent = context.getMainUI(); if (parent != null) { SwingUtil.center(parent, ui); }

1 0

r1583 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing
by tchemit＠users.forge.codelutin.com Feb. 8, 2014

Feb. 8, 2014

Author: tchemit Date: 2014-02-08 16:51:31 +0100 (Sat, 08 Feb 2014) New Revision: 1583 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1583 Log: fixes #4325: [TECHNIQUE] il est possible de lancer plusieurs cessions d'Allegro sur une machine Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2014-02-08 15:35:04 UTC (rev 1582) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2014-02-08 15:51:31 UTC (rev 1583) @@ -293,6 +293,14 @@ */ private File lock; + /** + * Flag to know if context was already closed. Can happen when you close nicely the application, the shutdown hook + * must then not close a second time this context. + * + * @since 3.2 + */ + private boolean closed; + public static TuttiUIContext newContext(TuttiConfiguration config) { Preconditions.checkNotNull(config); Preconditions.checkState(applicationContext == null, @@ -409,10 +417,9 @@ @Override public void run() { - if (log.isInfoEnabled()) { - log.info("Close context on shutdown"); + if (!closed) { + close(); } - close(); } })); @@ -579,6 +586,11 @@ @Override public void close() { + if (log.isInfoEnabled()) { + log.info("Closing application context..."); + } + Preconditions.checkState(!closed, "Application was already closed."); + try { // Clear data references messageNotifiers.clear(); @@ -606,10 +618,14 @@ } setActionUI(null); } finally { + closed = true; if (lock != null) { // destroy lock ApplicationIOUtil.deleteFile(lock, "Could not delete lock file"); + if (log.isInfoEnabled()) { + log.info("Delete lock file: " + lock); + } } } }

1 0

r1582 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing resources/i18n
by tchemit＠users.forge.codelutin.com Feb. 8, 2014

Feb. 8, 2014

Author: tchemit Date: 2014-02-08 16:35:04 +0100 (Sat, 08 Feb 2014) New Revision: 1582 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1582 Log: fixes #4325: [TECHNIQUE] il est possible de lancer plusieurs cessions d'Allegro sur une machine Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2014-02-08 15:06:19 UTC (rev 1581) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2014-02-08 15:35:04 UTC (rev 1582) @@ -27,16 +27,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import org.nuiton.jaxx.application.ApplicationBusinessException; -import org.nuiton.jaxx.application.ApplicationConfiguration; -import org.nuiton.jaxx.application.ApplicationIOUtil; -import org.nuiton.jaxx.application.ApplicationTechnicalException; -import org.nuiton.jaxx.application.listener.PropagatePropertyChangeListener; -import org.nuiton.jaxx.application.swing.ApplicationUIContext; -import org.nuiton.jaxx.application.swing.action.ApplicationActionEngine; -import org.nuiton.jaxx.application.swing.action.ApplicationActionFactory; -import org.nuiton.jaxx.application.swing.action.ApplicationActionUI; -import org.nuiton.jaxx.application.swing.util.ApplicationErrorHelper; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.ichtyometer.feed.FeedReader; import fr.ifremer.tutti.persistence.RessourceClassLoader; @@ -82,6 +72,16 @@ import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.i18n.init.UserI18nInitializer; +import org.nuiton.jaxx.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationConfiguration; +import org.nuiton.jaxx.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.listener.PropagatePropertyChangeListener; +import org.nuiton.jaxx.application.swing.ApplicationUIContext; +import org.nuiton.jaxx.application.swing.action.ApplicationActionEngine; +import org.nuiton.jaxx.application.swing.action.ApplicationActionFactory; +import org.nuiton.jaxx.application.swing.action.ApplicationActionUI; +import org.nuiton.jaxx.application.swing.util.ApplicationErrorHelper; import org.nuiton.util.converter.ConverterUtil; import javax.swing.JOptionPane; @@ -95,13 +95,14 @@ import java.io.InputStream; import java.net.URI; import java.net.URISyntaxException; +import java.util.Date; import java.util.Locale; import java.util.Map; import java.util.Properties; import java.util.Set; +import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; -import static org.nuiton.i18n.I18n.n; /** * UI application context. @@ -284,6 +285,14 @@ */ private FeedReader ichtyometerReader; + /** + * A file lock to prevent multiple instance. the lock is create in the {@link #init()} method and remove in the + * {@link #close()} method. + * + * @since 3.2 + */ + private File lock; + public static TuttiUIContext newContext(TuttiConfiguration config) { Preconditions.checkNotNull(config); Preconditions.checkState(applicationContext == null, @@ -455,7 +464,25 @@ i18nDirectory, new DefaultI18nInitializer("tutti-i18n")), i18nLocale); + //--------------------------------------------------------------------// + // init lock + //--------------------------------------------------------------------// + + lock = new File(config.getBasedir(), "tutti.lock"); + + if (lock.exists()) { + lock = null; + throw new ApplicationBusinessException(t("tutti.error.application.already.started")); + } + + ApplicationIOUtil.writeContent(lock, new Date().toString(), "Could not create lock file"); + if (log.isInfoEnabled()) { + log.info("Create lock file: " + lock); + } + + + //--------------------------------------------------------------------// // init help //--------------------------------------------------------------------// @@ -552,31 +579,39 @@ @Override public void close() { - // Clear data references - messageNotifiers.clear(); - validationContext = null; - IOUtils.closeQuietly(dataContext); + try { + // Clear data references + messageNotifiers.clear(); + validationContext = null; + IOUtils.closeQuietly(dataContext); - setScreen(null); + setScreen(null); - IOUtils.closeQuietly(serviceContext); - IOUtils.closeQuietly(ichtyometerReader); + IOUtils.closeQuietly(serviceContext); + IOUtils.closeQuietly(ichtyometerReader); - // remove listeners - PropertyChangeListener[] listeners = getPropertyChangeListeners(); - for (PropertyChangeListener listener : listeners) { - if (log.isDebugEnabled()) { - log.debug("Remove listener: " + listener); + // remove listeners + PropertyChangeListener[] listeners = getPropertyChangeListeners(); + for (PropertyChangeListener listener : listeners) { + if (log.isDebugEnabled()) { + log.debug("Remove listener: " + listener); + } + removePropertyChangeListener(listener); } - removePropertyChangeListener(listener); - } - setMainUI(null); - if (actionUI != null) { + setMainUI(null); + if (actionUI != null) { - // close action ui - actionUI.getModel().clear(); + // close action ui + actionUI.getModel().clear(); + } + setActionUI(null); + } finally { + if (lock != null) { + + // destroy lock + ApplicationIOUtil.deleteFile(lock, "Could not delete lock file"); + } } - setActionUI(null); } //------------------------------------------------------------------------// Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2014-02-08 15:06:19 UTC (rev 1581) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2014-02-08 15:35:04 UTC (rev 1582) @@ -1116,6 +1116,7 @@ tutti.editSpeciesFrequencies.table.header.weight= tutti.editSpeciesFrequencies.title= tutti.editSpeciesFrequencies.title.addLengthStepCaracteristic= +tutti.error.application.already.started= tutti.error.delete.startActionFile=Could not delete start action file %s tutti.error.read.startActionFile=Could not read start action file content %s tutti.error.update.bad.url.syntax= Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2014-02-08 15:06:19 UTC (rev 1581) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2014-02-08 15:35:04 UTC (rev 1582) @@ -13,7 +13,7 @@ tutti.addSampleCategoryBenthosBatch.title=Catégorisation du lot (ajout) tutti.addSampleCategorySpeciesBatch.title=Catégorisation du lot (ajout) tutti.applicationUpdater.help.error=Impossible de télécharger la mise à jour de l'aide.<br/>Si le problème persiste, veuillez consulter l'administrateur. -tutti.applicationUpdater.i18n.error= +tutti.applicationUpdater.i18n.error=Impossible de télécharger la mise à jour des traductions.<br/>Si le problème persiste, veuillez consulter l'administrateur. tutti.applicationUpdater.jre.error=Impossible de télécharger la mise à jour de l'environnement java.<br/>Si le problème persiste, veuillez consulter l'administrateur. tutti.applicationUpdater.prepareFirstDB.copyDirectory.error=Erreur lors de la copie du contenu du dossier %1s vers %2s tutti.applicationUpdater.prepareFirstDB.deleteDirectory.error=Erreur lors de la suppression du dossier %s @@ -1103,6 +1103,7 @@ tutti.editSpeciesFrequencies.table.header.weight=Poids observé tutti.editSpeciesFrequencies.title=Mensuration tutti.editSpeciesFrequencies.title.addLengthStepCaracteristic=Choisir une autre caractéristique +tutti.error.application.already.started=L'application est déjà démarrée. tutti.error.delete.startActionFile=Impossible de supprimer le fichier %s tutti.error.read.startActionFile=Impossible de lire le contenu du fichier %s tutti.error.update.bad.url.syntax=Mise à jour impossible (le format de l'url <strong>%s</strong> n'est pas valide)

1 0

r1581 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing: action util/species
by tchemit＠users.forge.codelutin.com Feb. 8, 2014

Feb. 8, 2014

Author: tchemit Date: 2014-02-08 16:06:19 +0100 (Sat, 08 Feb 2014) New Revision: 1581 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1581 Log: fixes #4376 Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUIHandler.java Removed: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightDialog.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightDialog.jaxx Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java 2014-02-07 15:57:24 UTC (rev 1580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java 2014-02-08 15:06:19 UTC (rev 1581) @@ -32,12 +32,11 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyRowModel; -import fr.ifremer.tutti.ui.swing.util.species.EnterMelagWeightDialog; +import fr.ifremer.tutti.ui.swing.util.species.EnterMelagWeightUI; import jaxx.runtime.SwingUtil; import org.apache.commons.lang3.StringUtils; import javax.swing.JOptionPane; -import java.awt.Frame; import java.util.Map; import static org.nuiton.i18n.I18n.t; @@ -138,19 +137,8 @@ } protected Float openMelagWeightDialog() { - Frame frame = handler.getParentContainer(Frame.class); - - EnterMelagWeightDialog dialog = new EnterMelagWeightDialog( - frame, getConfig().getShortcutClosePopup()); - dialog.setWeightUnit(weightUnit); - SwingUtil.center(frame, dialog); - dialog.pack(); - dialog.setVisible(true); - - Float result = null; - if (dialog.getEditor().getModel() != null) { - result = dialog.getEditor().getModel().floatValue(); - } + EnterMelagWeightUI dialog = new EnterMelagWeightUI(getContext()); + Float result = dialog.openAndGetWeightValue(weightUnit); return result; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java 2014-02-07 15:57:24 UTC (rev 1580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java 2014-02-08 15:06:19 UTC (rev 1581) @@ -32,12 +32,11 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyRowModel; -import fr.ifremer.tutti.ui.swing.util.species.EnterMelagWeightDialog; +import fr.ifremer.tutti.ui.swing.util.species.EnterMelagWeightUI; import jaxx.runtime.SwingUtil; import org.apache.commons.lang3.StringUtils; import javax.swing.JOptionPane; -import java.awt.Frame; import java.util.Map; import static org.nuiton.i18n.I18n.t; @@ -138,21 +137,8 @@ } protected Float openMelagWeightDialog() { - Frame frame = handler.getParentContainer(Frame.class); - - EnterMelagWeightDialog dialog = new EnterMelagWeightDialog( - frame, getConfig().getShortcutClosePopup()); - - dialog.setWeightUnit(weightUnit); - - SwingUtil.center(frame, dialog); - dialog.pack(); - dialog.setVisible(true); - - Float result = null; - if (dialog.getEditor().getModel() != null) { - result = dialog.getEditor().getModel().floatValue(); - } + EnterMelagWeightUI dialog = new EnterMelagWeightUI(getContext()); + Float result = dialog.openAndGetWeightValue(weightUnit); return result; } Deleted: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightDialog.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightDialog.css 2014-02-07 15:57:24 UTC (rev 1580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightDialog.css 2014-02-08 15:06:19 UTC (rev 1581) @@ -1,53 +0,0 @@ -/* - * #%L - * Tutti :: UI - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2012 - 2013 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% - */ - -#dialog { - title: {t("tutti.createSpeciesMelag.title", weightUnit.getShortLabel())}; -} - -#message { - text: {t("tutti.createSpeciesMelag.message", weightUnit.getShortLabel())}; - horizontalAlignment: {JLabel.CENTER}; -} - -#editor { - useFloat: true; - useSign: false; - autoPopup: true; - showPopupButton: true; - showReset: true; -} - -#cancelButton { - text: "tutti.createSpeciesMelag.action.cancel"; - toolTipText: "tutti.createSpeciesMelag.action.cancel.tip"; - i18nMnemonic: "tutti.createSpeciesMelag.action.cancel.mnemonic"; -} - -#validateButton { - text: "tutti.createSpeciesMelag.action.validate"; - toolTipText: "tutti.createSpeciesMelag.action.validate.tip"; - i18nMnemonic: "tutti.createSpeciesMelag.action.validate.mnemonic"; - enabled: { editor.getModel() != null }; -} \ No newline at end of file Deleted: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightDialog.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightDialog.jaxx 2014-02-07 15:57:24 UTC (rev 1580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightDialog.jaxx 2014-02-08 15:06:19 UTC (rev 1581) @@ -1,77 +0,0 @@ - -<JDialog id='dialog' layout='{new BorderLayout()}'> - <import> - fr.ifremer.tutti.type.WeightUnit; - - java.awt.Component; - java.awt.event.WindowAdapter; - java.awt.event.WindowEvent; - javax.swing.JComponent - javax.swing.JRootPane; - javax.swing.KeyStroke; - jaxx.runtime.swing.editor.NumberEditor - </import> - - <script><![CDATA[ - -public EnterMelagWeightDialog(Frame frame, KeyStroke shortcutClosePopup) { - super(frame, true); - - // add a auto-close action - rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put( - shortcutClosePopup, "close"); - - addWindowListener(new WindowAdapter() { - - @Override - public void windowClosed(WindowEvent e) { - Component ui = (Component) e.getSource(); - JAXXUtil.destroy(ui); - } - }); -} - - ]]></script> - - <WeightUnit id='weightUnit' javaBean='WeightUnit.KG'/> - - <Table id='table' fill='both' constraints='BorderLayout.CENTER'> - <row> - <cell insets='10, 10, 5, 10'> - <JLabel id='message'/> - </cell> - </row> - <row> - <cell insets='5, 10, 10, 10'> - <NumberEditor id='editor'/> - </cell> - </row> - </Table> - <JPanel layout='{new GridLayout(1,0)}' constraints='BorderLayout.SOUTH'> - <JButton id='cancelButton' - onActionPerformed='editor.setModel(null); dispose();'/> - <JButton id='validateButton' onActionPerformed='dispose();'/> - </JPanel> -</JDialog> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.css (from rev 1572, trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightDialog.css) =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.css (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.css 2014-02-08 15:06:19 UTC (rev 1581) @@ -0,0 +1,57 @@ +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 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% + */ + +#dialog { + title: {handler.getTile(getWeightUnit())}; +} + +#message { + text: {handler.getMessage(getWeightUnit())}; + horizontalAlignment: {JLabel.CENTER}; +} + +#editor { + modelType: {Float.class}; + useFloat: true; + useSign: false; + autoPopup: false; + showPopupButton: true; + showReset: true; + numberPattern: {getWeightUnit().getNumberEditorPattern()}; +} + +#cancelButton { + actionIcon: cancel; + text: "tutti.createSpeciesMelag.action.cancel"; + toolTipText: "tutti.createSpeciesMelag.action.cancel.tip"; + i18nMnemonic: "tutti.createSpeciesMelag.action.cancel.mnemonic"; +} + +#validateButton { + actionIcon: accept; + text: "tutti.createSpeciesMelag.action.validate"; + toolTipText: "tutti.createSpeciesMelag.action.validate.tip"; + i18nMnemonic: "tutti.createSpeciesMelag.action.validate.mnemonic"; + enabled: { editor.getModel() != null }; +} \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.jaxx (from rev 1572, trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightDialog.jaxx) =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.jaxx (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.jaxx 2014-02-08 15:06:19 UTC (rev 1581) @@ -0,0 +1,68 @@ + +<JDialog id='dialog' layout='{new BorderLayout()}' + implements='fr.ifremer.tutti.ui.swing.util.TuttiUI<TuttiUIContext, EnterMelagWeightUIHandler>'> + <import> + fr.ifremer.tutti.type.WeightUnit; + fr.ifremer.tutti.ui.swing.TuttiUIContext + fr.ifremer.tutti.ui.swing.util.TuttiUIUtil + + jaxx.runtime.swing.editor.NumberEditor + </import> + + <script><![CDATA[ + +public EnterMelagWeightUI(TuttiUIContext context) { + super(context.getMainUI()); + TuttiUIUtil.setApplicationContext(this, context); +} + +public Float openAndGetWeightValue(WeightUnit weightUnit) { + return handler.openAndGetWeightValue(weightUnit); +} + + ]]></script> + + <TuttiUIContext id='model' initializer='getContextValue(TuttiUIContext.class)'/> + + <WeightUnit id='weightUnit' javaBean='WeightUnit.KG'/> + + <Table id='table' fill='both' constraints='BorderLayout.CENTER'> + <row> + <cell insets='10, 10, 5, 10'> + <JLabel id='message'/> + </cell> + </row> + <row> + <cell insets='5, 10, 10, 10'> + <NumberEditor id='editor'/> + </cell> + </row> + </Table> + <JPanel layout='{new GridLayout(1,0)}' constraints='BorderLayout.SOUTH'> + <JButton id='cancelButton' + onActionPerformed='editor.setModel(null); dispose();'/> + <JButton id='validateButton' onActionPerformed='dispose();'/> + </JPanel> +</JDialog> \ No newline at end of file Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUIHandler.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUIHandler.java 2014-02-08 15:06:19 UTC (rev 1581) @@ -0,0 +1,98 @@ +package fr.ifremer.tutti.ui.swing.util.species; + +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * 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.type.WeightUnit; +import fr.ifremer.tutti.ui.swing.TuttiUIContext; +import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; +import jaxx.runtime.JAXXUtil; +import jaxx.runtime.SwingUtil; +import jaxx.runtime.validator.swing.SwingValidator; + +import javax.swing.JComponent; +import java.awt.Component; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; + +import static org.nuiton.i18n.I18n.t; + +/** + * Created on 2/8/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 3.2 + */ +public class EnterMelagWeightUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, EnterMelagWeightUI> { + + @Override + public void onCloseUI() { + } + + @Override + public SwingValidator<TuttiUIContext> getValidator() { + return null; + } + + @Override + protected JComponent getComponentToFocus() { + return null; + } + + @Override + public void afterInit(EnterMelagWeightUI ui) { + + // add a auto-close action + ui.getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put( + getConfig().getShortcutClosePopup(), "close"); + + ui.addWindowListener(new WindowAdapter() { + + @Override + public void windowClosed(WindowEvent e) { + Component ui = (Component) e.getSource(); + JAXXUtil.destroy(ui); + } + }); + initUI(ui); + + + } + + protected Float openAndGetWeightValue(WeightUnit weightUnit) { + ui.setWeightUnit(weightUnit); + SwingUtil.center(getTopestUI(), ui); + ui.pack(); + ui.getEditor().requestFocusInWindow(); + ui.setVisible(true); + return ui.getEditor().getModel() == null ? null : ui.getEditor().getModel().floatValue(); + } + protected String getTile(WeightUnit weightUnit) { + return t("tutti.createSpeciesMelag.title", weightUnit.getShortLabel()); + } + + protected String getMessage(WeightUnit weightUnit) { + return t("tutti.createSpeciesMelag.message", weightUnit.getShortLabel()); + } +} Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUIHandler.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r1580 - trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches
by tchemit＠users.forge.codelutin.com Feb. 7, 2014

Feb. 7, 2014

Author: tchemit Date: 2014-02-07 16:57:24 +0100 (Fri, 07 Feb 2014) New Revision: 1580 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1580 Log: fix NPE Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java 2014-02-07 15:55:06 UTC (rev 1579) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java 2014-02-07 15:57:24 UTC (rev 1580) @@ -483,7 +483,8 @@ Float sampleCategoryWeight = batch.getSampleCategoryWeight(); Float parentSampleCategoryWeight = parentBatch.getSampleCategoryWeight(); - if (sampleCategoryWeight != null && TuttiEntities.isEqualWeight(parentSampleCategoryWeight, sampleCategoryWeight)) { + if (sampleCategoryWeight != null && parentSampleCategoryWeight != null && + TuttiEntities.isEqualWeight(parentSampleCategoryWeight, sampleCategoryWeight)) { result = t("tutti.service.operations.cleanWeights.error.redundant.sampleCategoryWeight", weightUnit.fromEntity(sampleCategoryWeight),

1 0

r1579 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util
by tchemit＠users.forge.codelutin.com Feb. 7, 2014

Feb. 7, 2014

Author: tchemit Date: 2014-02-07 16:55:06 +0100 (Fri, 07 Feb 2014) New Revision: 1579 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1579 Log: fixes #4374: [CAPTURE] les unit?\195?\169s ont disparu dans l'onglet r?\195?\169sum?\195?\169 Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2014-02-07 15:31:18 UTC (rev 1578) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2014-02-07 15:55:06 UTC (rev 1579) @@ -27,7 +27,9 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Sets; import fr.ifremer.tutti.type.WeightUnit; +import fr.ifremer.tutti.ui.swing.util.computable.ComputableDataEditor; import jaxx.runtime.swing.JAXXWidgetUtil; +import jaxx.runtime.swing.editor.NumberEditor; import jaxx.runtime.swing.editor.cell.NumberCellEditor; import org.jdesktop.swingx.table.TableColumnExt; import org.nuiton.jaxx.application.swing.AbstractApplicationUIHandler; @@ -58,6 +60,7 @@ import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.nuiton.validator.bean.simple.SimpleBeanValidator; +import javax.swing.JLabel; import javax.swing.JTable; import javax.swing.JTextField; import javax.swing.border.LineBorder; @@ -298,6 +301,32 @@ component.init(); } + protected void initLabel(JLabel jLabel) { + + WeightUnit weightUnit = (WeightUnit) jLabel.getClientProperty("addWeightUnit"); + if (weightUnit != null) { + String text = weightUnit.decorateLabel(jLabel.getText()); + jLabel.setText(text); + + String tip = weightUnit.decorateTip(jLabel.getToolTipText()); + jLabel.setToolTipText(tip); + + Component labelFor = jLabel.getLabelFor(); + if (labelFor instanceof ComputableDataEditor) { + + // set also the number of digits (4 for kg, 1 for g) + ComputableDataEditor editor = (ComputableDataEditor) labelFor; + editor.setNumberPattern(weightUnit.getNumberEditorPattern()); + editor.setDecimalNumber(weightUnit.getNumberDigits()); + } else if (labelFor instanceof NumberEditor) { + + // set also the number of digits (4 for kg, 1 for g) + NumberEditor editor = (NumberEditor) labelFor; + editor.setNumberPattern(weightUnit.getNumberEditorPattern()); + } + } + } + //------------------------------------------------------------------------// //-- Internal methods --// //------------------------------------------------------------------------//

1 0

r1578 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities tutti-service/src/main/java/fr/ifremer/tutti/service/catches
by tchemit＠users.forge.codelutin.com Feb. 7, 2014

Feb. 7, 2014

Author: tchemit Date: 2014-02-07 16:31:18 +0100 (Fri, 07 Feb 2014) New Revision: 1578 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1578 Log: fixes #4360: [CAPTURE] probl?\195?\168me ?\195?\169l?\195?\169vation des poids Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java 2014-02-07 13:43:12 UTC (rev 1577) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java 2014-02-07 15:31:18 UTC (rev 1578) @@ -32,7 +32,6 @@ import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; import com.google.common.collect.Sets; -import org.nuiton.jaxx.application.ApplicationDataUtil; import fr.ifremer.tutti.persistence.entities.data.SpeciesAbleBatch; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; @@ -43,6 +42,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.cfg.Environment; +import org.nuiton.jaxx.application.ApplicationDataUtil; import java.io.File; import java.math.BigDecimal; @@ -513,4 +513,47 @@ float result = sumB.abs(MATH_CONTEXT_4_DIGIT).floatValue(); return result; } + + /** + * Compare two weights with rounding them to kilograms. + * + * @param v0 first weight to compare + * @param v1 second weight to compare + * @return 1 if v0 > v1, -1 if v0 < v1, 0 if v0 == v1 + */ + public static int compareWeights(float v0, float v1) { + v0 = roundKiloGram(v0); + v1 = roundKiloGram(v1); + float delta = v0 - v1; + int result; + if (delta > 0.00001) { + // v0 > v1 + result = 1; + } else if (delta < -0.0001f) { + // v0 < v1 + result = -1; + } else { + // v0 == v1 + result = 0; + } + return result; + } + + public static boolean isSmallerWeight(float v0, float v1) { + return compareWeights(v0, v1) < 0; + } + + public static boolean isGreaterWeight(float v0, float v1) { + return compareWeights(v0, v1) > 0; + } + + public static boolean isEqualWeight(float v0, float v1) { + return compareWeights(v0, v1) == 0; + } + + public static boolean isNotEqualWeight(float v0, float v1) { + return compareWeights(v0, v1) != 0; + } } + + Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java 2014-02-07 13:43:12 UTC (rev 1577) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java 2014-02-07 15:31:18 UTC (rev 1578) @@ -30,7 +30,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; -import fr.ifremer.tutti.type.WeightUnit; +import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; import fr.ifremer.tutti.persistence.entities.data.BenthosBatchFrequency; @@ -46,7 +46,7 @@ import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiServiceContext; -import org.apache.commons.lang3.ObjectUtils; +import fr.ifremer.tutti.type.WeightUnit; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -483,13 +483,13 @@ Float sampleCategoryWeight = batch.getSampleCategoryWeight(); Float parentSampleCategoryWeight = parentBatch.getSampleCategoryWeight(); - if (sampleCategoryWeight != null && ObjectUtils.equals(parentSampleCategoryWeight, sampleCategoryWeight)) { + if (sampleCategoryWeight != null && TuttiEntities.isEqualWeight(parentSampleCategoryWeight, sampleCategoryWeight)) { result = t("tutti.service.operations.cleanWeights.error.redundant.sampleCategoryWeight", - weightUnit.fromEntity(sampleCategoryWeight), - weightUnit.getShortLabel(), - getCategoryLabel(batch), - getCategoryLabel(parentBatch) + weightUnit.fromEntity(sampleCategoryWeight), + weightUnit.getShortLabel(), + getCategoryLabel(batch), + getCategoryLabel(parentBatch) ); } @@ -514,11 +514,11 @@ Float frequenciesWeigth = persistenceService.countFrequenciesWeight(frequencies, true); - if (ObjectUtils.equals(weight, frequenciesWeigth)) { + if (TuttiEntities.isEqualWeight(weight, frequenciesWeigth)) { result = t("tutti.service.operations.cleanWeights.error.redundant.frequencyWeight", - weightUnit.fromEntity(weight), - weightUnit.getShortLabel(), - getCategoryLabel(batch)); + weightUnit.fromEntity(weight), + weightUnit.getShortLabel(), + getCategoryLabel(batch)); } } @@ -535,12 +535,12 @@ // on a leaf, check if weight is not = to the finest category weight Float weight = batch.getWeight(); Float sampleCategoryWeight = batch.getSampleCategoryWeight(); - if (weight != null && ObjectUtils.equals(weight, sampleCategoryWeight)) { + if (weight != null && TuttiEntities.isEqualWeight(weight, sampleCategoryWeight)) { result = t("tutti.service.operations.cleanWeights.error.redundant.weight", - weightUnit.fromEntity(weight), - weightUnit.getShortLabel(), - getCategoryLabel(batch)); + weightUnit.fromEntity(weight), + weightUnit.getShortLabel(), + getCategoryLabel(batch)); } return result; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java 2014-02-07 13:43:12 UTC (rev 1577) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java 2014-02-07 15:31:18 UTC (rev 1578) @@ -26,7 +26,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import org.nuiton.jaxx.application.ApplicationBusinessException; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; @@ -47,6 +46,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.application.ApplicationBusinessException; import org.nuiton.validator.NuitonValidatorResult; import java.util.List; @@ -433,7 +433,7 @@ if (categoryWeight == null) { batch.setSampleCategoryComputedWeight(TuttiEntities.roundKiloGram(sum)); - } else if (categoryWeight < sum) { + } else if (TuttiEntities.isSmallerWeight(categoryWeight, sum)) { String categoryLabel = getCategoryLabel(batch.getSampleCategoryId()); throw new TuttiWeightComputingException( t("tutti.service.operations.computeWeights.error.species.incoherentParentCategoryWeight", @@ -479,7 +479,7 @@ // throw new TuttiBusinessException(t("tutti.service.operations.computeWeights.error.incoherentRowWeightCategory")); } else if (rowWeight != null && frequencyWeight != null - && !rowWeight.equals(frequencyWeight)) { + && TuttiEntities.isNotEqualWeight(rowWeight, frequencyWeight)) { String categoryLabel = getCategoryLabel(batch.getSampleCategoryId()); @@ -500,11 +500,11 @@ result = frequencyWeight; } else if (frequencyWeight != null - && !frequencyWeight.equals(categoryWeight)) { + && TuttiEntities.isNotEqualWeight(frequencyWeight, categoryWeight)) { // if the weight of the frequencies is different from the category // weight, then set the weight of the sample - if (frequencyWeight > categoryWeight) { + if (TuttiEntities.isGreaterWeight(frequencyWeight, categoryWeight)) { String categoryLabel = getCategoryLabel(batch.getSampleCategoryId()); @@ -620,7 +620,7 @@ if (categoryWeight == null) { batch.setSampleCategoryComputedWeight(TuttiEntities.roundKiloGram(sum)); - } else if (categoryWeight < sum) { + } else if (TuttiEntities.isSmallerWeight(categoryWeight, sum)) { String categoryLabel = getCategoryLabel(batch.getSampleCategoryId()); @@ -669,7 +669,7 @@ // throw new TuttiBusinessException(t("tutti.service.operations.computeWeights.error.incoherentRowWeightCategory")); } else if (rowWeight != null && frequencyWeight != null - && !rowWeight.equals(frequencyWeight)) { + && TuttiEntities.isNotEqualWeight(rowWeight, frequencyWeight)) { String categoryLabel = getCategoryLabel(batch.getSampleCategoryId()); @@ -691,11 +691,11 @@ result = frequencyWeight; } else if (frequencyWeight != null - && !frequencyWeight.equals(categoryWeight)) { + && TuttiEntities.isNotEqualWeight(frequencyWeight, categoryWeight)) { // if the weight of the frequencies is different from the category // weight, then set the weight of the sample - if (frequencyWeight > categoryWeight) { + if (TuttiEntities.isGreaterWeight(frequencyWeight, categoryWeight)) { String categoryLabel = getCategoryLabel(batch.getSampleCategoryId());

1 0

r1577 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species
by tchemit＠users.forge.codelutin.com Feb. 7, 2014

Feb. 7, 2014

Author: tchemit Date: 2014-02-07 14:43:12 +0100 (Fri, 07 Feb 2014) New Revision: 1577 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1577 Log: fixes #4363: [CAPTURE] case ?\195?\160 confirmer d?\195?\169cocher si ?\195?\169l?\195?\169vation des poids Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2014-02-07 11:21:54 UTC (rev 1576) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2014-02-07 13:43:12 UTC (rev 1577) @@ -1572,7 +1572,11 @@ // copy back parent data (mainly other sample categories) newRow.setSpecies(parentRow.getSpecies()); - newRow.setSpeciesToConfirm(parentRow.isSpeciesToConfirm()); + if (parentRow.isSpeciesToConfirm()) { + + // only set parent speciesToConfirm only if true in parent + newRow.setSpeciesToConfirm(true); + } newRow.setParentBatch(parentRow); newRow.setSpecies(parentRow.getSpecies());

1 0

r1576 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation
by tchemit＠users.forge.codelutin.com Feb. 7, 2014

Feb. 7, 2014

Author: tchemit Date: 2014-02-07 12:21:54 +0100 (Fri, 07 Feb 2014) New Revision: 1576 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1576 Log: fixes #4373: [ERGO] agrandir la taille des boutons + et - pour ajouter ou supprimer un trait Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.jaxx Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css 2014-02-07 10:53:20 UTC (rev 1575) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css 2014-02-07 11:21:54 UTC (rev 1576) @@ -35,6 +35,7 @@ actionIcon: add; toolTipText: "tutti.fishingOperations.action.newFishingOperation.tip"; i18nMnemonic: "tutti.fishingOperations.action.newFishingOperation.mnemonic"; + preferredSize: {new Dimension(75,12)}; _applicationAction: {fr.ifremer.tutti.ui.swing.action.NewFishingOperationAction.class}; _help: {"tutti.fishingOperations.action.newFishingOperation.help"}; } @@ -44,6 +45,7 @@ enabled:{model.getSelectedFishingOperation() != null}; toolTipText: "tutti.fishingOperations.action.deleteFishingOperation.tip"; i18nMnemonic: "tutti.fishingOperations.action.deleteFishingOperation.mnemonic"; + preferredSize: {new Dimension(75,12)}; _applicationAction: {fr.ifremer.tutti.ui.swing.action.DeleteFishingOperationAction.class}; _help: {"tutti.fishingOperations.action.deleteFishingOperation.help"}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.jaxx 2014-02-07 10:53:20 UTC (rev 1575) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.jaxx 2014-02-07 11:21:54 UTC (rev 1576) @@ -37,6 +37,7 @@ jaxx.runtime.swing.editor.bean.BeanFilterableComboBox java.awt.GridLayout + java.awt.Dimension static org.nuiton.i18n.I18n.t </import>

1 0

r1575 - in trunk/tutti-service/src/main: java/fr/ifremer/tutti/service resources/fr/ifremer/tutti/persistence/entities/data resources/i18n
by tchemit＠users.forge.codelutin.com Feb. 7, 2014

Feb. 7, 2014

Author: tchemit Date: 2014-02-07 11:53:20 +0100 (Fri, 07 Feb 2014) New Revision: 1575 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1575 Log: fixes #4366: [TRAIT] Pas de contr?\195?\180le du num?\195?\169ro de poche Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-edit-fatal-validation.xml trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-fatal-validation.xml trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java 2014-02-06 17:34:03 UTC (rev 1574) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java 2014-02-07 10:53:20 UTC (rev 1575) @@ -870,6 +870,16 @@ return DateUtil.between(date, getCruise().getBeginDate(), getCruise().getEndDate()); } + public boolean isMutiRegNumberValid(String numberAsString) { + boolean result = false; + if (numberAsString.matches("\\d+")) { + int mutlirigNumber = Integer.valueOf(numberAsString); + Integer cruiseMultirigNumber = getCruise().getMultirigNumber(); + result = mutlirigNumber <= cruiseMultirigNumber; + } + return result; + } + public boolean isValidDuration(Date gearShootingStartDate, Date gearShootingEndDate) { boolean result = gearShootingStartDate == null || gearShootingEndDate == null; if (!result) { Modified: trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-edit-fatal-validation.xml =================================================================== --- trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-edit-fatal-validation.xml 2014-02-06 17:34:03 UTC (rev 1574) +++ trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-edit-fatal-validation.xml 2014-02-07 10:53:20 UTC (rev 1575) @@ -80,6 +80,12 @@ </message> </field-validator> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ isMutiRegNumberValid(multirigAggregation) ]]> + </param> + <message>tutti.validator.error.fishingOperation.trawlNetNumber.invalid##${cruise.multirigNumber}</message> + </field-validator> </field> <field name="gearShootingStartDate"> Modified: trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-fatal-validation.xml =================================================================== --- trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-fatal-validation.xml 2014-02-06 17:34:03 UTC (rev 1574) +++ trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-fatal-validation.xml 2014-02-07 10:53:20 UTC (rev 1575) @@ -79,6 +79,13 @@ </message> </field-validator> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ isMutiRegNumberValid(multirigAggregation) ]]> + </param> + <message>tutti.validator.error.fishingOperation.trawlNetNumber.invalid##${cruise.multirigNumber}</message> + </field-validator> + </field> <field name="gearShootingStartDate"> Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2014-02-06 17:34:03 UTC (rev 1574) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2014-02-07 10:53:20 UTC (rev 1575) @@ -214,6 +214,7 @@ tutti.validator.error.fishingOperation.strataLocation.required= tutti.validator.error.fishingOperation.trawlDistance.required= tutti.validator.error.fishingOperation.trawlDistance.tooLong= +tutti.validator.error.fishingOperation.trawlNetNumber.invalid= tutti.validator.error.fishingOperation.trawlNetNumber.required= tutti.validator.error.fishingOperation.vessel.required= tutti.validator.error.individualObservation.lengthStepCaracteristic.required= Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2014-02-06 17:34:03 UTC (rev 1574) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2014-02-07 10:53:20 UTC (rev 1575) @@ -213,6 +213,7 @@ tutti.validator.error.fishingOperation.strataLocation.required=La strate, sous-strate ou localité doit être renseignée tutti.validator.error.fishingOperation.trawlDistance.required=La distance est obligatoire tutti.validator.error.fishingOperation.trawlDistance.tooLong=La distance du trait dépasse 3 milles marin (5556 m), merci de vérifier les coordonnées +tutti.validator.error.fishingOperation.trawlNetNumber.invalid=Le numéro de poche doit être inférieur ou égal au nombre de poches déclarées dans la campagne (%s). tutti.validator.error.fishingOperation.trawlNetNumber.required=Le numéro de poche est obligatoire tutti.validator.error.fishingOperation.vessel.required=Le navire est obligatoire tutti.validator.error.individualObservation.lengthStepCaracteristic.required=La classe de taille est obligatoire

1 0