Tutti-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- 4058 discussions
r999 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home
by tchemit@users.forge.codelutin.com 23 May '13
by tchemit@users.forge.codelutin.com 23 May '13
23 May '13
Author: tchemit
Date: 2013-05-23 18:55:31 +0200 (Thu, 23 May 2013)
New Revision: 999
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/999
Log:
fixes #2503: [ERGO] etat du bouton ?\195?\169diter
Modified:
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-05-23 16:23:44 UTC (rev 998)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-05-23 16:55:31 UTC (rev 999)
@@ -43,7 +43,9 @@
import javax.swing.JComboBox;
import javax.swing.JComponent;
import java.awt.event.ActionEvent;
+import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.List;
@@ -62,6 +64,14 @@
protected final PersistenceService persistenceService;
+ public static final MouseListener GRAB_FOCUS_ON_ENTER_LISTENER = new MouseAdapter() {
+ @Override
+ public void mouseEntered(MouseEvent e) {
+ JComponent source = (JComponent) e.getSource();
+ source.grabFocus();
+ }
+ };
+
public SelectCruiseUIHandler(TuttiUI<?, ?> parentUI, SelectCruiseUI ui) {
super(parentUI.getHandler().getContext(), ui);
persistenceService = context.getPersistenceService();
@@ -164,10 +174,10 @@
Lists.newArrayList(model.getProtocols()),
model.getProtocol());
- ui.getEditCruiseComboBox().putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE);
- ui.getEditProgramComboBox().putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE);
- ui.getEditProtocolComboBox().putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE);
- ui.getNewProtocolComboBox().putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE);
+ initActionComboBox(ui.getEditProgramComboBox());
+ initActionComboBox(ui.getEditCruiseComboBox());
+ initActionComboBox(ui.getEditProtocolComboBox());
+ initActionComboBox(ui.getNewProtocolComboBox());
model.addPropertyChangeListener(SelectCruiseUIModel.PROPERTY_PROTOCOLS, new PropertyChangeListener() {
@Override
@@ -250,10 +260,21 @@
protected boolean resetEditProtocolAction;
+ protected boolean resetNewProtocolAction;
+
protected boolean resetEditProgramAction;
protected boolean resetEditCruiseAction;
+ public void resetNewProtolAction() {
+ resetNewProtocolAction = true;
+ try {
+ ui.getNewProtocolComboBox().setSelectedIndex(0);
+ } finally {
+ resetNewProtocolAction = false;
+ }
+ }
+
public void resetEditProtolAction() {
resetEditProtocolAction = true;
try {
@@ -295,80 +316,34 @@
public void startEditProgramAction(MouseEvent event) {
startComboFirstAction(event);
-// JComboBox existingProgramCombo = (JComboBox) event.getSource();
-// TuttiActionHelper.runAction((AbstractButton) existingProgramCombo.getItemAt(0));
}
public void startEditProgramAction(ActionEvent event) {
startEditAction(!resetEditProgramAction, event);
-// JComboBox existingProgramCombo = (JComboBox) event.getSource();
-// JButton selectedAction = (JButton) existingProgramCombo.getSelectedItem();
-// // hide popup before performing the action, otherwise, if the action
-// // opens a popup, the user must click a first time to hide the combobox
-// // popup to then interact with the popup opened by the action
-// // (see http://forge.codelutin.com/issues/2032)
-// existingProgramCombo.setSelectedIndex(0);
-// existingProgramCombo.hidePopup();
-// TuttiActionHelper.runAction(selectedAction);
}
public void startEditCruiseAction(MouseEvent event) {
startComboFirstAction(event);
-// JComboBox existingCruiseCombo = (JComboBox) event.getSource();
-// TuttiActionHelper.runAction((AbstractButton) existingCruiseCombo.getItemAt(0));
}
public void startEditCruiseAction(ActionEvent event) {
startEditAction(!resetEditCruiseAction, event);
-// JComboBox existingCruiseCombo = (JComboBox) event.getSource();
-// JButton selectedAction = (JButton) existingCruiseCombo.getSelectedItem();
-// // hide popup before performing the action, otherwise, if the action
-// // opens a popup, the user must click a first time to hide the combobox
-// // popup to then interact with the popup opened by the action
-// // (see http://forge.codelutin.com/issues/2032)
-// existingCruiseCombo.setSelectedIndex(0);
-// existingCruiseCombo.hidePopup();
-// TuttiActionHelper.runAction(selectedAction);
}
public void startExistingProtocolAction(MouseEvent event) {
startComboFirstAction(event);
-// JComboBox existingProtocolCombo = (JComboBox) event.getSource();
-// TuttiActionHelper.runAction((AbstractButton) existingProtocolCombo.getItemAt(0));
}
public void startExistingProtocolAction(ActionEvent event) {
startEditAction(!resetEditProtocolAction, event);
-// if (!resetEditProtocolAction) {
-// JComboBox existingProtocolCombo = (JComboBox) event.getSource();
-// JButton selectedAction = (JButton) existingProtocolCombo.getSelectedItem();
-// // hide popup before performing the action, otherwise, if the action
-// // opens a popup, the user must click a first time to hide the combobox
-// // popup to then interact with the popup opened by the action
-// // (see http://forge.codelutin.com/issues/2032)
-// existingProtocolCombo.setSelectedIndex(0);
-// existingProtocolCombo.hidePopup();
-// TuttiActionHelper.runAction(selectedAction);
-// }
}
public void startNewProtocolAction(MouseEvent event) {
startComboFirstAction(event);
-// JComboBox newProtocolCombo = (JComboBox) event.getSource();
-// TuttiActionHelper.runAction((AbstractButton) newProtocolCombo.getItemAt(0));
}
public void startNewProtocolAction(ActionEvent event) {
- startEditAction(true, event);
-// JComboBox newProtocolCombo = (JComboBox) event.getSource();
-// JButton selectedAction = (JButton) newProtocolCombo.getSelectedItem();
-// // hide popup before performing the action, otherwise, if the action
-// // opens a popup, the user must click a first time to hide the combobox
-// // popup to then interact with the popup opened by the action
-// // (see http://forge.codelutin.com/issues/2032)
-// newProtocolCombo.setSelectedIndex(0);
-// newProtocolCombo.hidePopup();
-// TuttiActionHelper.runAction(selectedAction);
+ startEditAction(!resetNewProtocolAction, event);
}
protected void startComboFirstAction(MouseEvent event) {
@@ -389,4 +364,9 @@
TuttiActionHelper.runAction(selectedAction);
}
}
+
+ protected void initActionComboBox(JComboBox combo) {
+ combo.putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE);
+ combo.addMouseListener(GRAB_FOCUS_ON_ENTER_LISTENER);
+ }
}
1
0
r998 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing java/fr/ifremer/tutti/ui/swing/content java/fr/ifremer/tutti/ui/swing/util java/fr/ifremer/tutti/ui/swing/util/attachment resources/i18n
by tchemit@users.forge.codelutin.com 23 May '13
by tchemit@users.forge.codelutin.com 23 May '13
23 May '13
Author: tchemit
Date: 2013-05-23 18:23:44 +0200 (Thu, 23 May 2013)
New Revision: 998
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/998
Log:
fixes #2492: [TECH] Message en cas de mise ?\195?\160 jour de l'appli indisponible
Modified:
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateApplicationAction.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateDbAction.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiErrorHelper.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.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/RunTutti.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java 2013-05-23 15:26:38 UTC (rev 997)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java 2013-05-23 16:23:44 UTC (rev 998)
@@ -109,7 +109,7 @@
n_("tutti.error.update.could.not.reach.url")
);
} catch (TuttiBusinessException e) {
- TuttiUIContext.getErrorHelper().showErrorDialog(e.getMessage());
+ TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage());
canUpdate = false;
}
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java 2013-05-23 15:26:38 UTC (rev 997)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java 2013-05-23 16:23:44 UTC (rev 998)
@@ -31,7 +31,6 @@
import fr.ifremer.tutti.ui.swing.TuttiApplicationUpdaterCallBack;
import fr.ifremer.tutti.ui.swing.TuttiUIContext;
import fr.ifremer.tutti.ui.swing.config.TuttiApplicationConfig;
-import fr.ifremer.tutti.ui.swing.util.TuttiErrorHelper;
import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil;
import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction;
import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper;
@@ -86,7 +85,7 @@
n_("tutti.error.about.could.not.reach.url"));
canUpdate = true;
} catch (TuttiBusinessException e) {
- new TuttiErrorHelper(getContext()).showErrorDialog(e.getMessage());
+ TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage());
canUpdate = false;
}
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateApplicationAction.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateApplicationAction.java 2013-05-23 15:26:38 UTC (rev 997)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateApplicationAction.java 2013-05-23 16:23:44 UTC (rev 998)
@@ -30,7 +30,6 @@
import fr.ifremer.tutti.ui.swing.TuttiApplicationUpdaterCallBack;
import fr.ifremer.tutti.ui.swing.TuttiUIContext;
import fr.ifremer.tutti.ui.swing.config.TuttiApplicationConfig;
-import fr.ifremer.tutti.ui.swing.util.TuttiErrorHelper;
import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil;
import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction;
import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper;
@@ -84,7 +83,7 @@
n_("tutti.error.update.could.not.reach.url")
);
} catch (TuttiBusinessException e) {
- new TuttiErrorHelper(getContext()).showErrorDialog(e.getMessage());
+ TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage());
return false;
}
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateDbAction.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateDbAction.java 2013-05-23 15:26:38 UTC (rev 997)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateDbAction.java 2013-05-23 16:23:44 UTC (rev 998)
@@ -30,7 +30,6 @@
import fr.ifremer.tutti.ui.swing.TuttiUIContext;
import fr.ifremer.tutti.ui.swing.config.TuttiApplicationConfig;
import fr.ifremer.tutti.ui.swing.content.db.OpenDbAction;
-import fr.ifremer.tutti.ui.swing.util.TuttiErrorHelper;
import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil;
import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper;
import org.apache.commons.logging.Log;
@@ -71,7 +70,7 @@
n_("tutti.error.update.could.not.reach.url")
);
} catch (TuttiBusinessException e) {
- new TuttiErrorHelper(getContext()).showErrorDialog(e.getMessage());
+ TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage());
return false;
}
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiErrorHelper.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiErrorHelper.java 2013-05-23 15:26:38 UTC (rev 997)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiErrorHelper.java 2013-05-23 16:23:44 UTC (rev 998)
@@ -92,4 +92,17 @@
showErrorDialog(errorInfo.getBasicErrorMessage(), errorInfo.getErrorException());
}
+ /**
+ * Display a user friendly warning frame.
+ *
+ * @param message message for user
+ */
+ public void showWarningDialog(String message) {
+
+ JOptionPane.showMessageDialog(context.getMainUI(), "<html><body>"+message+"</body></html>",
+ _("tutti.error.ui.business.warning"),
+ JOptionPane.WARNING_MESSAGE);
+
+ }
+
}
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java 2013-05-23 15:26:38 UTC (rev 997)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java 2013-05-23 16:23:44 UTC (rev 998)
@@ -267,7 +267,7 @@
desktop.browse(file.toURI());
} catch (IOException e) {
- TuttiUIContext.getErrorHelper().showErrorDialog(_("swing.error.cannot.open.file"), null);
+ TuttiUIContext.getErrorHelper().showErrorDialog(_("swing.error.cannot.open.file"));
}
}
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 2013-05-23 15:26:38 UTC (rev 997)
+++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-05-23 16:23:44 UTC (rev 998)
@@ -963,6 +963,7 @@
tutti.error.about.could.not.reach.url=
tutti.error.errorpane.htmlmessage=
tutti.error.ui.business.error=
+tutti.error.ui.business.warning=
tutti.error.ui.other.error=
tutti.error.update.could.not.reach.url=
tutti.exportCruise.action.success=
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 2013-05-23 15:26:38 UTC (rev 997)
+++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-23 16:23:44 UTC (rev 998)
@@ -927,6 +927,7 @@
tutti.error.about.could.not.reach.url=Récupération des versions de mises à jour impossible (l'url <strong>%s</strong> n'est pas joignable)
tutti.error.errorpane.htmlmessage=<html><body><b>Une erreur s'est produite</b>\:<br/>%s</body></html>
tutti.error.ui.business.error=Erreur
+tutti.error.ui.business.warning=Avertissement
tutti.error.ui.other.error=Erreur
tutti.error.update.could.not.reach.url=Mise à jour impossible (l'url <strong>%s</strong> n'est pas joignable)
tutti.exportCruise.action.success=La campagne <strong>%s</strong> a été exportée dans le fichier <strong>%s</strong>.
1
0
r997 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation: . catches/species
by kmorin@users.forge.codelutin.com 23 May '13
by kmorin@users.forge.codelutin.com 23 May '13
23 May '13
Author: kmorin
Date: 2013-05-23 17:26:38 +0200 (Thu, 23 May 2013)
New Revision: 997
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/997
Log:
fixes #2494 [CAPTURE] Message d'erreur lors de recherche sur la capture
refs #2489 [IMPORT PUPITRI] lien ?\195?\160 mettre sur un autre onglet
Modified:
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriAction.java
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-05-23 14:12:16 UTC (rev 996)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-05-23 15:26:38 UTC (rev 997)
@@ -29,12 +29,14 @@
import fr.ifremer.tutti.persistence.entities.data.FishingOperation;
import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol;
import fr.ifremer.tutti.service.PersistenceService;
+import fr.ifremer.tutti.ui.swing.TuttiUIContext;
import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel;
import fr.ifremer.tutti.ui.swing.util.AbstractTuttiTabContainerUIHandler;
import fr.ifremer.tutti.ui.swing.util.CloseableUI;
import fr.ifremer.tutti.ui.swing.util.TuttiUI;
import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper;
import jaxx.runtime.validator.swing.SwingValidator;
+import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -191,6 +193,18 @@
}
model.setSelectedFishingOperation(selectedOperation);
+
+ getContext().addPropertyChangeListener(TuttiUIContext.PROPERTY_HIDE_BODY, new PropertyChangeListener() {
+ @Override
+ public void propertyChange(PropertyChangeEvent evt) {
+ Boolean hideBody = (Boolean) evt.getNewValue();
+ if (hideBody != null && hideBody) {
+ if (getModel().getSelectedFishingOperation() == null) {
+ getUI().getFishingOperationComboBox().requestFocus();
+ }
+ }
+ }
+ });
}
@Override
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java 2013-05-23 14:12:16 UTC (rev 996)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java 2013-05-23 15:26:38 UTC (rev 997)
@@ -171,7 +171,8 @@
public void setSelectedFishingOperation(FishingOperation selectedFishingOperation) {
Object oldValue = getSelectedFishingOperation();
this.selectedFishingOperation = selectedFishingOperation;
- if (!isSelectionAdjusting()) {
+ if ((oldValue != null || selectedFishingOperation != null)
+ && !isSelectionAdjusting()) {
// only fires when authorize to
firePropertyChange(PROPERTY_SELECTED_FISHING_OPERATION, oldValue, selectedFishingOperation);
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriAction.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriAction.java 2013-05-23 14:12:16 UTC (rev 996)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriAction.java 2013-05-23 15:26:38 UTC (rev 997)
@@ -66,7 +66,7 @@
public EditFishingOperationAction getEditAction() {
if (editAction == null) {
- editAction = TuttiActionHelper.createLogicAction(getHandler().getParentUi().getHandler(),
+ editAction = TuttiActionHelper.createLogicAction(getHandler().getParentUi().getHandler().getParentHandler(),
EditFishingOperationAction.class);
}
return editAction;
1
0
r996 - in trunk/tutti-ui-swing/src/main: filtered-resources java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency java/fr/ifremer/tutti/ui/swing/content/operation/catches/species java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency resources/i18n
by tchemit@users.forge.codelutin.com 23 May '13
by tchemit@users.forge.codelutin.com 23 May '13
23 May '13
Author: tchemit
Date: 2013-05-23 16:12:16 +0200 (Thu, 23 May 2013)
New Revision: 996
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/996
Log:
fixes #2490: [ERGO] pas de raccourcis clavier pour acc?\195?\169der ?\195?\160 la saisie des mensurations
Modified:
trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties
trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx
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/SpeciesBatchUIModel.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.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/filtered-resources/tutti-help-en.properties
===================================================================
--- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-05-23 13:18:33 UTC (rev 995)
+++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-05-23 14:12:16 UTC (rev 996)
@@ -1,5 +1,5 @@
#Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo
-#Tue May 21 18:54:28 CEST 2013
+#Thu May 23 15:38:00 CEST 2013
tutti.config.help=config.html
tutti.createAccidentalBatch.action.cancel.help=createAccidentalBatch.html\#actions
tutti.createAccidentalBatch.action.save.help=createAccidentalBatch.html\#actions
@@ -47,14 +47,15 @@
tutti.dbManager.action.upgradeDb.help=dbManager.html\#actions
tutti.dbManager.help=dbManager.html
tutti.editAccidentalBatch.action.createBatch.help=editAccidentalBatch.html\#actions
-tutti.editAccidentalBatch.action.exportMultiPost.help=
-tutti.editAccidentalBatch.action.importMultiPost.help=
+tutti.editAccidentalBatch.action.exportMultiPost.help=editAccidentalBatch.html\#actions
+tutti.editAccidentalBatch.action.importMultiPost.help=editAccidentalBatch.html\#actions
tutti.editAccidentalBatch.action.removeBatch.help=editAccidentalBatch.html\#actions
tutti.editAccidentalBatch.help=editAccidentalBatch.html
tutti.editBenthosBatch.action.createBatch.help=editBenthosBatch.html\#actions
tutti.editBenthosBatch.action.createMelag.help=editBenthosBatch.html\#actions
-tutti.editBenthosBatch.action.exportMultiPost.help=
-tutti.editBenthosBatch.action.importMultiPost.help=
+tutti.editBenthosBatch.action.editFrequencies.help=editBenthosBatch.html\#actions
+tutti.editBenthosBatch.action.exportMultiPost.help=editBenthosBatch.html\#actions
+tutti.editBenthosBatch.action.importMultiPost.help=editBenthosBatch.html\#actions
tutti.editBenthosBatch.action.removeBatch.help=editBenthosBatch.html\#actions
tutti.editBenthosBatch.action.removeSubBatch.help=editBenthosBatch.html\#actions
tutti.editBenthosBatch.action.renameBatch.help=editBenthosBatch.html\#actions
@@ -86,12 +87,11 @@
tutti.editBenthosFrequencies.field.rafaleStep.help=editBenthosFrequencies.html\#fields
tutti.editBenthosFrequencies.field.simpleCounting.help=editBenthosFrequencies.html\#fields
tutti.editBenthosFrequencies.field.step.help=editBenthosFrequencies.html\#fields
-tutti.editBenthosFrequencies.field.totalNumber.help=
-tutti.editBenthosFrequencies.field.totalWeight.help=
+tutti.editBenthosFrequencies.field.totalNumber.help=editBenthosFrequencies.html\#fields
+tutti.editBenthosFrequencies.field.totalWeight.help=editBenthosFrequencies.html\#fields
tutti.editBenthosFrequencies.help=editBenthosFrequencies.html
tutti.editCatchBatch.action.cancelEditCatchBatch.help=editCatchBatch.html\#actions
tutti.editCatchBatch.action.computeWeights.help=editCatchBatch.html\#actions
-tutti.editSpeciesBatch.action.importPupitri.help=editSpeciesBatch.html\#actions
tutti.editCatchBatch.action.saveCatchBatch.help=editCatchBatch.html\#actions
tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.help=editCatchBatch.html\#fields
tutti.editCatchBatch.field.benthosTotalSortedWeight.help=editCatchBatch.html\#fields
@@ -103,7 +103,6 @@
tutti.editCatchBatch.field.catchTotalSortedWeight.help=editCatchBatch.html\#fields
tutti.editCatchBatch.field.catchTotalUnsortedWeight.help=editCatchBatch.html\#fields
tutti.editCatchBatch.field.catchTotalWeight.help=editCatchBatch.html\#fields
-tutti.editCatchBatch.field.macroWasteTotalWeight.help=
tutti.editCatchBatch.field.marineLitterTotalWeight.help=editCatchBatch.html\#fields
tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.help=editCatchBatch.html\#fields
tutti.editCatchBatch.field.speciesTotalSortedWeight.help=editCatchBatch.html\#fields
@@ -163,13 +162,13 @@
tutti.editFishingOperation.field.vessel.help=editFishingOperation.html\#fields
tutti.editFishingOperation.help=editFishingOperation.html
tutti.editIndividualObservationBatch.action.createBatch.help=editIndividualObservationBatch.html\#actions
-tutti.editIndividualObservationBatch.action.exportMultiPost.help=
-tutti.editIndividualObservationBatch.action.importMultiPost.help=
+tutti.editIndividualObservationBatch.action.exportMultiPost.help=editIndividualObservationBatch.html\#actions
+tutti.editIndividualObservationBatch.action.importMultiPost.help=editIndividualObservationBatch.html\#actions
tutti.editIndividualObservationBatch.action.removeBatch.help=editIndividualObservationBatch.html\#actions
tutti.editIndividualObservationBatch.help=editIndividualObservationBatch.html
tutti.editMarineLitterBatch.action.createBatch.help=editIndividualObservationBatch.html\#actions
-tutti.editMarineLitterBatch.action.exportMultiPost.help=
-tutti.editMarineLitterBatch.action.importMultiPost.help=
+tutti.editMarineLitterBatch.action.exportMultiPost.help=editIndividualObservationBatch.html\#actions
+tutti.editMarineLitterBatch.action.importMultiPost.help=editIndividualObservationBatch.html\#actions
tutti.editMarineLitterBatch.action.removeBatch.help=editIndividualObservationBatch.html\#actions
tutti.editMarineLitterBatch.field.marineLitterTotalWeight.help=editIndividualObservationBatch.html\#fields
tutti.editMarineLitterBatch.help=editMarineLitterBatch.html
@@ -207,8 +206,10 @@
tutti.editProtocol.pane.caracteristic.help=editProtocol.html\#fieldsCaracteristics
tutti.editSpeciesBatch.action.createBatch.help=editSpeciesBatch.html\#actions
tutti.editSpeciesBatch.action.createMelag.help=editSpeciesBatch.html\#actions
-tutti.editSpeciesBatch.action.exportMultiPost.help=
-tutti.editSpeciesBatch.action.importMultiPost.help=
+tutti.editSpeciesBatch.action.editFrequencies.help=editSpeciesBatch.html\#actions
+tutti.editSpeciesBatch.action.exportMultiPost.help=editSpeciesBatch.html\#actions
+tutti.editSpeciesBatch.action.importMultiPost.help=editSpeciesBatch.html\#actions
+tutti.editSpeciesBatch.action.importPupitri.help=editSpeciesBatch.html\#actions
tutti.editSpeciesBatch.action.removeBatch.help=editSpeciesBatch.html\#actions
tutti.editSpeciesBatch.action.removeSubBatch.help=editSpeciesBatch.html\#actions
tutti.editSpeciesBatch.action.renameBatch.help=editSpeciesBatch.html\#actions
@@ -234,17 +235,17 @@
tutti.editSpeciesFrequencies.field.rafaleStep.help=editSpeciesFrequencies.html\#fields
tutti.editSpeciesFrequencies.field.simpleCounting.help=editSpeciesFrequencies.html\#fields
tutti.editSpeciesFrequencies.field.step.help=editSpeciesFrequencies.html\#fields
-tutti.editSpeciesFrequencies.field.totalNumber.help=
-tutti.editSpeciesFrequencies.field.totalWeight.help=
+tutti.editSpeciesFrequencies.field.totalNumber.help=editSpeciesFrequencies.html\#fields
+tutti.editSpeciesFrequencies.field.totalWeight.help=editSpeciesFrequencies.html\#fields
tutti.editSpeciesFrequencies.help=editSpeciesFrequencies.html
-tutti.fishingOperations.action.deleteFishingOperation.help=
+tutti.fishingOperations.action.deleteFishingOperation.help=fishingOperations.html\#actions
tutti.fishingOperations.action.newFishingOperation.help=fishingOperations.html\#actions
tutti.fishingOperations.field.fishingOperation.help=fishingOperations.html\#fields
tutti.fishingOperations.help=fishingOperations.html
tutti.index.help=index.html
-tutti.main.action.changeLocale.help=
-tutti.main.action.changeLocaleFR.help=
-tutti.main.action.changeLocaleUK.help=
+tutti.main.action.changeLocale.help=index.html\#menu
+tutti.main.action.changeLocaleFR.help=index.html\#menu
+tutti.main.action.changeLocaleUK.help=index.html\#menu
tutti.main.action.showHelp.help=index.html\#menu
tutti.main.help=index.html
tutti.main.menu.action.about.help=index.html\#menu
@@ -279,9 +280,9 @@
tutti.selectCruise.action.editCruise.help=selectCruise.html\#actions
tutti.selectCruise.action.editProgram.help=selectCruise.html\#actions
tutti.selectCruise.action.editProtocol.help=selectCruise.html\#actions
-tutti.selectCruise.action.exportCruise.help=
-tutti.selectCruise.action.exportCruiseForSumatra.help=
-tutti.selectCruise.action.exportProgram.help=
+tutti.selectCruise.action.exportCruise.help=selectCruise.html\#actions
+tutti.selectCruise.action.exportCruiseForSumatra.help=selectCruise.html\#actions
+tutti.selectCruise.action.exportProgram.help=selectCruise.html\#actions
tutti.selectCruise.action.exportProtocol.help=selectCruise.html\#actions
tutti.selectCruise.action.importProtocol.help=selectCruise.html\#actions
tutti.selectCruise.action.newCruise.help=selectCruise.html\#actions
@@ -308,12 +309,7 @@
tutti.splitSpeciesBatch.field.sampleWeightField.help=splitSpeciesBatch.html\#fields
tutti.splitSpeciesBatch.field.speciesField.help=splitSpeciesBatch.html\#fields
tutti.splitSpeciesBatch.help=splitSpeciesBatch.html
-tutti.validateCruise.navigation.action.export.all.help=
-tutti.validateCruise.navigation.action.export.help=
-tutti.validateCruise.navigation.action.export.operation.help=
-tutti.validateCruise.navigation.action.refresh.all.help=
-tuttihelp.config.help=
-tuttihelp.editAccidentalBatch.help=
-tuttihelp.editIndividualObservationBatch.help=
-tuttihelp.editMarineLitterBatch.help=
-tuttihelp.editPlanktonBatch.help=
+tutti.validateCruise.navigation.action.export.all.help=validateCruise.html#actions
+tutti.validateCruise.navigation.action.export.help=validateCruise.html#actions
+tutti.validateCruise.navigation.action.export.operation.help=validateCruise.html#actions
+tutti.validateCruise.navigation.action.refresh.all.help=validateCruise.html#actions
\ No newline at end of file
Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties
===================================================================
--- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-05-23 13:18:33 UTC (rev 995)
+++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-05-23 14:12:16 UTC (rev 996)
@@ -1,5 +1,5 @@
#Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo
-#Tue May 21 18:54:28 CEST 2013
+#Thu May 23 15:38:00 CEST 2013
tutti.config.help=config.html
tutti.createAccidentalBatch.action.cancel.help=createAccidentalBatch.html\#actions
tutti.createAccidentalBatch.action.save.help=createAccidentalBatch.html\#actions
@@ -47,14 +47,15 @@
tutti.dbManager.action.upgradeDb.help=dbManager.html\#actions
tutti.dbManager.help=dbManager.html
tutti.editAccidentalBatch.action.createBatch.help=editAccidentalBatch.html\#actions
-tutti.editAccidentalBatch.action.exportMultiPost.help=
-tutti.editAccidentalBatch.action.importMultiPost.help=
+tutti.editAccidentalBatch.action.exportMultiPost.help=editAccidentalBatch.html\#actions
+tutti.editAccidentalBatch.action.importMultiPost.help=editAccidentalBatch.html\#actions
tutti.editAccidentalBatch.action.removeBatch.help=editAccidentalBatch.html\#actions
tutti.editAccidentalBatch.help=editAccidentalBatch.html
tutti.editBenthosBatch.action.createBatch.help=editBenthosBatch.html\#actions
tutti.editBenthosBatch.action.createMelag.help=editBenthosBatch.html\#actions
-tutti.editBenthosBatch.action.exportMultiPost.help=
-tutti.editBenthosBatch.action.importMultiPost.help=
+tutti.editBenthosBatch.action.editFrequencies.help=editBenthosBatch.html\#actions
+tutti.editBenthosBatch.action.exportMultiPost.help=editBenthosBatch.html\#actions
+tutti.editBenthosBatch.action.importMultiPost.help=editBenthosBatch.html\#actions
tutti.editBenthosBatch.action.removeBatch.help=editBenthosBatch.html\#actions
tutti.editBenthosBatch.action.removeSubBatch.help=editBenthosBatch.html\#actions
tutti.editBenthosBatch.action.renameBatch.help=editBenthosBatch.html\#actions
@@ -86,12 +87,11 @@
tutti.editBenthosFrequencies.field.rafaleStep.help=editBenthosFrequencies.html\#fields
tutti.editBenthosFrequencies.field.simpleCounting.help=editBenthosFrequencies.html\#fields
tutti.editBenthosFrequencies.field.step.help=editBenthosFrequencies.html\#fields
-tutti.editBenthosFrequencies.field.totalNumber.help=
-tutti.editBenthosFrequencies.field.totalWeight.help=
+tutti.editBenthosFrequencies.field.totalNumber.help=editBenthosFrequencies.html\#fields
+tutti.editBenthosFrequencies.field.totalWeight.help=editBenthosFrequencies.html\#fields
tutti.editBenthosFrequencies.help=editBenthosFrequencies.html
tutti.editCatchBatch.action.cancelEditCatchBatch.help=editCatchBatch.html\#actions
tutti.editCatchBatch.action.computeWeights.help=editCatchBatch.html\#actions
-tutti.editSpeciesBatch.action.importPupitri.help=editSpeciesBatch.html\#actions
tutti.editCatchBatch.action.saveCatchBatch.help=editCatchBatch.html\#actions
tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.help=editCatchBatch.html\#fields
tutti.editCatchBatch.field.benthosTotalSortedWeight.help=editCatchBatch.html\#fields
@@ -103,7 +103,6 @@
tutti.editCatchBatch.field.catchTotalSortedWeight.help=editCatchBatch.html\#fields
tutti.editCatchBatch.field.catchTotalUnsortedWeight.help=editCatchBatch.html\#fields
tutti.editCatchBatch.field.catchTotalWeight.help=editCatchBatch.html\#fields
-tutti.editCatchBatch.field.macroWasteTotalWeight.help=
tutti.editCatchBatch.field.marineLitterTotalWeight.help=editCatchBatch.html\#fields
tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.help=editCatchBatch.html\#fields
tutti.editCatchBatch.field.speciesTotalSortedWeight.help=editCatchBatch.html\#fields
@@ -163,13 +162,13 @@
tutti.editFishingOperation.field.vessel.help=editFishingOperation.html\#fields
tutti.editFishingOperation.help=editFishingOperation.html
tutti.editIndividualObservationBatch.action.createBatch.help=editIndividualObservationBatch.html\#actions
-tutti.editIndividualObservationBatch.action.exportMultiPost.help=
-tutti.editIndividualObservationBatch.action.importMultiPost.help=
+tutti.editIndividualObservationBatch.action.exportMultiPost.help=editIndividualObservationBatch.html\#actions
+tutti.editIndividualObservationBatch.action.importMultiPost.help=editIndividualObservationBatch.html\#actions
tutti.editIndividualObservationBatch.action.removeBatch.help=editIndividualObservationBatch.html\#actions
tutti.editIndividualObservationBatch.help=editIndividualObservationBatch.html
tutti.editMarineLitterBatch.action.createBatch.help=editIndividualObservationBatch.html\#actions
-tutti.editMarineLitterBatch.action.exportMultiPost.help=
-tutti.editMarineLitterBatch.action.importMultiPost.help=
+tutti.editMarineLitterBatch.action.exportMultiPost.help=editIndividualObservationBatch.html\#actions
+tutti.editMarineLitterBatch.action.importMultiPost.help=editIndividualObservationBatch.html\#actions
tutti.editMarineLitterBatch.action.removeBatch.help=editIndividualObservationBatch.html\#actions
tutti.editMarineLitterBatch.field.marineLitterTotalWeight.help=editIndividualObservationBatch.html\#fields
tutti.editMarineLitterBatch.help=editMarineLitterBatch.html
@@ -207,8 +206,10 @@
tutti.editProtocol.pane.caracteristic.help=editProtocol.html\#fieldsCaracteristics
tutti.editSpeciesBatch.action.createBatch.help=editSpeciesBatch.html\#actions
tutti.editSpeciesBatch.action.createMelag.help=editSpeciesBatch.html\#actions
-tutti.editSpeciesBatch.action.exportMultiPost.help=
-tutti.editSpeciesBatch.action.importMultiPost.help=
+tutti.editSpeciesBatch.action.editFrequencies.help=editSpeciesBatch.html\#actions
+tutti.editSpeciesBatch.action.exportMultiPost.help=editSpeciesBatch.html\#actions
+tutti.editSpeciesBatch.action.importMultiPost.help=editSpeciesBatch.html\#actions
+tutti.editSpeciesBatch.action.importPupitri.help=editSpeciesBatch.html\#actions
tutti.editSpeciesBatch.action.removeBatch.help=editSpeciesBatch.html\#actions
tutti.editSpeciesBatch.action.removeSubBatch.help=editSpeciesBatch.html\#actions
tutti.editSpeciesBatch.action.renameBatch.help=editSpeciesBatch.html\#actions
@@ -234,17 +235,17 @@
tutti.editSpeciesFrequencies.field.rafaleStep.help=editSpeciesFrequencies.html\#fields
tutti.editSpeciesFrequencies.field.simpleCounting.help=editSpeciesFrequencies.html\#fields
tutti.editSpeciesFrequencies.field.step.help=editSpeciesFrequencies.html\#fields
-tutti.editSpeciesFrequencies.field.totalNumber.help=
-tutti.editSpeciesFrequencies.field.totalWeight.help=
+tutti.editSpeciesFrequencies.field.totalNumber.help=editSpeciesFrequencies.html\#fields
+tutti.editSpeciesFrequencies.field.totalWeight.help=editSpeciesFrequencies.html\#fields
tutti.editSpeciesFrequencies.help=editSpeciesFrequencies.html
-tutti.fishingOperations.action.deleteFishingOperation.help=
+tutti.fishingOperations.action.deleteFishingOperation.help=fishingOperations.html\#actions
tutti.fishingOperations.action.newFishingOperation.help=fishingOperations.html\#actions
tutti.fishingOperations.field.fishingOperation.help=fishingOperations.html\#fields
tutti.fishingOperations.help=fishingOperations.html
tutti.index.help=index.html
-tutti.main.action.changeLocale.help=
-tutti.main.action.changeLocaleFR.help=
-tutti.main.action.changeLocaleUK.help=
+tutti.main.action.changeLocale.help=index.html\#menu
+tutti.main.action.changeLocaleFR.help=index.html\#menu
+tutti.main.action.changeLocaleUK.help=index.html\#menu
tutti.main.action.showHelp.help=index.html\#menu
tutti.main.help=index.html
tutti.main.menu.action.about.help=index.html\#menu
@@ -279,9 +280,9 @@
tutti.selectCruise.action.editCruise.help=selectCruise.html\#actions
tutti.selectCruise.action.editProgram.help=selectCruise.html\#actions
tutti.selectCruise.action.editProtocol.help=selectCruise.html\#actions
-tutti.selectCruise.action.exportCruise.help=
-tutti.selectCruise.action.exportCruiseForSumatra.help=
-tutti.selectCruise.action.exportProgram.help=
+tutti.selectCruise.action.exportCruise.help=selectCruise.html\#actions
+tutti.selectCruise.action.exportCruiseForSumatra.help=selectCruise.html\#actions
+tutti.selectCruise.action.exportProgram.help=selectCruise.html\#actions
tutti.selectCruise.action.exportProtocol.help=selectCruise.html\#actions
tutti.selectCruise.action.importProtocol.help=selectCruise.html\#actions
tutti.selectCruise.action.newCruise.help=selectCruise.html\#actions
@@ -308,12 +309,7 @@
tutti.splitSpeciesBatch.field.sampleWeightField.help=splitSpeciesBatch.html\#fields
tutti.splitSpeciesBatch.field.speciesField.help=splitSpeciesBatch.html\#fields
tutti.splitSpeciesBatch.help=splitSpeciesBatch.html
-tutti.validateCruise.navigation.action.export.all.help=
-tutti.validateCruise.navigation.action.export.help=
-tutti.validateCruise.navigation.action.export.operation.help=
-tutti.validateCruise.navigation.action.refresh.all.help=
-tuttihelp.config.help=
-tuttihelp.editAccidentalBatch.help=
-tuttihelp.editIndividualObservationBatch.help=
-tuttihelp.editMarineLitterBatch.help=
-tuttihelp.editPlanktonBatch.help=
+tutti.validateCruise.navigation.action.export.all.help=validateCruise.html#actions
+tutti.validateCruise.navigation.action.export.help=validateCruise.html#actions
+tutti.validateCruise.navigation.action.export.operation.help=validateCruise.html#actions
+tutti.validateCruise.navigation.action.refresh.all.help=validateCruise.html#actions
\ No newline at end of file
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css 2013-05-23 13:18:33 UTC (rev 995)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css 2013-05-23 14:12:16 UTC (rev 996)
@@ -245,4 +245,13 @@
i18nMnemonic: "tutti.editBenthosBatch.action.createBatch.mnemonic";
enabled: {model.isCreateBatchEnabled()};
_help: {"tutti.editBenthosBatch.action.createBatch.help"};
+}
+
+#editFrequenciesMenu {
+ actionIcon: show-frequency;
+ text: "tutti.editBenthosBatch.action.editFrequencies";
+ toolTipText: "tutti.editBenthosBatch.action.editFrequencies.tip";
+ i18nMnemonic: "tutti.editBenthosBatch.action.editFrequencies.mnemonic";
+ enabled: {model.isTableViewModeAll() && model.isEditFrequenciesEnabled()};
+ _help: {"tutti.editBenthosBatch.action.editFrequencies.help"};
}
\ No newline at end of file
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx 2013-05-23 13:18:33 UTC (rev 995)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx 2013-05-23 14:12:16 UTC (rev 996)
@@ -81,6 +81,8 @@
<JMenuItem id='removeBenthosSubBatchMenu'/>
<JMenuItem id='renameBenthosBatchMenu'/>
<JMenuItem id='createBenthosMelagMenu'/>
+ <JMenuItem id='editFrequenciesMenu'
+ onActionPerformed='handler.editFrequencies()'/>
</JPopupMenu>
<Table id='form' fill='both' constraints='BorderLayout.NORTH'>
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-05-23 13:18:33 UTC (rev 995)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-05-23 14:12:16 UTC (rev 996)
@@ -54,6 +54,8 @@
import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.split.SplitBenthosBatchRowModel;
import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.split.SplitBenthosBatchUI;
import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.split.SplitBenthosBatchUIModel;
+import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchTableModel;
+import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyCellComponent;
import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor;
import fr.ifremer.tutti.ui.swing.util.TuttiUI;
import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil;
@@ -77,6 +79,7 @@
import org.jdesktop.swingx.decorator.HighlightPredicate;
import org.jdesktop.swingx.decorator.Highlighter;
import org.jdesktop.swingx.table.DefaultTableColumnModelExt;
+import org.jdesktop.swingx.table.TableColumnModelExt;
import org.nuiton.util.decorator.Decorator;
import org.nuiton.validator.NuitonValidatorResult;
@@ -720,6 +723,24 @@
recomputeBatchActionEnable();
}
+ public void editFrequencies() {
+
+ JXTable table = getTable();
+
+ int rowIndex = table.getSelectedRow();
+
+ TableColumnModelExt columnModel = (TableColumnModelExt) getTable().getColumnModel();
+
+ int columnIndex = columnModel.getColumnIndex(BenthosBatchTableModel.COMPUTED_NUMBER);
+
+ AbstractSelectTableAction.doSelectCell(getTable(), rowIndex, columnIndex);
+
+ BenthosFrequencyCellComponent.FrequencyCellEditor cellEditor =
+ (BenthosFrequencyCellComponent.FrequencyCellEditor)
+ columnModel.getColumnExt(columnIndex).getCellEditor();
+ cellEditor.startEdit();
+ }
+
public void splitBatch() {
JXTable table = getTable();
@@ -929,11 +950,13 @@
boolean enableRemove = false;
boolean enableRemoveSub = false;
boolean enableCreateMelag = false;
+ boolean enableEditFrequencies = false;
if (rowIndex != -1) {
// there is a selected row
+
//TODO If there is some sub-batch, can remove them
//TODO If there is no sub-batch, can split current batch
@@ -941,12 +964,18 @@
BenthosBatchRowModel row = tableModel.getEntry(rowIndex);
int selectedRowCount = getTable().getSelectedRowCount();
+ // can edit frequencies on a single selected leaf row
+
+
enableSplit = true;
- enableRemove = true;
- enableRemoveSub = true;
- enableRename = true;
- enableCreateMelag = true;
+ // action with single selection
+ enableRemove = selectedRowCount == 1;
+ enableRemoveSub = selectedRowCount == 1;
+ enableRename = selectedRowCount == 1;
+ enableCreateMelag = selectedRowCount == 1;
+ enableEditFrequencies = selectedRowCount == 1;
+
if (enableSplit) {
// can split if selected batch is a leaf
@@ -957,7 +986,6 @@
int lastSamplingId = samplingOrderIds.get(samplingOrderIds.size() - 1);
SampleCategoryEnum lastCategory = categoryEnumMap.get(lastSamplingId);
- // can split if selected batch is a leaf
enableSplit = row.isBatchLeaf()
&& selectedRowCount == 1
&& !lastCategory.equals(row.getFinestCategory().getCategoryType())
@@ -966,24 +994,28 @@
|| row.getComputedNumber() == 0);
}
+ if (enableEditFrequencies) {
+
+ // can edit frequencies only on a leaf
+ enableEditFrequencies = row.isBatchLeaf();
+ }
+
if (enableRename) {
// can rename if selected batch is a parent
- enableRename = row.isBatchRoot()
- && selectedRowCount == 1;
+ enableRename = row.isBatchRoot();
}
if (enableRemove) {
// can always remove the batch
- enableRemove = selectedRowCount == 1;
+ // no more test
}
if (enableRemoveSub) {
// can remove sub batch if selected batch is not a leaf
- enableRemoveSub = !row.isBatchLeaf()
- && selectedRowCount == 1;
+ enableRemoveSub = !row.isBatchLeaf();
}
if (enableCreateMelag) {
@@ -1017,6 +1049,7 @@
model.setRemoveSubBatchEnabled(enableRemoveSub);
model.setRenameBatchEnabled(enableRename);
model.setCreateMelagEnabled(enableCreateMelag);
+ model.setEditFrequenciesEnabled(enableEditFrequencies);
}
public void collectChildren(BenthosBatchRowModel row,
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java 2013-05-23 13:18:33 UTC (rev 995)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java 2013-05-23 14:12:16 UTC (rev 996)
@@ -59,6 +59,8 @@
public static final String PROPERTY_CREATE_MELAG_ENABLED = "createMelagEnabled";
+ public static final String PROPERTY_EDIT_FREQUENCIES_ENABLED = "editFrequenciesEnabled";
+
public static final String PROPERTY_TABLE_VIEW_MODE_ALL = "tableViewModeAll";
public static final String PROPERTY_TABLE_VIEW_MODE_LEAF = "tableViewModeLeaf";
@@ -112,6 +114,13 @@
protected boolean renameBatchEnabled;
/**
+ * Can user edit frequencies for the selected species?
+ *
+ * @since 2.3
+ */
+ private boolean editFrequenciesEnabled;
+
+ /**
* What to show in the table.
*
* @since 0.3
@@ -290,9 +299,8 @@
}
public void setCreateBatchEnabled(boolean createBatchEnabled) {
- Object oldValue = isCreateBatchEnabled();
this.createBatchEnabled = createBatchEnabled;
- firePropertyChange(PROPERTY_CREATE_BATCH_ENABLED, oldValue, createBatchEnabled);
+ firePropertyChange(PROPERTY_CREATE_BATCH_ENABLED, null, createBatchEnabled);
}
public boolean isSplitBatchEnabled() {
@@ -300,9 +308,8 @@
}
public void setSplitBatchEnabled(boolean splitBatchEnabled) {
- Object oldValue = isSplitBatchEnabled();
this.splitBatchEnabled = splitBatchEnabled;
- firePropertyChange(PROPERTY_SPLIT_BATCH_ENABLED, oldValue, splitBatchEnabled);
+ firePropertyChange(PROPERTY_SPLIT_BATCH_ENABLED, null, splitBatchEnabled);
}
public boolean isRemoveBatchEnabled() {
@@ -310,9 +317,8 @@
}
public void setRemoveBatchEnabled(boolean removeBatchEnabled) {
- Object oldValue = isRemoveBatchEnabled();
this.removeBatchEnabled = removeBatchEnabled;
- firePropertyChange(PROPERTY_REMOVE_BATCH_ENABLED, oldValue, removeBatchEnabled);
+ firePropertyChange(PROPERTY_REMOVE_BATCH_ENABLED, null, removeBatchEnabled);
}
public boolean isRemoveSubBatchEnabled() {
@@ -320,29 +326,34 @@
}
public void setRemoveSubBatchEnabled(boolean removeSubBatchEnabled) {
- Object oldValue = isRemoveSubBatchEnabled();
this.removeSubBatchEnabled = removeSubBatchEnabled;
- firePropertyChange(PROPERTY_REMOVE_SUB_BATCH_ENABLED, oldValue, removeSubBatchEnabled);
+ firePropertyChange(PROPERTY_REMOVE_SUB_BATCH_ENABLED, null, removeSubBatchEnabled);
}
+ public boolean isRenameBatchEnabled() {
+ return renameBatchEnabled;
+ }
+
public void setRenameBatchEnabled(boolean renameBatchEnabled) {
- Object oldValue = isRenameBatchEnabled();
this.renameBatchEnabled = renameBatchEnabled;
- firePropertyChange(PROPERTY_RENAME_BATCH_ENABLED, oldValue, renameBatchEnabled);
+ firePropertyChange(PROPERTY_RENAME_BATCH_ENABLED, null, renameBatchEnabled);
}
- public boolean isRenameBatchEnabled() {
- return renameBatchEnabled;
- }
-
public boolean isCreateMelagEnabled() {
return createMelagEnabled;
}
public void setCreateMelagEnabled(boolean createMelagEnabled) {
- Object oldValue = isCreateMelagEnabled();
this.createMelagEnabled = createMelagEnabled;
- firePropertyChange(PROPERTY_CREATE_MELAG_ENABLED, oldValue, createMelagEnabled);
+ firePropertyChange(PROPERTY_CREATE_MELAG_ENABLED, null, createMelagEnabled);
}
+ public boolean isEditFrequenciesEnabled() {
+ return editFrequenciesEnabled;
+ }
+
+ public void setEditFrequenciesEnabled(boolean editFrequenciesEnabled) {
+ this.editFrequenciesEnabled = editFrequenciesEnabled;
+ firePropertyChange(PROPERTY_EDIT_FREQUENCIES_ENABLED, null, editFrequenciesEnabled);
+ }
}
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2013-05-23 13:18:33 UTC (rev 995)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2013-05-23 14:12:16 UTC (rev 996)
@@ -146,7 +146,7 @@
});
}
- protected void startEdit() {
+ public void startEdit() {
Preconditions.checkNotNull(tableModel, "No table model assigned.");
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css 2013-05-23 13:18:33 UTC (rev 995)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css 2013-05-23 14:12:16 UTC (rev 996)
@@ -255,3 +255,12 @@
enabled: {model.isCreateBatchEnabled()};
_help: {"tutti.editSpeciesBatch.action.createBatch.help"};
}
+
+#editFrequenciesMenu {
+ actionIcon: show-frequency;
+ text: "tutti.editSpeciesBatch.action.editFrequencies";
+ toolTipText: "tutti.editSpeciesBatch.action.editFrequencies.tip";
+ i18nMnemonic: "tutti.editSpeciesBatch.action.editFrequencies.mnemonic";
+ enabled: {model.isTableViewModeAll() && model.isEditFrequenciesEnabled()};
+ _help: {"tutti.editSpeciesBatch.action.editFrequencies.help"};
+}
\ No newline at end of file
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx 2013-05-23 13:18:33 UTC (rev 995)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx 2013-05-23 14:12:16 UTC (rev 996)
@@ -82,6 +82,8 @@
<JMenuItem id='removeSpeciesSubBatchMenu'/>
<JMenuItem id='renameSpeciesBatchMenu'/>
<JMenuItem id='createSpeciesMelagMenu'/>
+ <JMenuItem id='editFrequenciesMenu'
+ onActionPerformed='handler.editFrequencies()'/>
</JPopupMenu>
<Table id='form' fill='both' constraints='BorderLayout.NORTH'>
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 2013-05-23 13:18:33 UTC (rev 995)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-05-23 14:12:16 UTC (rev 996)
@@ -75,6 +75,7 @@
import org.jdesktop.swingx.decorator.HighlightPredicate;
import org.jdesktop.swingx.decorator.Highlighter;
import org.jdesktop.swingx.table.DefaultTableColumnModelExt;
+import org.jdesktop.swingx.table.TableColumnModelExt;
import org.nuiton.util.decorator.Decorator;
import org.nuiton.validator.NuitonValidatorResult;
@@ -728,6 +729,24 @@
recomputeBatchActionEnable();
}
+ public void editFrequencies() {
+
+ JXTable table = getTable();
+
+ int rowIndex = table.getSelectedRow();
+
+ TableColumnModelExt columnModel = (TableColumnModelExt) getTable().getColumnModel();
+
+ int columnIndex = columnModel.getColumnIndex(SpeciesBatchTableModel.COMPUTED_NUMBER);
+
+ AbstractSelectTableAction.doSelectCell(getTable(), rowIndex, columnIndex);
+
+ SpeciesFrequencyCellComponent.FrequencyCellEditor cellEditor =
+ (SpeciesFrequencyCellComponent.FrequencyCellEditor)
+ columnModel.getColumnExt(columnIndex).getCellEditor();
+ cellEditor.startEdit();
+ }
+
public void splitBatch() {
JXTable table = getTable();
@@ -933,11 +952,13 @@
boolean enableRemove = false;
boolean enableRemoveSub = false;
boolean enableCreateMelag = false;
+ boolean enableEditFrequencies = false;
if (rowIndex != -1) {
// there is a selected row
+
//TODO If there is some sub-batch, can remove them
//TODO If there is no sub-batch, can split current batch
@@ -945,12 +966,18 @@
SpeciesBatchRowModel row = tableModel.getEntry(rowIndex);
int selectedRowCount = getTable().getSelectedRowCount();
+ // can edit frequencies on a single selected leaf row
+
+
enableSplit = true;
- enableRemove = true;
- enableRemoveSub = true;
- enableRename = true;
- enableCreateMelag = true;
+ // action with single selection
+ enableRemove = selectedRowCount == 1;
+ enableRemoveSub = selectedRowCount == 1;
+ enableRename = selectedRowCount == 1;
+ enableCreateMelag = selectedRowCount == 1;
+ enableEditFrequencies = selectedRowCount == 1;
+
if (enableSplit) {
// can split if selected batch is a leaf
@@ -969,24 +996,28 @@
|| row.getComputedNumber() == 0);
}
+ if (enableEditFrequencies) {
+
+ // can edit frequencies only on a leaf
+ enableEditFrequencies = row.isBatchLeaf();
+ }
+
if (enableRename) {
// can rename if selected batch is a parent
- enableRename = row.isBatchRoot()
- && selectedRowCount == 1;
+ enableRename = row.isBatchRoot();
}
if (enableRemove) {
// can always remove the batch
- enableRemove = selectedRowCount == 1;
+ // no more test
}
if (enableRemoveSub) {
// can remove sub batch if selected batch is not a leaf
- enableRemoveSub = !row.isBatchLeaf()
- && selectedRowCount == 1;
+ enableRemoveSub = !row.isBatchLeaf();
}
if (enableCreateMelag) {
@@ -1018,8 +1049,9 @@
model.setSplitBatchEnabled(enableSplit);
model.setRemoveBatchEnabled(enableRemove);
model.setRemoveSubBatchEnabled(enableRemoveSub);
- model.setRenameSpeciesBatchEnabled(enableRename);
- model.setCreateSpeciesMelagEnabled(enableCreateMelag);
+ model.setRenameBatchEnabled(enableRename);
+ model.setCreateMelagEnabled(enableCreateMelag);
+ model.setEditFrequenciesEnabled(enableEditFrequencies);
}
public void collectChildren(SpeciesBatchRowModel row,
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java 2013-05-23 13:18:33 UTC (rev 995)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java 2013-05-23 14:12:16 UTC (rev 996)
@@ -57,6 +57,8 @@
public static final String PROPERTY_CREATE_MELAG_ENABLED = "createMelagEnabled";
+ public static final String PROPERTY_EDIT_FREQUENCIES_ENABLED = "editFrequenciesEnabled";
+
public static final String PROPERTY_TABLE_VIEW_MODE = "tableViewMode";
public static final String PROPERTY_TABLE_VIEW_MODE_ALL = "tableViewModeAll";
@@ -112,6 +114,13 @@
protected boolean renameBatchEnabled;
/**
+ * Can user edit frequencies for the selected species?
+ *
+ * @since 2.3
+ */
+ private boolean editFrequenciesEnabled;
+
+ /**
* What to show in the table.
*
* @since 0.3
@@ -272,9 +281,8 @@
}
public void setCreateBatchEnabled(boolean createBatchEnabled) {
- Object oldValue = isCreateBatchEnabled();
this.createBatchEnabled = createBatchEnabled;
- firePropertyChange(PROPERTY_CREATE_BATCH_ENABLED, oldValue, createBatchEnabled);
+ firePropertyChange(PROPERTY_CREATE_BATCH_ENABLED, null, createBatchEnabled);
}
public boolean isSplitBatchEnabled() {
@@ -282,9 +290,8 @@
}
public void setSplitBatchEnabled(boolean splitBatchEnabled) {
- Object oldValue = isSplitBatchEnabled();
this.splitBatchEnabled = splitBatchEnabled;
- firePropertyChange(PROPERTY_SPLIT_BATCH_ENABLED, oldValue, splitBatchEnabled);
+ firePropertyChange(PROPERTY_SPLIT_BATCH_ENABLED, null, splitBatchEnabled);
}
public boolean isRemoveBatchEnabled() {
@@ -292,9 +299,8 @@
}
public void setRemoveBatchEnabled(boolean removeBatchEnabled) {
- Object oldValue = isRemoveBatchEnabled();
this.removeBatchEnabled = removeBatchEnabled;
- firePropertyChange(PROPERTY_REMOVE_BATCH_ENABLED, oldValue, removeBatchEnabled);
+ firePropertyChange(PROPERTY_REMOVE_BATCH_ENABLED, null, removeBatchEnabled);
}
public boolean isRemoveSubBatchEnabled() {
@@ -302,33 +308,39 @@
}
public void setRemoveSubBatchEnabled(boolean removeSubBatchEnabled) {
- Object oldValue = isRemoveSubBatchEnabled();
this.removeSubBatchEnabled = removeSubBatchEnabled;
- firePropertyChange(PROPERTY_REMOVE_SUB_BATCH_ENABLED, oldValue, removeSubBatchEnabled);
+ firePropertyChange(PROPERTY_REMOVE_SUB_BATCH_ENABLED, null, removeSubBatchEnabled);
}
- public void setRenameSpeciesBatchEnabled(boolean renameBatchEnabled) {
- Object oldValue = isRenameBatchEnabled();
- this.renameBatchEnabled = renameBatchEnabled;
- firePropertyChange(PROPERTY_RENAME_BATCH_ENABLED, oldValue, renameBatchEnabled);
- }
-
public boolean isRenameBatchEnabled() {
return renameBatchEnabled;
}
+ public void setRenameBatchEnabled(boolean renameBatchEnabled) {
+ this.renameBatchEnabled = renameBatchEnabled;
+ firePropertyChange(PROPERTY_RENAME_BATCH_ENABLED, null, renameBatchEnabled);
+ }
+
public boolean isCreateMelagEnabled() {
return createMelagEnabled;
}
- public void setCreateSpeciesMelagEnabled(boolean createMelagEnabled) {
- Object oldValue = isCreateMelagEnabled();
+ public void setCreateMelagEnabled(boolean createMelagEnabled) {
this.createMelagEnabled = createMelagEnabled;
- firePropertyChange(PROPERTY_CREATE_MELAG_ENABLED, oldValue, createMelagEnabled);
+ firePropertyChange(PROPERTY_CREATE_MELAG_ENABLED, null, createMelagEnabled);
}
+ public boolean isEditFrequenciesEnabled() {
+ return editFrequenciesEnabled;
+ }
+
+ public void setEditFrequenciesEnabled(boolean editFrequenciesEnabled) {
+ this.editFrequenciesEnabled = editFrequenciesEnabled;
+ firePropertyChange(PROPERTY_EDIT_FREQUENCIES_ENABLED, null, editFrequenciesEnabled);
+ }
+
//------------------------------------------------------------------------//
- //-- TabContentModel --//
+ //-- TabContentModel --//
//------------------------------------------------------------------------//
@Override
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2013-05-23 13:18:33 UTC (rev 995)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2013-05-23 14:12:16 UTC (rev 996)
@@ -146,7 +146,7 @@
});
}
- protected void startEdit() {
+ public void startEdit() {
Preconditions.checkNotNull(tableModel, "No table model assigned.");
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 2013-05-23 13:18:33 UTC (rev 995)
+++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-05-23 14:12:16 UTC (rev 996)
@@ -306,6 +306,9 @@
tutti.editBenthosBatch.action.createMelag=
tutti.editBenthosBatch.action.createMelag.mnemonic=
tutti.editBenthosBatch.action.createMelag.tip=
+tutti.editBenthosBatch.action.editFrequencies=
+tutti.editBenthosBatch.action.editFrequencies.mnemonic=
+tutti.editBenthosBatch.action.editFrequencies.tip=
tutti.editBenthosBatch.action.exportMultiPost=
tutti.editBenthosBatch.action.exportMultiPost.destinationFile.button=
tutti.editBenthosBatch.action.exportMultiPost.destinationFile.title=
@@ -836,6 +839,9 @@
tutti.editSpeciesBatch.action.createMelag=
tutti.editSpeciesBatch.action.createMelag.mnemonic=
tutti.editSpeciesBatch.action.createMelag.tip=
+tutti.editSpeciesBatch.action.editFrequencies=
+tutti.editSpeciesBatch.action.editFrequencies.mnemonic=
+tutti.editSpeciesBatch.action.editFrequencies.tip=
tutti.editSpeciesBatch.action.exportMultiPost=
tutti.editSpeciesBatch.action.exportMultiPost.destinationFile.button=
tutti.editSpeciesBatch.action.exportMultiPost.destinationFile.title=
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 2013-05-23 13:18:33 UTC (rev 995)
+++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-23 14:12:16 UTC (rev 996)
@@ -300,6 +300,9 @@
tutti.editBenthosBatch.action.createMelag=Espèces d'un MELAG
tutti.editBenthosBatch.action.createMelag.mnemonic=C
tutti.editBenthosBatch.action.createMelag.tip=Calcul des poids des lots appartenant à un MELAG
+tutti.editBenthosBatch.action.editFrequencies=Mensurations
+tutti.editBenthosBatch.action.editFrequencies.mnemonic=M
+tutti.editBenthosBatch.action.editFrequencies.tip=Éditer les mensurations
tutti.editBenthosBatch.action.exportMultiPost=Exporter les lots de benthos
tutti.editBenthosBatch.action.exportMultiPost.destinationFile.button=Choisir le fichier pour l'export
tutti.editBenthosBatch.action.exportMultiPost.destinationFile.title=Exporter les lots du benthos
@@ -807,6 +810,9 @@
tutti.editSpeciesBatch.action.createMelag=Espèces d'un MELAG
tutti.editSpeciesBatch.action.createMelag.mnemonic=C
tutti.editSpeciesBatch.action.createMelag.tip=Calcul des poids des lots appartenant à un MELAG
+tutti.editSpeciesBatch.action.editFrequencies=Mensurations
+tutti.editSpeciesBatch.action.editFrequencies.mnemonic=M
+tutti.editSpeciesBatch.action.editFrequencies.tip=Éditer les mensurations
tutti.editSpeciesBatch.action.exportMultiPost=Exporter les lots d'espèces
tutti.editSpeciesBatch.action.exportMultiPost.destinationFile.button=Choisir le fichier pour l'export
tutti.editSpeciesBatch.action.exportMultiPost.destinationFile.title=Exporter les lots d'espèces
1
0
r995 - in trunk: tutti-persistence/src/main/resources/i18n tutti-ui-swing/src/main/resources/i18n
by kmorin@users.forge.codelutin.com 23 May '13
by kmorin@users.forge.codelutin.com 23 May '13
23 May '13
Author: kmorin
Date: 2013-05-23 15:18:33 +0200 (Thu, 23 May 2013)
New Revision: 995
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/995
Log:
i18n
Modified:
trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties
trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties
Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties
===================================================================
--- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-05-23 12:46:04 UTC (rev 994)
+++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-05-23 13:18:33 UTC (rev 995)
@@ -33,7 +33,7 @@
tutti.persistence.batch.validation.vracSpeciesNotFound=Lot 'Vrac > Espèces' non trouvé, ou configuré avec d'autres critères de classement.
tutti.persistence.config.generateEnumFile.error=Erreur lors de la génération du fichier d'énumération de la configuration de la base de données
tutti.persistence.config.generateFile.error=Erreur lors de la génération du fichier de configuration de la base de données
-tutti.persistence.cruise.gearUsedInOperations.error=Vous essayez d'enlever un ou plusieurs engins qui sont utilisés sur des traits.<br/>Veuillez changer l'engin des traits en question pour pouvoir les enlever de la campagne.
+tutti.persistence.cruise.gearUsedInOperations.error=Vous essayez d'enlever un ou plusieurs engins qui sont utilisés sur des traits.<hr/>Veuillez changer l'engin des traits en question pour pouvoir les enlever de la campagne.
tutti.persistence.dbMetadata.instanciation.error=Erreur lors de l'initialisation des metadata de la base de données par la connexion %s
tutti.persistence.loader.error=Erreur de conversion du dossier %s en URL
tutti.persistence.mkDir.error=Erreur lors de la création du dossier %s
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 2013-05-23 12:46:04 UTC (rev 994)
+++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-23 13:18:33 UTC (rev 995)
@@ -272,7 +272,7 @@
tutti.editAccidentalBatch.action.importMultiPost.success=Des lots de captures accidentelles ont été importés depuis le fichier %s
tutti.editAccidentalBatch.action.importMultiPost.tip=Importer des captures accidentelles créées sur un poste satellite
tutti.editAccidentalBatch.action.removeBatch=Supprimer la capture courante
-tutti.editAccidentalBatch.action.removeBatch.confirm.message=Vous êtes sur le point de supprimer une capture accidentelle. Êtes-vous sur de vouloir la supprimer ?
+tutti.editAccidentalBatch.action.removeBatch.confirm.message=<html>Vous êtes sur le point de supprimer une capture accidentelle.<hr/>Êtes-vous sur de vouloir la supprimer ?</html>
tutti.editAccidentalBatch.action.removeBatch.confirm.title=Suppression d'une capture accidentelle
tutti.editAccidentalBatch.action.removeBatch.mnemonic=S
tutti.editAccidentalBatch.action.removeBatch.tip=Supprimer la capture courante (celle de la ligne sélectionnée)
@@ -313,12 +313,12 @@
tutti.editBenthosBatch.action.importMultiPost.success=Des lots de benthos ont été importés depuis le fichier %s
tutti.editBenthosBatch.action.importMultiPost.tip=Importer des lots de benthos créés sur un poste satellite
tutti.editBenthosBatch.action.removeBatch=Supprimer le lot
-tutti.editBenthosBatch.action.removeBatch.confirm.message=Vous êtes sur le point de supprimer un lot de benthos. Êtes-vous sur de vouloir le supprimer ?
+tutti.editBenthosBatch.action.removeBatch.confirm.message=<html>Vous êtes sur le point de supprimer un lot de benthos.<hr/>Êtes-vous sur de vouloir le supprimer ?</html>
tutti.editBenthosBatch.action.removeBatch.confirm.title=Suppression d'un lot de benthos
tutti.editBenthosBatch.action.removeBatch.mnemonic=S
tutti.editBenthosBatch.action.removeBatch.tip=Supprimer le lot courant (celui de la ligne sélectionnée) et tous ces fils
tutti.editBenthosBatch.action.removeSubBatch=Supprimer les lots fils
-tutti.editBenthosBatch.action.removeSubBatch.confirm.message=Vous êtes sur le point de supprimer les fils d'un lot de benthos. Êtes-vous sur de vouloir les supprimer ?
+tutti.editBenthosBatch.action.removeSubBatch.confirm.message=<html>Vous êtes sur le point de supprimer les fils d'un lot de benthos.<hr/>Êtes-vous sur de vouloir les supprimer ?</html>
tutti.editBenthosBatch.action.removeSubBatch.confirm.title=Suppression des fils d'un lot de benthos
tutti.editBenthosBatch.action.removeSubBatch.mnemonic=f
tutti.editBenthosBatch.action.removeSubBatch.tip=Supprimer tous les lots fils du lot sélectionné
@@ -626,7 +626,7 @@
tutti.editIndividualObservationBatch.action.importMultiPost.success=Des lots d'observations individuelles ont été importés depuis le fichier %s
tutti.editIndividualObservationBatch.action.importMultiPost.tip=Importer des observations créées sur un poste satellite
tutti.editIndividualObservationBatch.action.removeBatch=Supprimer la ligne sélectionnée
-tutti.editIndividualObservationBatch.action.removeBatch.confirm.message=Vous êtes sur le point de supprimer une observation individuelle. Êtes-vous sur de vouloir la supprimer ?
+tutti.editIndividualObservationBatch.action.removeBatch.confirm.message=<html>Vous êtes sur le point de supprimer une observation individuelle.<hr/>Êtes-vous sur de vouloir la supprimer ?</html>
tutti.editIndividualObservationBatch.action.removeBatch.confirm.title=Suppression d'une observation individuelle
tutti.editIndividualObservationBatch.action.removeBatch.mnemonic=S
tutti.editIndividualObservationBatch.action.removeBatch.tip=Supprimer la ligne sélectionnée
@@ -673,7 +673,7 @@
tutti.editMarineLitterBatch.action.importMultiPost.success=Des lots de déchets ont été importés depuis le fichier %s
tutti.editMarineLitterBatch.action.importMultiPost.tip=Importer des lots de déchets créés sur un poste satellite
tutti.editMarineLitterBatch.action.removeBatch=Supprimer la ligne sélectionnée
-tutti.editMarineLitterBatch.action.removeBatch.confirm.message=Vous êtes sur le point de supprimer un lot de déchets. Êtes-vous sur de vouloir le supprimer ?
+tutti.editMarineLitterBatch.action.removeBatch.confirm.message=<html>Vous êtes sur le point de supprimer un lot de déchets.<hr/>Êtes-vous sur de vouloir le supprimer ?</html>
tutti.editMarineLitterBatch.action.removeBatch.confirm.title=Suppression d'un lot de déchets
tutti.editMarineLitterBatch.action.removeBatch.mnemonic=S
tutti.editMarineLitterBatch.action.removeBatch.tip=Supprimer la ligne sélectionnée
@@ -827,12 +827,12 @@
tutti.editSpeciesBatch.action.importPupitri.success=Import Pupitri réussi \: %1s espèces importées, %2s espèces rejetées
tutti.editSpeciesBatch.action.importPupitri.tip=Import Pupitri
tutti.editSpeciesBatch.action.removeBatch=Supprimer le lot
-tutti.editSpeciesBatch.action.removeBatch.confirm.message=Vous êtes sur le point de supprimer un lot d'espèces. Êtes-vous sur de vouloir le supprimer ?
+tutti.editSpeciesBatch.action.removeBatch.confirm.message=<html>Vous êtes sur le point de supprimer un lot d'espèces.<hr/>Êtes-vous sur de vouloir le supprimer ?</html>
tutti.editSpeciesBatch.action.removeBatch.confirm.title=Suppression d'un lot d'espèces
tutti.editSpeciesBatch.action.removeBatch.mnemonic=S
tutti.editSpeciesBatch.action.removeBatch.tip=Supprimer le lot courant (celui de la ligne sélectionnée) et tous ces fils
tutti.editSpeciesBatch.action.removeSubBatch=Supprimer les lots fils
-tutti.editSpeciesBatch.action.removeSubBatch.confirm.message=Vous êtes sur le point de supprimer les fils d'un lot d'espèces. Êtes-vous sur de vouloir les supprimer ?
+tutti.editSpeciesBatch.action.removeSubBatch.confirm.message=<html>Vous êtes sur le point de supprimer les fils d'un lot d'espèces.<hr/>Êtes-vous sur de vouloir les supprimer ?</html>
tutti.editSpeciesBatch.action.removeSubBatch.confirm.title=Suppression des fils d'un lot d'espèces
tutti.editSpeciesBatch.action.removeSubBatch.mnemonic=f
tutti.editSpeciesBatch.action.removeSubBatch.tip=Supprimer tous les lots fils du lot sélectionné
1
0
r994 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: benthos/frequency species/frequency
by kmorin@users.forge.codelutin.com 23 May '13
by kmorin@users.forge.codelutin.com 23 May '13
23 May '13
Author: kmorin
Date: 2013-05-23 14:46:04 +0200 (Thu, 23 May 2013)
New Revision: 994
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/994
Log:
fixes #2495 [MENSURATIONS] perte de la saisie
Modified:
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java 2013-05-23 12:27:49 UTC (rev 993)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java 2013-05-23 12:46:04 UTC (rev 994)
@@ -30,6 +30,8 @@
import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier;
import org.jdesktop.swingx.table.TableColumnModelExt;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
import java.util.List;
import java.util.Map;
@@ -87,6 +89,21 @@
}
}
BenthosFrequencyRowModel result = new BenthosFrequencyRowModel();
+ result.addPropertyChangeListener(BenthosFrequencyRowModel.PROPERTY_LENGTH_STEP,
+ new PropertyChangeListener() {
+ @Override
+ public void propertyChange(PropertyChangeEvent evt) {
+ Float oldValue = (Float) evt.getOldValue();
+ if (oldValue != null) {
+ rowCache.remove(oldValue);
+ }
+ BenthosFrequencyRowModel row = (BenthosFrequencyRowModel) evt.getSource();
+ Float lengthStep = row.getLengthStep();
+ if (lengthStep != null) {
+ rowCache.put(lengthStep, row);
+ }
+ }
+ });
result.setLengthStepCaracteristic(uiModel.getLengthStepCaracteristic());
result.setLengthStep(defaultStep);
result.setValid(false);
@@ -120,22 +137,4 @@
}
}
}
-
- @Override
- protected void onRowAdded(int rowIndex, BenthosFrequencyRowModel newValue) {
-
- Preconditions.checkNotNull(newValue, "can't add a null row");
-
- newValue.setLengthStepCaracteristic(uiModel.getLengthStepCaracteristic());
-
- // add new row to cache
- Float lengthStep = newValue.getLengthStep();
-
- float roundLenghtValue = uiModel.getLengthStep(lengthStep);
-
- if (!rowCache.containsKey(roundLenghtValue)) {
-
- rowCache.put(roundLenghtValue, newValue);
- }
- }
}
\ No newline at end of file
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-05-23 12:27:49 UTC (rev 993)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-05-23 12:46:04 UTC (rev 994)
@@ -236,8 +236,8 @@
}
model.setStep(precision);
- model.setMinStep(10f);
- model.setMaxStep(20f);
+ model.setMinStep(null);
+ model.setMaxStep(null);
ui.getRafaleStepField().getTextField().addKeyListener(new KeyAdapter() {
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java 2013-05-23 12:27:49 UTC (rev 993)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java 2013-05-23 12:46:04 UTC (rev 994)
@@ -30,6 +30,8 @@
import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier;
import org.jdesktop.swingx.table.TableColumnModelExt;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
import java.util.List;
import java.util.Map;
@@ -87,6 +89,21 @@
}
}
SpeciesFrequencyRowModel result = new SpeciesFrequencyRowModel();
+ result.addPropertyChangeListener(SpeciesFrequencyRowModel.PROPERTY_LENGTH_STEP,
+ new PropertyChangeListener() {
+ @Override
+ public void propertyChange(PropertyChangeEvent evt) {
+ Float oldValue = (Float) evt.getOldValue();
+ if (oldValue != null) {
+ rowCache.remove(oldValue);
+ }
+ SpeciesFrequencyRowModel row = (SpeciesFrequencyRowModel) evt.getSource();
+ Float lengthStep = row.getLengthStep();
+ if (lengthStep != null) {
+ rowCache.put(lengthStep, row);
+ }
+ }
+ });
result.setLengthStepCaracteristic(uiModel.getLengthStepCaracteristic());
result.setLengthStep(defaultStep);
result.setValid(false);
@@ -120,24 +137,4 @@
}
}
}
-
- @Override
- protected void onRowAdded(int rowIndex, SpeciesFrequencyRowModel newValue) {
-
- Preconditions.checkNotNull(newValue, "can't add a null row");
-
- newValue.setLengthStepCaracteristic(uiModel.getLengthStepCaracteristic());
-
- // add new row to cache
- Float lengthStep = newValue.getLengthStep();
-
- if (lengthStep != null) {
- float roundLenghtValue = uiModel.getLengthStep(lengthStep);
-
- if (!rowCache.containsKey(roundLenghtValue)) {
-
- rowCache.put(roundLenghtValue, newValue);
- }
- }
- }
}
\ No newline at end of file
1
0
r993 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency resources/i18n
by tchemit@users.forge.codelutin.com 23 May '13
by tchemit@users.forge.codelutin.com 23 May '13
23 May '13
Author: tchemit
Date: 2013-05-23 14:27:49 +0200 (Thu, 23 May 2013)
New Revision: 993
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/993
Log:
fixes #2499: [MENSURATIONS] possibilit?\195?\169 de mettre plusieurs lignes avec la m?\195?\170me classe de taille
Modified:
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.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/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-05-23 11:35:53 UTC (rev 992)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-05-23 12:27:49 UTC (rev 993)
@@ -53,7 +53,9 @@
import org.jdesktop.swingx.decorator.Highlighter;
import org.jdesktop.swingx.table.DefaultTableColumnModelExt;
-import javax.swing.*;
+import javax.swing.JComponent;
+import javax.swing.JTextField;
+import javax.swing.UIManager;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.beans.PropertyChangeEvent;
@@ -63,6 +65,8 @@
import java.util.Map;
import java.util.Set;
+import static org.nuiton.i18n.I18n._;
+
/**
* @author tchemit <chemit(a)codelutin.com>
* @since 0.2
@@ -575,6 +579,36 @@
log.debug("Save UI " + ui);
}
+ // check that we do not have doublon in length
+ // see http://forge.codelutin.com/issues/2499
+ Set<Float> lengths = Sets.newHashSet();
+
+ Float doublon = null;
+ int index = 0;
+ for (BenthosFrequencyRowModel row : getModel().getRows()) {
+ Float lengthStep = row.getLengthStep();
+ if (!lengths.add(lengthStep)) {
+
+ // already exist
+ doublon = lengthStep;
+ continue;
+ }
+ index++;
+ }
+ if (doublon != null) {
+
+ // can't save mensurations (found doublon)
+ String message =
+ _("tutti.editBenthosFrequencies.error.length.doublon",
+ doublon, index);
+ TuttiUIContext.getErrorHelper().showErrorDialog(
+ message);
+
+ // focus to first error row
+ AbstractSelectTableAction.doSelectCell(getTable(), index, 0);
+ return;
+ }
+
frequencyEditor.validateEdition(getModel());
closeUI(ui);
@@ -586,7 +620,7 @@
public String decorateCategory(BenthosBatchRowModel object) {
return object == null ? "" :
- decorate(object.getFinestCategory().getCategoryType()) + " / " + decorate(object.getFinestCategory().getCategoryValue());
+ decorate(object.getFinestCategory().getCategoryType()) + " / " + decorate(object.getFinestCategory().getCategoryValue());
}
//------------------------------------------------------------------------//
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-05-23 11:35:53 UTC (rev 992)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-05-23 12:27:49 UTC (rev 993)
@@ -38,7 +38,10 @@
import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler;
import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel;
import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyCellComponent.FrequencyCellEditor;
-import fr.ifremer.tutti.ui.swing.util.*;
+import fr.ifremer.tutti.ui.swing.util.Cancelable;
+import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor;
+import fr.ifremer.tutti.ui.swing.util.TuttiUI;
+import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil;
import fr.ifremer.tutti.ui.swing.util.table.AbstractSelectTableAction;
import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler;
import jaxx.runtime.SwingUtil;
@@ -51,7 +54,9 @@
import org.jdesktop.swingx.decorator.Highlighter;
import org.jdesktop.swingx.table.DefaultTableColumnModelExt;
-import javax.swing.*;
+import javax.swing.JComponent;
+import javax.swing.JTextField;
+import javax.swing.UIManager;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.beans.PropertyChangeEvent;
@@ -61,6 +66,8 @@
import java.util.Map;
import java.util.Set;
+import static org.nuiton.i18n.I18n._;
+
/**
* @author tchemit <chemit(a)codelutin.com>
* @since 0.2
@@ -573,6 +580,36 @@
log.debug("Save UI " + ui);
}
+ // check that we do not have doublon in length
+ // see http://forge.codelutin.com/issues/2499
+ Set<Float> lengths = Sets.newHashSet();
+
+ Float doublon = null;
+ int index = 0;
+ for (SpeciesFrequencyRowModel row : getModel().getRows()) {
+ Float lengthStep = row.getLengthStep();
+ if (!lengths.add(lengthStep)) {
+
+ // already exist
+ doublon = lengthStep;
+ continue;
+ }
+ index++;
+ }
+ if (doublon != null) {
+
+ // can't save mensurations (found doublon)
+ String message =
+ _("tutti.editSpeciesFrequencies.error.length.doublon",
+ doublon, index);
+ TuttiUIContext.getErrorHelper().showErrorDialog(
+ message);
+
+ // focus to first error row
+ AbstractSelectTableAction.doSelectCell(getTable(), index, 0);
+ return;
+ }
+
frequencyEditor.validateEdition(getModel());
closeUI(ui);
@@ -584,7 +621,7 @@
public String decorateCategory(SpeciesBatchRowModel object) {
return object == null ? "" :
- decorate(object.getFinestCategory().getCategoryType()) + " / " + decorate(object.getFinestCategory().getCategoryValue());
+ decorate(object.getFinestCategory().getCategoryType()) + " / " + decorate(object.getFinestCategory().getCategoryValue());
}
//------------------------------------------------------------------------//
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 2013-05-23 11:35:53 UTC (rev 992)
+++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-05-23 12:27:49 UTC (rev 993)
@@ -390,6 +390,7 @@
tutti.editBenthosFrequencies.action.save.tip=
tutti.editBenthosFrequencies.batchCategory=
tutti.editBenthosFrequencies.batchSpecies=
+tutti.editBenthosFrequencies.error.length.doublon=
tutti.editBenthosFrequencies.field.lengthStepCaracteristic=
tutti.editBenthosFrequencies.field.lengthStepCaracteristic.tip=
tutti.editBenthosFrequencies.field.maxStep=
@@ -922,6 +923,7 @@
tutti.editSpeciesFrequencies.batchCategory=
tutti.editSpeciesFrequencies.batchCategoryValue=
tutti.editSpeciesFrequencies.batchSpecies=
+tutti.editSpeciesFrequencies.error.length.doublon=
tutti.editSpeciesFrequencies.field.lengthStepCaracteristic=
tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.tip=
tutti.editSpeciesFrequencies.field.maxStep=
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 2013-05-23 11:35:53 UTC (rev 992)
+++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-23 12:27:49 UTC (rev 993)
@@ -162,7 +162,7 @@
tutti.createBenthosBatch.field.species=Espèce du lot
tutti.createBenthosBatch.field.species.tip=Espèce du lot
tutti.createBenthosBatch.title=Créer un lot
-tutti.createBenthosMelag.error.message=Erreur à la ligne %s : le lot n'a pas de poids de sous échantillon ni de poids dans les mensurations
+tutti.createBenthosMelag.error.message=Erreur à la ligne %s \: le lot n'a pas de poids de sous échantillon ni de poids dans les mensurations
tutti.createBenthosMelag.error.title=Erreur
tutti.createIndividualObservationBatch.action.addSpecies=...
tutti.createIndividualObservationBatch.action.addSpecies.mnemonic=.
@@ -217,7 +217,7 @@
tutti.createSpeciesMelag.action.validate=Valider
tutti.createSpeciesMelag.action.validate.mnemonic=V
tutti.createSpeciesMelag.action.validate.tip=Valider la création du MELAG
-tutti.createSpeciesMelag.error.message=Erreur à la ligne %s : le lot n'a pas de poids de sous échantillon ni de poids dans les mensurations
+tutti.createSpeciesMelag.error.message=Erreur à la ligne %s \: le lot n'a pas de poids de sous échantillon ni de poids dans les mensurations
tutti.createSpeciesMelag.error.title=Erreur
tutti.createSpeciesMelag.message=Combien pesait le MELAG (kg) ?
tutti.createSpeciesMelag.title=Poids du MELAG (kg)
@@ -384,6 +384,7 @@
tutti.editBenthosFrequencies.action.save.tip=Enregistrer les mensurations
tutti.editBenthosFrequencies.batchCategory=Catégorie
tutti.editBenthosFrequencies.batchSpecies=Espèce
+tutti.editBenthosFrequencies.error.length.doublon=La classe de taille <strong>%s</strong> est utilisée plusieurs fois (deuxième occurrence trouvée à la ligne <strong>%s</strong>), ce qui n'est pas autorisé.<hr/>Veuillez corriger cela pour pouvoir enregistrer les mensurations.
tutti.editBenthosFrequencies.field.lengthStepCaracteristic=Type de mesure
tutti.editBenthosFrequencies.field.lengthStepCaracteristic.tip=Méthode de mensuration des individus
tutti.editBenthosFrequencies.field.maxStep=Classe max
@@ -886,6 +887,7 @@
tutti.editSpeciesFrequencies.action.save.tip=Enregistrer les mensurations
tutti.editSpeciesFrequencies.batchCategory=Catégorie
tutti.editSpeciesFrequencies.batchSpecies=Espèce
+tutti.editSpeciesFrequencies.error.length.doublon=La classe de taille <strong>%s</strong> est utilisée plusieurs fois (deuxième occurrence trouvée à la ligne <strong>%s</strong>), ce qui n'est pas autorisé.<hr/>Veuillez corriger cela pour pouvoir enregistrer les mensurations.
tutti.editSpeciesFrequencies.field.lengthStepCaracteristic=Type de mesure
tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.tip=Méthode de mensuration des individus
tutti.editSpeciesFrequencies.field.maxStep=Classe max
1
0
See <http://ci.nuiton.org/jenkins/job/tutti/815/changes>
Changes:
[Tony Chemit] fixes #2489: [IMPORT PUPITRI] lien à mettre sur un autre onglet
fix missing svn properties + license header
------------------------------------------
[...truncated 295 lines...]
-------------------------------------------------------
T E S T S
-------------------------------------------------------
Running fr.ifremer.tutti.service.BeanValidatorDetectorTest
2013-05-23 13:32:12,414 0 [main] INFO org.nuiton.validator.NuitonValidatorFactory - obtain validator provider xwork2
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.468 sec
Running fr.ifremer.tutti.service.ValidationServiceTest
2013-05-23 13:32:15,732 3318 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter org.nuiton.util.converter.URLConverter@2e32b816
2013-05-23 13:32:15,733 3319 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter org.nuiton.util.converter.URIConverter@4dd629db
2013-05-23 13:32:15,735 3321 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter org.nuiton.util.converter.VersionConverter@21276f0
2013-05-23 13:32:15,738 3324 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter org.nuiton.util.converter.LocaleConverter@6e66580
2013-05-23 13:32:15,840 3426 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.ValidationService@1c313f4e
2013-05-23 13:32:15,849 3435 [main] INFO org.nuiton.validator.NuitonValidatorFactory - Set the default provider name to xwork2
2013-05-23 13:32:16,309 3895 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.ValidationService@1c313f4e
2013-05-23 13:32:16,320 3906 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.ValidationService@6bfd1a10
2013-05-23 13:32:16,515 4101 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.ValidationService@6bfd1a10
2013-05-23 13:32:16,518 4104 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.ValidationService@7177533f
2013-05-23 13:32:16,910 4496 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.ValidationService@7177533f
Tests run: 4, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 1.207 sec
Running fr.ifremer.tutti.service.DecoratorServiceTest
2013-05-23 13:32:16,917 4503 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.DecoratorService@a12491c
2013-05-23 13:32:16,983 4569 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.DecoratorService@a12491c
2013-05-23 13:32:16,986 4572 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.DecoratorService@27f87600
2013-05-23 13:32:16,999 4585 [main] WARN org.nuiton.i18n.I18n -
I18n was not initialized! will init it with default initializer and default locale, it might not translate anything for you...
Please use the method I18n.init(I18nInitializer, Locale) before any calling to a translation...
2013-05-23 13:32:17,216 4802 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@432dfa20, bundlePrefix:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-validator/2.6.12/nuiton-validator-2.6.12.jar!/i18n/nuiton-validator, size:1>
<I18nBundleEntry@22fe44d4, locale:es_ES, scope FULL, path:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-validator/2.6.12/nuiton-validator-2.6.12.jar!/i18n/nuiton-validator_es_ES.properties>
2013-05-23 13:32:17,217 4803 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@432dfa20, bundlePrefix:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-validator/2.6.12/nuiton-validator-2.6.12.jar!/i18n/nuiton-validator, size:2>
<I18nBundleEntry@91861994, locale:fr_FR, scope FULL, path:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-validator/2.6.12/nuiton-validator-2.6.12.jar!/i18n/nuiton-validator_fr_FR.properties>
2013-05-23 13:32:17,217 4803 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@432dfa20, bundlePrefix:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-validator/2.6.12/nuiton-validator-2.6.12.jar!/i18n/nuiton-validator, size:3>
<I18nBundleEntry@bbef4342, locale:en_GB, scope FULL, path:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-validator/2.6.12/nuiton-validator-2.6.12.jar!/i18n/nuiton-validator_en_GB.properties>
2013-05-23 13:32:17,217 4803 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@7f806d54, bundlePrefix:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-csv/2.6.12/nuiton-csv-2.6.12.jar!/i18n/nuiton-csv, size:1>
<I18nBundleEntry@7eaf3b78, locale:fr_FR, scope FULL, path:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-csv/2.6.12/nuiton-csv-2.6.12.jar!/i18n/nuiton-csv_fr_FR.properties>
2013-05-23 13:32:17,217 4803 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@7f806d54, bundlePrefix:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-csv/2.6.12/nuiton-csv-2.6.12.jar!/i18n/nuiton-csv, size:2>
<I18nBundleEntry@a9186526, locale:en_GB, scope FULL, path:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-csv/2.6.12/nuiton-csv-2.6.12.jar!/i18n/nuiton-csv_en_GB.properties>
2013-05-23 13:32:17,217 4803 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@7f806d54, bundlePrefix:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-csv/2.6.12/nuiton-csv-2.6.12.jar!/i18n/nuiton-csv, size:3>
<I18nBundleEntry@102766b8, locale:es_ES, scope FULL, path:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-csv/2.6.12/nuiton-csv-2.6.12.jar!/i18n/nuiton-csv_es_ES.properties>
2013-05-23 13:32:17,218 4804 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@4889e731, bundlePrefix:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-config/2.6.12/nuiton-config-2.6.12.jar!/i18n/nuiton-config, size:1>
<I18nBundleEntry@5b30d5d0, locale:es_ES, scope FULL, path:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-config/2.6.12/nuiton-config-2.6.12.jar!/i18n/nuiton-config_es_ES.properties>
2013-05-23 13:32:17,218 4804 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@4889e731, bundlePrefix:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-config/2.6.12/nuiton-config-2.6.12.jar!/i18n/nuiton-config, size:2>
<I18nBundleEntry@c9b8aa90, locale:fr_FR, scope FULL, path:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-config/2.6.12/nuiton-config-2.6.12.jar!/i18n/nuiton-config_fr_FR.properties>
2013-05-23 13:32:17,218 4804 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@4889e731, bundlePrefix:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-config/2.6.12/nuiton-config-2.6.12.jar!/i18n/nuiton-config, size:3>
<I18nBundleEntry@f421d43e, locale:en_GB, scope FULL, path:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-config/2.6.12/nuiton-config-2.6.12.jar!/i18n/nuiton-config_en_GB.properties>
2013-05-23 13:32:17,218 4804 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@55a9672b, bundlePrefix:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-utils/2.6.12/nuiton-utils-2.6.12.jar!/i18n/nuiton-utils, size:1>
<I18nBundleEntry@b447fcc5, locale:en_GB, scope FULL, path:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-utils/2.6.12/nuiton-utils-2.6.12.jar!/i18n/nuiton-utils_en_GB.properties>
2013-05-23 13:32:17,218 4804 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@55a9672b, bundlePrefix:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-utils/2.6.12/nuiton-utils-2.6.12.jar!/i18n/nuiton-utils, size:2>
<I18nBundleEntry@89ded317, locale:fr_FR, scope FULL, path:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-utils/2.6.12/nuiton-utils-2.6.12.jar!/i18n/nuiton-utils_fr_FR.properties>
2013-05-23 13:32:17,219 4805 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@55a9672b, bundlePrefix:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-utils/2.6.12/nuiton-utils-2.6.12.jar!/i18n/nuiton-utils, size:3>
<I18nBundleEntry@1b56fe57, locale:es_ES, scope FULL, path:jar:file:/var/local/maven/data/repository/org/nuiton/nuiton-utils/2.6.12/nuiton-utils-2.6.12.jar!/i18n/nuiton-utils_es_ES.properties>
2013-05-23 13:32:17,219 4805 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@64b463fc, bundlePrefix:jar:<http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/target/t…,> size:1>
<I18nBundleEntry@c86b0cd7, locale:en_GB, scope FULL, path:jar:<http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/target/t…>>
2013-05-23 13:32:17,219 4805 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@64b463fc, bundlePrefix:jar:<http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/target/t…,> size:2>
<I18nBundleEntry@9e01e329, locale:fr_FR, scope FULL, path:jar:<http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/target/t…>>
2013-05-23 13:32:17,219 4805 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@7f10690a, bundlePrefix:<http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/target/class…,> size:1>
<I18nBundleEntry@83902fbd, locale:fr_FR, scope FULL, path:<http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/target/class…>>
2013-05-23 13:32:17,219 4805 [main] INFO org.nuiton.i18n.bundle.I18nBundle - <I18nBundle@7f10690a, bundlePrefix:<http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/target/class…,> size:2>
<I18nBundleEntry@adf9596b, locale:en_GB, scope FULL, path:<http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/target/class…>>
2013-05-23 13:32:17,220 4806 [main] INFO org.nuiton.i18n.init.I18nInitializer - 6 bundle(s) found, in 16 file(s).
2013-05-23 13:32:17,220 4806 [main] INFO org.nuiton.i18n.I18nStore - 6 bundle(s) found, [16 file(s)].
2013-05-23 13:32:17,222 4808 [main] INFO org.nuiton.i18n.I18nLanguage - Encoding UTF-8 will be used to load files
2013-05-23 13:32:17,231 4817 [main] INFO org.nuiton.i18n.I18nStore - I18nLanguage <locale: en_GB, nbStences:351>, nbEntries: 6, nbSentences: 351.
2013-05-23 13:32:17,232 4818 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.DecoratorService@27f87600
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.323 sec
Running fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportServiceTest
2013-05-23 13:32:17,242 4828 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@5001b9f5
2013-05-23 13:32:17,248 4834 [main] INFO fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService - Will export species to file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/target/suref…>
2013-05-23 13:32:17,256 4842 [main] INFO org.nuiton.util.beans.BinderFactory - No binder model found for <fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol - fr.ifremer.tutti.service.protocol.SpeciesRow > [null] , will create a new default one.
2013-05-23 13:32:17,301 4887 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@5001b9f5
2013-05-23 13:32:17,303 4889 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@409e01de
2013-05-23 13:32:17,359 4945 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@409e01de
2013-05-23 13:32:17,362 4948 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@7099c91f
2013-05-23 13:32:17,362 4948 [main] INFO fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService - Will export all caracteristics to file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/target/suref…>
2013-05-23 13:32:17,368 4954 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@7099c91f
2013-05-23 13:32:17,371 4957 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@52526599
2013-05-23 13:32:17,378 4964 [main] INFO fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService - Will import protocol [null] species from file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/target/suref…>
2013-05-23 13:32:17,386 4972 [main] INFO org.nuiton.util.beans.BinderFactory - No binder model found for <fr.ifremer.tutti.service.protocol.SpeciesRow - fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol > [null] , will create a new default one.
2013-05-23 13:32:17,390 4976 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@52526599
2013-05-23 13:32:17,392 4978 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@2b462811
2013-05-23 13:32:17,447 5033 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@2b462811
2013-05-23 13:32:17,449 5035 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@2f29608e
2013-05-23 13:32:17,450 5036 [main] INFO fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService - Will export benthos to file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/target/suref…>
2013-05-23 13:32:17,453 5039 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@2f29608e
2013-05-23 13:32:17,455 5041 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@458222d2
2013-05-23 13:32:17,456 5042 [main] INFO fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService - Will import protocol [null] species from file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/target/suref…>
2013-05-23 13:32:17,458 5044 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@458222d2
2013-05-23 13:32:17,461 5047 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@62bc2ca4
2013-05-23 13:32:17,461 5047 [main] INFO fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService - Will export all caracteristics to file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/target/suref…>
2013-05-23 13:32:17,463 5049 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@62bc2ca4
2013-05-23 13:32:17,465 5051 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - New service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@3016f5a0
2013-05-23 13:32:17,466 5052 [main] INFO fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService - Will import protocol caracteristic from file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/target/suref…>
2013-05-23 13:32:17,488 5074 [main] INFO fr.ifremer.tutti.service.TuttiServiceContext - Close service fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService@3016f5a0
Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.25 sec
Running fr.ifremer.tutti.service.referential.TuttiReferentialImportExportServiceTest
2013-05-23 13:32:17,501 5087 [main] INFO fr.ifremer.tutti.service.PersistenceService - Open persistence service
2013-05-23 13:32:17,504 5090 [main] INFO fr.ifremer.tutti.service.PersistenceService - Persistence driver *Mock persistence service implementation* opened.
2013-05-23 13:32:17,510 5096 [main] INFO fr.ifremer.tutti.service.PersistenceService - Open persistence service
2013-05-23 13:32:17,510 5096 [main] INFO fr.ifremer.tutti.service.PersistenceService - Persistence driver *Mock persistence service implementation* opened.
2013-05-23 13:32:17,511 5097 [main] INFO fr.ifremer.tutti.service.referential.TuttiReferentialImportExportService - Will import persons from file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/target/suref…>
2013-05-23 13:32:17,512 5098 [main] INFO org.nuiton.util.beans.BinderFactory - No binder model found for <fr.ifremer.tutti.persistence.entities.referential.Person - fr.ifremer.tutti.persistence.entities.referential.Person > [null] , will create a new default one.
2013-05-23 13:32:17,516 5102 [main] INFO fr.ifremer.tutti.service.PersistenceService - Open persistence service
2013-05-23 13:32:17,517 5103 [main] INFO fr.ifremer.tutti.service.PersistenceService - Persistence driver *Mock persistence service implementation* opened.
2013-05-23 13:32:17,517 5103 [main] INFO fr.ifremer.tutti.service.referential.TuttiReferentialImportExportService - Will import vessels from file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/target/suref…>
2013-05-23 13:32:17,535 5121 [main] INFO org.nuiton.util.beans.BinderFactory - No binder model found for <fr.ifremer.tutti.persistence.entities.referential.Vessel - fr.ifremer.tutti.persistence.entities.referential.Vessel > [null] , will create a new default one.
2013-05-23 13:32:17,538 5124 [main] INFO fr.ifremer.tutti.service.PersistenceService - Open persistence service
2013-05-23 13:32:17,539 5125 [main] INFO fr.ifremer.tutti.service.PersistenceService - Persistence driver *Mock persistence service implementation* opened.
2013-05-23 13:32:17,545 5131 [main] INFO fr.ifremer.tutti.service.PersistenceService - Open persistence service
2013-05-23 13:32:17,545 5131 [main] INFO fr.ifremer.tutti.service.PersistenceService - Persistence driver *Mock persistence service implementation* opened.
2013-05-23 13:32:17,548 5134 [main] INFO fr.ifremer.tutti.service.PersistenceService - Open persistence service
2013-05-23 13:32:17,548 5134 [main] INFO fr.ifremer.tutti.service.PersistenceService - Persistence driver *Mock persistence service implementation* opened.
2013-05-23 13:32:17,554 5140 [main] INFO fr.ifremer.tutti.service.PersistenceService - Open persistence service
2013-05-23 13:32:17,554 5140 [main] INFO fr.ifremer.tutti.service.PersistenceService - Persistence driver *Mock persistence service implementation* opened.
2013-05-23 13:32:17,554 5140 [main] INFO fr.ifremer.tutti.service.referential.TuttiReferentialImportExportService - Will import species from file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/target/suref…>
2013-05-23 13:32:17,558 5144 [main] INFO org.nuiton.util.beans.BinderFactory - No binder model found for <fr.ifremer.tutti.persistence.entities.referential.Species - fr.ifremer.tutti.persistence.entities.referential.Species > [null] , will create a new default one.
2013-05-23 13:32:17,561 5147 [main] INFO fr.ifremer.tutti.service.PersistenceService - Open persistence service
2013-05-23 13:32:17,561 5147 [main] INFO fr.ifremer.tutti.service.PersistenceService - Persistence driver *Mock persistence service implementation* opened.
2013-05-23 13:32:17,562 5148 [main] INFO fr.ifremer.tutti.service.referential.TuttiReferentialImportExportService - Will import gears from file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/target/suref…>
2013-05-23 13:32:17,564 5150 [main] INFO org.nuiton.util.beans.BinderFactory - No binder model found for <fr.ifremer.tutti.persistence.entities.referential.Gear - fr.ifremer.tutti.persistence.entities.referential.Gear > [null] , will create a new default one.
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.079 sec
Running fr.ifremer.tutti.service.export.TuttiExportServiceTest
2013-05-23 13:32:17,578 5164 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/dbCGFS, test [class fr.ifremer.tutti.service.export.TuttiExportServiceTest] is skipped.
Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.012 sec
Results :
Tests run: 28, Failures: 0, Errors: 0, Skipped: 2
[JENKINS] Recording test results
[INFO]
[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ tutti-service ---
[INFO] Building jar: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/target/tutti…>
[INFO]
[INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ tutti-service ---
[INFO] Installing <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/target/tutti…> to /var/local/maven/data/repository/fr/ifremer/tutti/tutti-service/2.3-SNAPSHOT/tutti-service-2.3-SNAPSHOT.jar
[INFO]
[INFO] --- maven-install-plugin:2.4:install (default-install) @ tutti-service ---
[INFO] Installing <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/pom.xml> to /var/local/maven/data/repository/fr/ifremer/tutti/tutti-service/2.3-SNAPSHOT/tutti-service-2.3-SNAPSHOT.pom
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] Building Tutti :: UI 2.3-SNAPSHOT
[INFO] ------------------------------------------------------------------------
Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja…
Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ma…
Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 18.0 KB/sec)
Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ma… (2 KB at 14.2 KB/sec)
Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/2.…
Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/2.5.20-…
Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/2.5.20-… (808 B at 21.9 KB/sec)
Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/2.… (808 B at 17.5 KB/sec)
Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/mavenpo…
Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/mavenpom4red…
Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/mavenpom4red… (615 B at 15.4 KB/sec)
Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/mavenpo… (615 B at 8.0 KB/sec)
Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja…
Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ru…
Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 31.2 KB/sec)
Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ru… (2 KB at 22.6 KB/sec)
Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co…
Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja…
Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 26.9 KB/sec)
Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… (2 KB at 26.0 KB/sec)
Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-wi…
Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja…
Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 36.9 KB/sec)
Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-wi… (2 KB at 34.2 KB/sec)
Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-va…
Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja…
Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-va… (2 KB at 48.9 KB/sec)
Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 44.8 KB/sec)
[INFO]
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ tutti-ui-swing ---
[INFO] Deleting <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/target>
[INFO]
[INFO] --- maven-enforcer-plugin:1.2:enforce (check-project-files) @ tutti-ui-swing ---
[INFO]
[INFO] --- jaxx-maven-plugin:2.5.20-SNAPSHOT:generate (default) @ tutti-ui-swing ---
Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja…
Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co…
Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 22.3 KB/sec)
Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… (2 KB at 19.0 KB/sec)
[INFO] use project compile scope class-path
[INFO] Detects 41 modified jaxx file(s).
[ERROR] JAXX detects 1 error :
<http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/src/main/ja…>:117
: Invalid XML: The markup in the document following the root element must be well-formed.
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary:
[INFO]
[INFO] Tutti ............................................. SUCCESS [8.034s]
[INFO] Tutti :: Persistence .............................. SUCCESS [24.898s]
[INFO] Tutti :: Service .................................. SUCCESS [10.802s]
[INFO] Tutti :: UI ....................................... FAILURE [19.519s]
[INFO] ------------------------------------------------------------------------
[INFO] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 1:05.455s
[INFO] Finished at: Thu May 23 13:32:37 CEST 2013
[INFO] Final Memory: 48M/143M
[INFO] ------------------------------------------------------------------------
[JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-service/builds/2013-05-23_13-31-27/archive/fr.ifremer.tutti/tutti-service/2.3-SNAPSHOT/tutti-service-2.3-SNAPSHOT.pom
[JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/target/tutti…> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-service/builds/2013-05-23_13-31-27/archive/fr.ifremer.tutti/tutti-service/2.3-SNAPSHOT/tutti-service-2.3-SNAPSHOT.jar
[JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-ui-swing/builds/2013-05-23_13-31-27/archive/fr.ifremer.tutti/tutti-ui-swing/2.3-SNAPSHOT/tutti-ui-swing-2.3-SNAPSHOT.pom
[JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer$tutti/builds/2013-05-23_13-31-27/archive/fr.ifremer/tutti/2.3-SNAPSHOT/tutti-2.3-SNAPSHOT.pom
[JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/target/tutti-2.3-SNAPSHOT-…> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer$tutti/builds/2013-05-23_13-31-27/archive/fr.ifremer/tutti/2.3-SNAPSHOT/tutti-2.3-SNAPSHOT-site_fr.xml
[JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-persistence/builds/2013-05-23_13-31-27/archive/fr.ifremer.tutti/tutti-persistence/2.3-SNAPSHOT/tutti-persistence-2.3-SNAPSHOT.pom
[JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/target/t…> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-persistence/builds/2013-05-23_13-31-27/archive/fr.ifremer.tutti/tutti-persistence/2.3-SNAPSHOT/tutti-persistence-2.3-SNAPSHOT.jar
Waiting for Jenkins to finish collecting data
mavenExecutionResult exceptions not empty
message : Failed to execute goal org.nuiton.jaxx:jaxx-maven-plugin:2.5.20-SNAPSHOT:generate (default) on project tutti-ui-swing: Aborting due to errors reported by jaxxc
cause : Aborting due to errors reported by jaxxc
Stack trace :
org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.nuiton.jaxx:jaxx-maven-plugin:2.5.20-SNAPSHOT:generate (default) on project tutti-ui-swing: Aborting due to errors reported by jaxxc
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:217)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59)
at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183)
at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:320)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:156)
at org.jvnet.hudson.maven3.launcher.Maven3Launcher.main(Maven3Launcher.java:79)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:601)
at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:329)
at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:239)
at org.jvnet.hudson.maven3.agent.Maven3Main.launch(Maven3Main.java:158)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:100)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:66)
at hudson.remoting.UserRequest.perform(UserRequest.java:118)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:326)
at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334)
at java.util.concurrent.FutureTask.run(FutureTask.java:166)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:722)
Caused by: org.apache.maven.plugin.MojoExecutionException: Aborting due to errors reported by jaxxc
at org.nuiton.jaxx.plugin.GenerateMojo.doAction(GenerateMojo.java:517)
at org.nuiton.plugin.AbstractPlugin.execute(AbstractPlugin.java:132)
at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:101)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:209)
... 27 more
Sending e-mails to: tutti-commits(a)list.forge.codelutin.com chemit(a)codelutin.com
channel stopped
1
4
23 May '13
See <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/815/…>
Changes:
[Tony Chemit] fixes #2489: [IMPORT PUPITRI] lien à mettre sur un autre onglet
fix missing svn properties + license header
------------------------------------------
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] Building Tutti :: UI 2.3-SNAPSHOT
[INFO] ------------------------------------------------------------------------
Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja…
Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ma…
Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 18.0 KB/sec)
Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ma… (2 KB at 14.2 KB/sec)
Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/2.…
Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/2.5.20-…
Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/2.5.20-… (808 B at 21.9 KB/sec)
Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/2.… (808 B at 17.5 KB/sec)
Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/mavenpo…
Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/mavenpom4red…
Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/mavenpom4red… (615 B at 15.4 KB/sec)
Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/mavenpo… (615 B at 8.0 KB/sec)
Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja…
Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ru…
Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 31.2 KB/sec)
Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ru… (2 KB at 22.6 KB/sec)
Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co…
Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja…
Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 26.9 KB/sec)
Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… (2 KB at 26.0 KB/sec)
Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-wi…
Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja…
Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 36.9 KB/sec)
Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-wi… (2 KB at 34.2 KB/sec)
Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-va…
Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja…
Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-va… (2 KB at 48.9 KB/sec)
Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 44.8 KB/sec)
[INFO]
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ tutti-ui-swing ---
[INFO] Deleting <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…>
[INFO]
[INFO] --- maven-enforcer-plugin:1.2:enforce (check-project-files) @ tutti-ui-swing ---
[INFO]
[INFO] --- jaxx-maven-plugin:2.5.20-SNAPSHOT:generate (default) @ tutti-ui-swing ---
Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja…
Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co…
Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 22.3 KB/sec)
Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… (2 KB at 19.0 KB/sec)
[INFO] use project compile scope class-path
[INFO] Detects 41 modified jaxx file(s).
[ERROR] JAXX detects 1 error :
<http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…>:117
: Invalid XML: The markup in the document following the root element must be well-formed.
1
4
r992 - trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export
by tchemit@users.forge.codelutin.com 23 May '13
by tchemit@users.forge.codelutin.com 23 May '13
23 May '13
Author: tchemit
Date: 2013-05-23 13:35:53 +0200 (Thu, 23 May 2013)
New Revision: 992
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/992
Log:
rename method
Modified:
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SpeciesExportModel.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SpeciesExportModel.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SpeciesExportModel.java 2013-05-23 11:28:29 UTC (rev 991)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/SpeciesExportModel.java 2013-05-23 11:35:53 UTC (rev 992)
@@ -37,8 +37,8 @@
}
}
- public void prepareIndividualRowsRows(TuttiExportService.ExportContext exportContext,
- List<IndividualObservationExportRow> rows) {
+ public void prepareIndividualRows(TuttiExportService.ExportContext exportContext,
+ List<IndividualObservationExportRow> rows) {
for (IndividualObservationExportRow row : rows) {
exportContext.addSpecies(row.getSpecies());
}
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-05-23 11:28:29 UTC (rev 991)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-05-23 11:35:53 UTC (rev 992)
@@ -445,7 +445,7 @@
}
List<IndividualObservationExportRow> rows = Lists.newArrayList();
exportContext.individualObservationModel.prepareRows(persistenceService, rows, cruise, operation);
- exportContext.speciesModel.prepareIndividualRowsRows(
+ exportContext.speciesModel.prepareIndividualRows(
exportContext,
rows);
exportContext.individualObservationExport.write(rows, exportContext.individualObservationWriter);
@@ -726,13 +726,6 @@
speciesExport = TuttiCsvUtil.newRepeatableExport(speciesModel);
}
- protected void addSpecies(Species species) {
- Species fullSpecies = speciesById.get(species.getId());
- SpeciesExportRow row = new SpeciesExportRow();
- row.setSpecies(fullSpecies);
- speciesToExport.add(row);
- }
-
@Override
public void close() throws IOException {
IOUtils.closeQuietly(surveyWriter);
@@ -745,6 +738,13 @@
IOUtils.closeQuietly(speciesWriter);
}
+ public void addSpecies(Species species) {
+ Species fullSpecies = speciesById.get(species.getId());
+ SpeciesExportRow row = new SpeciesExportRow();
+ row.setSpecies(fullSpecies);
+ speciesToExport.add(row);
+ }
+
public List<SpeciesExportRow> getSpeciesToExport() {
List<SpeciesExportRow> result =
Lists.newArrayList(speciesToExport);
1
0