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
r341 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content/operation/catches/species java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split java/fr/ifremer/tutti/ui/swing/util/table resources/i18n
by kmorin@users.forge.codelutin.com 05 Feb '13
by kmorin@users.forge.codelutin.com 05 Feb '13
05 Feb '13
Author: kmorin
Date: 2013-02-05 22:53:25 +0100 (Tue, 05 Feb 2013)
New Revision: 341
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/341
Log:
refs #1936 [CAPTURE] - Esp?\195?\168ce - pouvoir changer le nom d'une esp?\195?\168ce
Added:
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUI.css
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUI.jaxx
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUIHandler.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUIModel.java
Removed:
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesUI.css
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesUI.jaxx
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesUIHandler.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesUIModel.java
Modified:
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RenameSpeciesBatchAction.java
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/split/AddSpeciesAction.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java
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/species/RenameSpeciesBatchAction.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RenameSpeciesBatchAction.java 2013-02-05 20:06:05 UTC (rev 340)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RenameSpeciesBatchAction.java 2013-02-05 21:53:25 UTC (rev 341)
@@ -24,6 +24,8 @@
* #L%
*/
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
import fr.ifremer.tutti.persistence.TuttiPersistence;
import fr.ifremer.tutti.persistence.entities.referential.Species;
import fr.ifremer.tutti.service.PersistenceService;
@@ -32,7 +34,11 @@
import org.apache.commons.logging.LogFactory;
import java.awt.event.ActionEvent;
+import java.util.HashSet;
import java.util.List;
+import javax.swing.JDialog;
+import javax.swing.JOptionPane;
+import org.jdesktop.swingx.JXTable;
import static org.nuiton.i18n.I18n._;
@@ -48,9 +54,9 @@
/** Logger. */
private static final Log log = LogFactory.getLog(RenameSpeciesBatchAction.class);
+
+ protected Species selectedSpecies;
- protected List<Species> allSpecies;
-
public RenameSpeciesBatchAction(SpeciesBatchUIHandler handler) {
super(handler,
"renameSpeciesBatch",
@@ -59,17 +65,34 @@
_("tutti.action.renameSpeciesBatch.tip"),
false
);
+
+ }
- TuttiPersistence persistenceService =
- getContext().getService(PersistenceService.class);
- allSpecies = persistenceService.getAllSpecies();
+ @Override
+ protected boolean prepareAction(ActionEvent event) {
+ boolean result = super.prepareAction(event);
+
+ SpeciesBatchUIHandler handler = getHandler();
+ SpeciesBatchUIModel model = handler.getModel();
+ List<Species> speciesList = Lists.newArrayList(model.getAllSpecies());
+ speciesList.removeAll(Sets.newHashSet(model.getSpeciesUsed().values()));
+
+ selectedSpecies = getHandler().openAddSpeciesDialog(_("tutti.title.selectSpecies"), speciesList);
+
+ result &= selectedSpecies != null;
+ return result;
}
@Override
protected void doAction(ActionEvent event) {
SpeciesBatchUIHandler handler = getHandler();
-
- // TODO
+
+ SpeciesBatchTableModel tableModel = handler.getTableModel();
+ JXTable table = handler.getTable();
+ SpeciesBatchRowModel row = tableModel.getEntry(table.getSelectedRow());
+
+ PersistenceService persistenceService = getContext().getService(PersistenceService.class);
+ persistenceService.changeSpeciesBatchSpecies(row.getId(), selectedSpecies);
}
}
Copied: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUI.css (from rev 339, trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesUI.css)
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUI.css (rev 0)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUI.css 2013-02-05 21:53:25 UTC (rev 341)
@@ -0,0 +1,31 @@
+/*
+ * #%L
+ * Tutti :: UI
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2012 - 2013 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/gpl-3.0.html>.
+ * #L%
+ */
+#speciesCombo {
+ showReset: true;
+ i18nPrefix: "tutti.property.";
+ bean: {model};
+ property: selectedSpecies;
+ selectedItem: {model.getSelectedSpecies()};
+ data: {model.getSpecies()};
+}
\ No newline at end of file
Copied: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUI.jaxx (from rev 339, trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesUI.jaxx)
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUI.jaxx (rev 0)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUI.jaxx 2013-02-05 21:53:25 UTC (rev 341)
@@ -0,0 +1,61 @@
+<!--
+ #%L
+ Tutti :: UI
+ $Id$
+ $HeadURL$
+ %%
+ Copyright (C) 2012 - 2013 Ifremer
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public
+ License along with this program. If not, see
+ <http://www.gnu.org/licenses/gpl-3.0.html>.
+ #L%
+ -->
+<JPanel layout='{new BorderLayout()}' id='selectSpeciesPopup'
+ implements='fr.ifremer.tutti.ui.swing.TuttiUI<SelectSpeciesUIModel, SelectSpeciesUIHandler>'>
+
+ <import>
+ fr.ifremer.tutti.persistence.entities.referential.Species
+ fr.ifremer.tutti.ui.swing.TuttiUI
+ jaxx.runtime.swing.editor.bean.BeanComboBox
+ </import>
+
+ <script><![CDATA[
+
+public SelectSpeciesUI(TuttiUI parentUI) {
+ JAXXUtil.initContext(this, parentUI);
+ SelectSpeciesUIHandler handler = new SelectSpeciesUIHandler(parentUI, this);
+ setContextValue(handler);
+ handler.beforeInitUI();
+}
+
+protected void $afterCompleteSetup() { handler.afterInitUI(); }
+ ]]></script>
+
+ <SelectSpeciesUIHandler id='handler'
+ initializer='getContextValue(SelectSpeciesUIHandler.class)'/>
+
+ <SelectSpeciesUIModel id='model'
+ initializer='getContextValue(SelectSpeciesUIModel.class)'/>
+
+ <BeanComboBox id='speciesCombo' constraints='BorderLayout.CENTER'
+ constructorParams='this' genericType='Species'/>
+
+ <JPanel layout='{new GridLayout(1, 0)}' constraints='BorderLayout.SOUTH'>
+ <JButton id='cancelButton' text='tutti.action.cancel'
+ onActionPerformed='model.setSelectedSpecies(null); handler.closeDialog(this)'/>
+ <JButton id='validateButton' text='tutti.action.validate'
+ onActionPerformed='handler.closeDialog(this)'/>
+ </JPanel>
+
+</JPanel>
\ No newline at end of file
Copied: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUIHandler.java (from rev 339, trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesUIHandler.java)
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUIHandler.java (rev 0)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUIHandler.java 2013-02-05 21:53:25 UTC (rev 341)
@@ -0,0 +1,84 @@
+
+package fr.ifremer.tutti.ui.swing.content.operation.catches.species;
+
+/*
+ * #%L
+ * Tutti :: UI
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2012 - 2013 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/gpl-3.0.html>.
+ * #L%
+ */
+
+import com.google.common.collect.Lists;
+import fr.ifremer.tutti.persistence.entities.referential.Species;
+import fr.ifremer.tutti.ui.swing.AbstractTuttiUIHandler;
+import fr.ifremer.tutti.ui.swing.TuttiUI;
+import fr.ifremer.tutti.ui.swing.content.operation.catches.species.split.CreateSpeciesBatchUI;
+import jaxx.runtime.validator.swing.SwingValidator;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * @author kmorin <kmorin(a)codelutin.com>
+ * @since 1.0
+ */
+public class SelectSpeciesUIHandler extends AbstractTuttiUIHandler<SelectSpeciesUIModel> {
+
+ private static final Log log = LogFactory.getLog(SelectSpeciesUIHandler.class);
+
+ protected SelectSpeciesUI ui;
+
+ public SelectSpeciesUIHandler(TuttiUI parentUI, SelectSpeciesUI ui) {
+ super(parentUI.getHandler().getContext());
+ this.ui = ui;
+ }
+
+ @Override
+ public void beforeInitUI() {
+ SelectSpeciesUIModel model = new SelectSpeciesUIModel();
+ ui.setContextValue(model);
+ }
+
+ @Override
+ public void afterInitUI() {
+ initUI(ui);
+
+ initBeanComboBox(ui.getSpeciesCombo(),
+ Lists.<Species>newArrayList(),
+ null);
+ }
+
+ @Override
+ public void onCloseUI() {
+ if (log.isInfoEnabled()) {
+ log.info("Closing: " + ui);
+ }
+ }
+
+ @Override
+ public SelectSpeciesUIModel getModel() {
+ return ui.getModel();
+ }
+
+ @Override
+ public SwingValidator<SelectSpeciesUIModel> getValidator() {
+ return null;
+ }
+
+}
Copied: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUIModel.java (from rev 339, trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesUIModel.java)
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUIModel.java (rev 0)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUIModel.java 2013-02-05 21:53:25 UTC (rev 341)
@@ -0,0 +1,72 @@
+
+package fr.ifremer.tutti.ui.swing.content.operation.catches.species;
+
+/*
+ * #%L
+ * Tutti :: UI
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2012 - 2013 Ifremer
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/gpl-3.0.html>.
+ * #L%
+ */
+
+import com.google.common.collect.Lists;
+import fr.ifremer.tutti.persistence.entities.referential.Species;
+import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel;
+
+import java.util.List;
+
+/**
+ * @author kmorin <kmorin(a)codelutin.com>
+ * @since 1.0
+ */
+public class SelectSpeciesUIModel extends AbstractTuttiBeanUIModel<SelectSpeciesUIModel, SelectSpeciesUIModel> {
+
+ public static final String PROPERTY_SPECIES = "species";
+
+ public static final String PROPERTY_SELECTED_SPECIES = "selectedSpecies";
+
+ protected List<Species> species = Lists.newArrayList();
+
+ protected Species selectedSpecies;
+
+ public SelectSpeciesUIModel() {
+ super(SelectSpeciesUIModel.class, null, null);
+ }
+
+ public List<Species> getSpecies() {
+ return species;
+ }
+
+ public void setSpecies(List<Species> species) {
+ Object oldValue = getSpecies();
+ this.species = Lists.newArrayList(species);
+ firePropertyChange(PROPERTY_SPECIES, oldValue, this.species);
+ }
+
+ public Species getSelectedSpecies() {
+ return selectedSpecies;
+ }
+
+ public void setSelectedSpecies(Species selectedSpecies) {
+ Object oldValue = getSelectedSpecies();
+ this.selectedSpecies = selectedSpecies;
+ firePropertyChange(PROPERTY_SELECTED_SPECIES, oldValue, selectedSpecies);
+ }
+
+}
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-02-05 20:06:05 UTC (rev 340)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-02-05 21:53:25 UTC (rev 341)
@@ -60,6 +60,7 @@
import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier;
import java.awt.Color;
import java.awt.Component;
+import java.awt.Dimension;
import jaxx.runtime.JAXXUtil;
import jaxx.runtime.SwingUtil;
import jaxx.runtime.context.JAXXContextEntryDef;
@@ -1162,4 +1163,14 @@
model.setRootNumber(model.getRootNumber() + 1);
}
+ public Species openAddSpeciesDialog(String title, List<Species> species) {
+ SelectSpeciesUI dialog = new SelectSpeciesUI(ui);
+ SelectSpeciesUIModel model = dialog.getModel();
+ model.setSelectedSpecies(null);
+ model.setSpecies(species);
+
+ openDialog(ui, dialog, title, new Dimension(400, 130));
+
+ return model.getSelectedSpecies();
+ }
}
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesAction.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesAction.java 2013-02-05 20:06:05 UTC (rev 340)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesAction.java 2013-02-05 21:53:25 UTC (rev 341)
@@ -53,6 +53,8 @@
private static final Log log = LogFactory.getLog(AddSpeciesAction.class);
protected List<Species> allSpecies;
+
+ protected Species selectedSpecies;
public AddSpeciesAction(CreateSpeciesBatchUIHandler handler) {
super(handler,
@@ -68,30 +70,29 @@
}
@Override
- protected void doAction(ActionEvent event) {
+ protected boolean prepareAction(ActionEvent event) {
+ boolean result = super.prepareAction(event);
CreateSpeciesBatchUIHandler handler = getHandler();
List<Species> availableSpecies = handler.getModel().getAvailableSpecies();
- final List<Species> species = Lists.newArrayList(allSpecies);
+ List<Species> species = Lists.newArrayList(allSpecies);
species.removeAll(availableSpecies);
+
+ selectedSpecies = getHandler().openAddSpeciesDialog(_("tutti.title.selectSpecies"), species);
+
+ result &= selectedSpecies != null;
+ return result;
+ }
- // open the popup asynchronously because the setVisible(true) method returns
- // only after setVisible(false) has been called and this prevents the loading to hide.
- SwingUtilities.invokeLater(new Runnable() {
- @Override
- public void run() {
- Species selectedSpecies = getHandler().openAddSpeciesDialog(_("tutti.title.createBatch"), species);
- if (species != null) {
- CreateSpeciesBatchUIHandler handler = getHandler();
- CreateSpeciesBatchUIModel model = handler.getModel();
+ @Override
+ protected void doAction(ActionEvent event) {
+ CreateSpeciesBatchUIHandler handler = getHandler();
+ CreateSpeciesBatchUIModel model = handler.getModel();
- List<Species> availableSpecies = Lists.newArrayList(model.getAvailableSpecies());
- availableSpecies.add(selectedSpecies);
- model.setAvailableSpecies(availableSpecies);
- model.setSpecies(selectedSpecies);
- }
- }
- });
+ List<Species> availableSpecies = Lists.newArrayList(model.getAvailableSpecies());
+ availableSpecies.add(selectedSpecies);
+ model.setAvailableSpecies(availableSpecies);
+ model.setSpecies(selectedSpecies);
}
}
Deleted: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesUI.css
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesUI.css 2013-02-05 20:06:05 UTC (rev 340)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesUI.css 2013-02-05 21:53:25 UTC (rev 341)
@@ -1,31 +0,0 @@
-/*
- * #%L
- * Tutti :: UI
- * $Id$
- * $HeadURL$
- * %%
- * Copyright (C) 2012 - 2013 Ifremer
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-#speciesCombo {
- showReset: true;
- i18nPrefix: "tutti.property.";
- bean: {model};
- property: selectedSpecies;
- selectedItem: {model.getSelectedSpecies()};
- data: {model.getSpecies()};
-}
\ No newline at end of file
Deleted: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesUI.jaxx
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesUI.jaxx 2013-02-05 20:06:05 UTC (rev 340)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesUI.jaxx 2013-02-05 21:53:25 UTC (rev 341)
@@ -1,60 +0,0 @@
-<!--
- #%L
- Tutti :: UI
- $Id$
- $HeadURL$
- %%
- Copyright (C) 2012 - 2013 Ifremer
- %%
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as
- published by the Free Software Foundation, either version 3 of the
- License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public
- License along with this program. If not, see
- <http://www.gnu.org/licenses/gpl-3.0.html>.
- #L%
- -->
-<JPanel layout='{new BorderLayout()}' id='addSpeciesPopup'
- implements='fr.ifremer.tutti.ui.swing.TuttiUI<AddSpeciesUIModel, AddSpeciesUIHandler>'>
-
- <import>
- fr.ifremer.tutti.persistence.entities.referential.Species
- jaxx.runtime.swing.editor.bean.BeanComboBox
- </import>
-
- <script><![CDATA[
-
-public AddSpeciesUI(CreateSpeciesBatchUI parentUI) {
- JAXXUtil.initContext(this, parentUI);
- AddSpeciesUIHandler handler = new AddSpeciesUIHandler(parentUI, this);
- setContextValue(handler);
- handler.beforeInitUI();
-}
-
-protected void $afterCompleteSetup() { handler.afterInitUI(); }
- ]]></script>
-
- <AddSpeciesUIHandler id='handler'
- initializer='getContextValue(AddSpeciesUIHandler.class)'/>
-
- <AddSpeciesUIModel id='model'
- initializer='getContextValue(AddSpeciesUIModel.class)'/>
-
- <BeanComboBox id='speciesCombo' constraints='BorderLayout.CENTER'
- constructorParams='this' genericType='Species'/>
-
- <JPanel layout='{new GridLayout(1, 0)}' constraints='BorderLayout.SOUTH'>
- <JButton id='cancelButton' text='tutti.action.cancel'
- onActionPerformed='model.setSelectedSpecies(null); handler.closeDialog(this)'/>
- <JButton id='validateButton' text='tutti.action.validate'
- onActionPerformed='handler.closeDialog(this)'/>
- </JPanel>
-
-</JPanel>
\ No newline at end of file
Deleted: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesUIHandler.java 2013-02-05 20:06:05 UTC (rev 340)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesUIHandler.java 2013-02-05 21:53:25 UTC (rev 341)
@@ -1,82 +0,0 @@
-
-package fr.ifremer.tutti.ui.swing.content.operation.catches.species.split;
-
-/*
- * #%L
- * Tutti :: UI
- * $Id$
- * $HeadURL$
- * %%
- * Copyright (C) 2012 - 2013 Ifremer
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-
-import com.google.common.collect.Lists;
-import fr.ifremer.tutti.persistence.entities.referential.Species;
-import fr.ifremer.tutti.ui.swing.AbstractTuttiUIHandler;
-import jaxx.runtime.validator.swing.SwingValidator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * @author kmorin <kmorin(a)codelutin.com>
- * @since 1.0
- */
-public class AddSpeciesUIHandler extends AbstractTuttiUIHandler<AddSpeciesUIModel> {
-
- private static final Log log = LogFactory.getLog(AddSpeciesUIHandler.class);
-
- protected AddSpeciesUI ui;
-
- public AddSpeciesUIHandler(CreateSpeciesBatchUI parentUI, AddSpeciesUI ui) {
- super(parentUI.getHandler().getContext());
- this.ui = ui;
- }
-
- @Override
- public void beforeInitUI() {
- AddSpeciesUIModel model = new AddSpeciesUIModel();
- ui.setContextValue(model);
- }
-
- @Override
- public void afterInitUI() {
- initUI(ui);
-
- initBeanComboBox(ui.getSpeciesCombo(),
- Lists.<Species>newArrayList(),
- null);
- }
-
- @Override
- public void onCloseUI() {
- if (log.isInfoEnabled()) {
- log.info("Closing: " + ui);
- }
- }
-
- @Override
- public AddSpeciesUIModel getModel() {
- return ui.getModel();
- }
-
- @Override
- public SwingValidator<AddSpeciesUIModel> getValidator() {
- return null;
- }
-
-}
Deleted: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesUIModel.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesUIModel.java 2013-02-05 20:06:05 UTC (rev 340)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesUIModel.java 2013-02-05 21:53:25 UTC (rev 341)
@@ -1,72 +0,0 @@
-
-package fr.ifremer.tutti.ui.swing.content.operation.catches.species.split;
-
-/*
- * #%L
- * Tutti :: UI
- * $Id$
- * $HeadURL$
- * %%
- * Copyright (C) 2012 - 2013 Ifremer
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-
-import com.google.common.collect.Lists;
-import fr.ifremer.tutti.persistence.entities.referential.Species;
-import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel;
-
-import java.util.List;
-
-/**
- * @author kmorin <kmorin(a)codelutin.com>
- * @since 1.0
- */
-public class AddSpeciesUIModel extends AbstractTuttiBeanUIModel<AddSpeciesUIModel, AddSpeciesUIModel> {
-
- public static final String PROPERTY_SPECIES = "species";
-
- public static final String PROPERTY_SELECTED_SPECIES = "selectedSpecies";
-
- protected List<Species> species = Lists.newArrayList();
-
- protected Species selectedSpecies;
-
- public AddSpeciesUIModel() {
- super(AddSpeciesUIModel.class, null, null);
- }
-
- public List<Species> getSpecies() {
- return species;
- }
-
- public void setSpecies(List<Species> species) {
- Object oldValue = getSpecies();
- this.species = Lists.newArrayList(species);
- firePropertyChange(PROPERTY_SPECIES, oldValue, this.species);
- }
-
- public Species getSelectedSpecies() {
- return selectedSpecies;
- }
-
- public void setSelectedSpecies(Species selectedSpecies) {
- Object oldValue = getSelectedSpecies();
- this.selectedSpecies = selectedSpecies;
- firePropertyChange(PROPERTY_SELECTED_SPECIES, oldValue, selectedSpecies);
- }
-
-}
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java 2013-02-05 20:06:05 UTC (rev 340)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java 2013-02-05 21:53:25 UTC (rev 341)
@@ -24,6 +24,7 @@
* #L%
*/
+import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SelectSpeciesUIModel;
import com.google.common.collect.Lists;
import com.google.common.collect.Multimap;
import fr.ifremer.tutti.persistence.TuttiPersistence;
@@ -36,6 +37,7 @@
import fr.ifremer.tutti.ui.swing.TuttiUI;
import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI;
import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler;
+import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SelectSpeciesUI;
import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIModel;
import fr.ifremer.tutti.ui.swing.util.Cancelable;
import jaxx.runtime.SwingUtil;
@@ -255,8 +257,8 @@
}
public Species openAddSpeciesDialog(String title, List<Species> species) {
- AddSpeciesUI dialog = new AddSpeciesUI(ui);
- AddSpeciesUIModel model = dialog.getModel();
+ SelectSpeciesUI dialog = new SelectSpeciesUI(ui);
+ SelectSpeciesUIModel model = dialog.getModel();
model.setSelectedSpecies(null);
model.setSpecies(species);
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2013-02-05 20:06:05 UTC (rev 340)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2013-02-05 21:53:25 UTC (rev 341)
@@ -565,6 +565,7 @@
editor.stopCellEditing();
}
previousCellAction.actionPerformed(null);
+
} else if (//e.getKeyCode() == KeyEvent.VK_ENTER ||
keyCode == KeyEvent.VK_RIGHT ||
keyCode == KeyEvent.VK_TAB) {
@@ -573,12 +574,14 @@
editor.stopCellEditing();
}
nextCellAction.actionPerformed(null);
+
} else if (keyCode == KeyEvent.VK_UP) {
e.consume();
if (editor != null) {
editor.stopCellEditing();
}
previousRowAction.actionPerformed(null);
+
} else if (keyCode == KeyEvent.VK_DOWN) {
e.consume();
if (editor != null) {
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-02-05 20:06:05 UTC (rev 340)
+++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-02-05 21:53:25 UTC (rev 341)
@@ -373,7 +373,6 @@
tutti.title.create.cruise=Créer une nouvelle campagne
tutti.title.create.program=Créer une nouvelle série de campagne
tutti.title.create.protocol=Créer un nouveau protocol de saisie
-tutti.title.createBatch=Création d'un lot
tutti.title.edit.cruise=Éditer une campagne existante
tutti.title.edit.operations=Saisie des opérations de pêches (%s)
tutti.title.edit.program=Éditer une série de campagne existante
@@ -386,6 +385,7 @@
tutti.title.selectedCruise=Campagne %s
tutti.title.selectedProgram=Série de campagne %s
tutti.title.selectedProtocol=Protocole %s
+tutti.title.selectSpecies=Choisissez une espèce
tutti.title.splitBatch=Catégorisation du lot
tutti.title.validate.operations=Validation des opérations de pêches (%s)
tutti.to.be.done=< A FAIRE >
1
0
r340 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing: content/operation/catches/species/frequency util/table
by kmorin@users.forge.codelutin.com 05 Feb '13
by kmorin@users.forge.codelutin.com 05 Feb '13
05 Feb '13
Author: kmorin
Date: 2013-02-05 21:06:05 +0100 (Tue, 05 Feb 2013)
New Revision: 340
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/340
Log:
debug frequency edition
Modified:
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css
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/util/table/AbstractTuttiTableUIHandler.java
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-02-05 18:41:42 UTC (rev 339)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-02-05 20:06:05 UTC (rev 340)
@@ -33,13 +33,6 @@
showPopupButton: {handler.getConfig().isShowNumberEditorButton()};
}
-#splitPane {
- orientation: {JSplitPane.VERTICAL_SPLIT};
- resizeWeight: 0.2;
- oneTouchExpandable: true;
- continuousLayout: true;
-}
-
#stepLabel {
text: "tutti.label.frequencyConfiguration.step";
labelFor: {stepField};
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-02-05 18:41:42 UTC (rev 339)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-02-05 20:06:05 UTC (rev 340)
@@ -58,6 +58,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import javax.swing.JTextField;
/**
* @author tchemit <chemit(a)codelutin.com>
@@ -122,12 +123,6 @@
Object newValue) {
recomputeRowValidState(row);
-
- if (SpeciesFrequencyRowModel.PROPERTY_NUMBER.equals(propertyName)) {
-
- // Need to recompute the computedWeight
- computeComputedWeight(row);
- }
}
@Override
@@ -215,6 +210,10 @@
Float step = (Float) ui.getRafaleStepField().getModel();
applyRafaleStep(step);
+
+ //select text
+ JTextField field = (JTextField) e.getSource();
+ field.selectAll();
}
}
});
@@ -366,6 +365,7 @@
row = tableModel.createNewRow();
row.setLengthStep(aroundLengthStep);
row.setNumber(1);
+ row.setValid(true);
// get new index
List<Float> steps = Lists.newArrayList(rowsByStep.keySet());
@@ -500,11 +500,4 @@
//-- Internal methods --//
//------------------------------------------------------------------------//
- protected void computeComputedWeight(SpeciesFrequencyRowModel row) {
-
- if (log.isInfoEnabled()) {
- log.info("Will recompute computed weight for frequency: " + row);
- }
- }
-
}
\ No newline at end of file
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2013-02-05 18:41:42 UTC (rev 339)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2013-02-05 20:06:05 UTC (rev 340)
@@ -533,14 +533,14 @@
}
protected void installTableKeyListener(TableColumnModel columnModel,
- JTable table) {
+ final JTable table) {
Preconditions.checkState(
keyAdapter == null,
"There is already a tableSelectionListener registred, " +
"remove it before invoking this method.");
- AbstractTuttiTableModel<R> model = getTableModel();
+ final AbstractTuttiTableModel<R> model = getTableModel();
final MoveToNextEditableCellAction nextCellAction =
MoveToNextEditableCellAction.newAction(model, table);
final MoveToPreviousEditableCellAction previousCellAction =
@@ -555,22 +555,35 @@
@Override
public void keyPressed(KeyEvent e) {
-
+ TableCellEditor editor = table.getCellEditor();
+
int keyCode = e.getKeyCode();
if (keyCode == KeyEvent.VK_LEFT ||
(keyCode == KeyEvent.VK_TAB && e.isShiftDown())) {
e.consume();
+ if (editor != null) {
+ editor.stopCellEditing();
+ }
previousCellAction.actionPerformed(null);
} else if (//e.getKeyCode() == KeyEvent.VK_ENTER ||
keyCode == KeyEvent.VK_RIGHT ||
keyCode == KeyEvent.VK_TAB) {
e.consume();
+ if (editor != null) {
+ editor.stopCellEditing();
+ }
nextCellAction.actionPerformed(null);
} else if (keyCode == KeyEvent.VK_UP) {
e.consume();
+ if (editor != null) {
+ editor.stopCellEditing();
+ }
previousRowAction.actionPerformed(null);
} else if (keyCode == KeyEvent.VK_DOWN) {
e.consume();
+ if (editor != null) {
+ editor.stopCellEditing();
+ }
nextRowAction.actionPerformed(null);
}
}
1
0
r339 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content/operation java/fr/ifremer/tutti/ui/swing/content/operation/catches/species resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split resources/i18n
by kmorin@users.forge.codelutin.com 05 Feb '13
by kmorin@users.forge.codelutin.com 05 Feb '13
05 Feb '13
Author: kmorin
Date: 2013-02-05 19:41:42 +0100 (Tue, 05 Feb 2013)
New Revision: 339
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/339
Log:
- resolves #1976 [CAPTURE] - Trait - Initialisation de la date de fin
- enable the batches to have an empty weight
Modified:
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AttachmentsAction.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/CancelEditFishingOperationAction.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java
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/ImportCasinoAction.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java
trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIModel-error-validation.xml
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/AttachmentsAction.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AttachmentsAction.java 2013-02-05 16:56:47 UTC (rev 338)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AttachmentsAction.java 2013-02-05 18:41:42 UTC (rev 339)
@@ -28,4 +28,10 @@
protected void doAction(ActionEvent event) throws Exception {
//TODO
}
+
+ @Override
+ public boolean isEnabled() {
+ return false;
+ }
+
}
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/CancelEditFishingOperationAction.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/CancelEditFishingOperationAction.java 2013-02-05 16:56:47 UTC (rev 338)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/CancelEditFishingOperationAction.java 2013-02-05 18:41:42 UTC (rev 339)
@@ -88,7 +88,10 @@
// parentHandler.reloadFishingOperation();
}
- //TODO ca sert à quoi ?
+ // if called directly from the EditFishingOperationUIHandler:
+ // the user does not want to save the modifications before
+ // selecting another tab, we must reload the current tab before setting
+ // the new index of the tab pane
if (event.getSource() != null
&& event.getSource().getClass().isAssignableFrom(EditFishingOperationUIHandler.class)) {
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-02-05 16:56:47 UTC (rev 338)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-02-05 18:41:42 UTC (rev 339)
@@ -52,19 +52,20 @@
import fr.ifremer.tutti.ui.swing.util.TabHandler;
import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor;
import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil;
-import jaxx.runtime.validator.swing.SwingValidator;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.swing.JOptionPane;
-import javax.swing.JTabbedPane;
import java.awt.Color;
import java.awt.Component;
import java.awt.event.ActionEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
+import java.util.Date;
import java.util.List;
+import javax.swing.JOptionPane;
+import javax.swing.JTabbedPane;
+import jaxx.runtime.validator.swing.SwingValidator;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.time.DateUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* Handler for UI {@link EditFishingOperationUI}.
@@ -84,7 +85,26 @@
private final FishingOperationsUI parentUi;
private final PersistenceService persistenceService;
+
+ /**
+ * listener to set the same end date as the start date
+ * when the user changes it only (remove this listener before selecting the
+ * fishing operation)
+ */
+ private final PropertyChangeListener startDateListener = new PropertyChangeListener() {
+ public void propertyChange(PropertyChangeEvent evt) {
+ //check if the user changed the date and not only the time)
+ Date oldDate = (Date) evt.getOldValue();
+ Date newDate = (Date) evt.getNewValue();
+ if (!DateUtils.isSameDay(oldDate, newDate)) {
+ getModel().setGearShootingEndDate(newDate);
+ }
+ }
+
+
+ };
+
/**
* To monitor changes on the incoming fishing operation.
*
@@ -187,7 +207,7 @@
});
model.addPropertyChangeListener(EditFishingOperationUIModel.PROPERTY_FISHING_OPERATION_VALID, new PropertyChangeListener() {
-
+
@Override
public void propertyChange(PropertyChangeEvent evt) {
Boolean valid = (Boolean) evt.getNewValue();
@@ -200,9 +220,6 @@
color = Color.RED;
fontColor = Color.WHITE;
}
- Component tab = getTabPanel().getTabComponentAt(0);
- tab.setForeground(fontColor);
- tab.setBackground(color);
}
});
@@ -426,6 +443,9 @@
boolean empty = bean == null;
EditFishingOperationUIModel model = getModel();
+
+ model.removePropertyChangeListener(EditFishingOperationUIModel.PROPERTY_GEAR_SHOOTING_START_DATE, startDateListener);
+
if (empty || !bean.equals(model.getFishingOperation()) || isAModelModified()) {
if (empty) {
bean = new FishingOperation();
@@ -487,6 +507,8 @@
model.setModify(false);
fishingOperationMonitor.clearModified();
+
+ model.addPropertyChangeListener(EditFishingOperationUIModel.PROPERTY_GEAR_SHOOTING_START_DATE, startDateListener);
}
}
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-02-05 16:56:47 UTC (rev 338)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-02-05 18:41:42 UTC (rev 339)
@@ -28,14 +28,11 @@
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.AbstractTuttiAction;
-import fr.ifremer.tutti.ui.swing.MainUI;
import fr.ifremer.tutti.ui.swing.TuttiScreen;
import fr.ifremer.tutti.ui.swing.TuttiUI;
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.TuttiUIUtil;
-import java.awt.BorderLayout;
import jaxx.runtime.validator.swing.SwingValidator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -45,17 +42,8 @@
import java.beans.PropertyChangeListener;
import java.util.List;
import java.util.Timer;
-import java.util.TimerTask;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JProgressBar;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-import jaxx.runtime.SwingUtil;
-import jaxx.runtime.swing.ErrorDialogUI;
/**
* Handler of UI {@link FishingOperationsUI}.
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/ImportCasinoAction.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/ImportCasinoAction.java 2013-02-05 16:56:47 UTC (rev 338)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/ImportCasinoAction.java 2013-02-05 18:41:42 UTC (rev 339)
@@ -53,4 +53,9 @@
protected void doAction(ActionEvent event) throws Exception {
//TODO
}
+
+ @Override
+ public boolean isEnabled() {
+ return false;
+ }
}
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java 2013-02-05 16:56:47 UTC (rev 338)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java 2013-02-05 18:41:42 UTC (rev 339)
@@ -129,11 +129,6 @@
n_("tutti.table.species.batch.header.weight"),
n_("tutti.table.species.batch.header.weight"));
-// public static final ColumnIdentifier<SpeciesBatchRowModel> COMPUTED_WEIGHT = ColumnIdentifier.newId(
-// SpeciesBatchRowModel.PROPERTY_COMPUTED_WEIGHT,
-// n_("tutti.table.species.batch.header.computedWeight"),
-// n_("tutti.table.species.batch.header.computedWeight"));
-
public static final ColumnIdentifier<SpeciesBatchRowModel> COMPUTED_NUMBER = ColumnIdentifier.newId(
SpeciesBatchRowModel.PROPERTY_COMPUTED_NUMBER,
n_("tutti.table.species.batch.header.computedNumber"),
@@ -188,7 +183,7 @@
frequencyCols = Sets.newHashSet();
frequencyCols.add(COMPUTED_NUMBER);
-// frequencyCols.add(COMPUTED_WEIGHT);
+ frequencyCols.add(WEIGHT);
sampleCols = Sets.newHashSet();
sampleCols.add(SORTED_UNSORTED_CATEGORY);
@@ -249,7 +244,7 @@
propertyName);
if (result) {
- if (frequencyCols.contains(propertyName) || WEIGHT.equals(propertyName)) {
+ if (frequencyCols.contains(propertyName)) {
// must have filled a species to edit this column
SpeciesBatchRowModel entry = getEntry(rowIndex);
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-02-05 16:56:47 UTC (rev 338)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-02-05 18:41:42 UTC (rev 339)
@@ -259,9 +259,9 @@
// a row is valid if species category is not empty and valid
// then if any of none empty category is valid
- boolean result = row.getSpecies() != null &&
- !row.getSortedUnsortedCategory().isEmpty() &&
- row.getSortedUnsortedCategory().isValid();
+ boolean result = row.getSpecies() != null;
+// &&!row.getSortedUnsortedCategory().isEmpty() &&
+// row.getSortedUnsortedCategory().isValid();
result &= row.getSizeCategory().isEmptyOrValid();
result &= row.getSexCategory().isEmptyOrValid();
@@ -592,14 +592,6 @@
TuttiUI.DECIMAL3_PATTERN);
}
-// { // Computed weight column (from frequencies)
-//
-// addColumnToModel(columnModel,
-// FrequencyCellComponent.newEditor(ui),
-// FrequencyCellComponent.newRender(),
-// SpeciesBatchTableModel.COMPUTED_WEIGHT);
-// }
-
{ // Number column (from frequencies)
addColumnToModel(columnModel,
@@ -883,7 +875,6 @@
Preconditions.checkNotNull(sampleCategory);
Preconditions.checkNotNull(sampleCategory.getCategoryType());
Preconditions.checkNotNull(sampleCategory.getCategoryValue());
- Preconditions.checkNotNull(sampleCategory.getCategoryWeight());
SpeciesBatch catchBean = row.toBean();
catchBean.setFishingOperation(fishingOperation);
Modified: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIModel-error-validation.xml
===================================================================
--- trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIModel-error-validation.xml 2013-02-05 16:56:47 UTC (rev 338)
+++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIModel-error-validation.xml 2013-02-05 18:41:42 UTC (rev 339)
@@ -58,13 +58,8 @@
<field name="batchWeight">
- <field-validator type="required" short-circuit="true">
- <message>tutti.validator.error.createSpeciesBatch.batchWeight.required
- </message>
- </field-validator>
-
<field-validator type="fieldexpression" short-circuit="true">
- <param name="expression"><![CDATA[ batchWeight >0 ]]></param>
+ <param name="expression"><![CDATA[ batchWeight == null || batchWeight > 0 ]]></param>
<message>
tutti.validator.error.createSpeciesBatch.batchWeight.invalidValue
</message>
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-02-05 16:56:47 UTC (rev 338)
+++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-02-05 18:41:42 UTC (rev 339)
@@ -135,8 +135,8 @@
tutti.label.catches.macroWasteTotalWeight=Poids TOTAL (kg)
tutti.label.catches.planktonTotalSampleWeight=Poids total échantillonné
tutti.label.catches.planktonTotalWeight=Poids total
-tutti.label.catches.speciesTotalInertWeight=Poids inerte (kg)
-tutti.label.catches.speciesTotalLivingNotItemizedWeight=Poids vivant non détaillé (kg)
+tutti.label.catches.speciesTotalInertWeight=Poids inerte trié (kg)
+tutti.label.catches.speciesTotalLivingNotItemizedWeight=Poids vivant non détaillé trié (kg)
tutti.label.catches.speciesTotalSampleSortedWeight=Poids VRAC trié (kg)
tutti.label.catches.speciesTotalSortedWeight=Poids total VRAC (kg)
tutti.label.catches.speciesTotalUnsortedWeight=Poids total HORS VRAC (kg)
1
0
05 Feb '13
Author: tchemit
Date: 2013-02-05 17:56:47 +0100 (Tue, 05 Feb 2013)
New Revision: 338
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/338
Log:
fixes #1817: [PROTOCOLE] - Import / Export du protocole
Modified:
trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java
trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java
trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo
trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRow.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRowModel.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicType.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportService.java
trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java
trunk/tutti-service/src/test/resources/log4j.properties
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java
trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties
Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java
===================================================================
--- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java 2013-02-05 15:02:50 UTC (rev 337)
+++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java 2013-02-05 16:56:47 UTC (rev 338)
@@ -258,7 +258,7 @@
if (protocol != null && !protocol.isSpeciesEmpty()) {
Map<String, Species> map = TuttiEntities.splitById(result);
for (SpeciesProtocol speciesProtocol : protocol.getSpecies()) {
- map.get(speciesProtocol.getSpeciesId()).setSurveyCode(speciesProtocol.getSurveyCode());
+ map.get(speciesProtocol.getSpeciesId()).setSurveyCode(speciesProtocol.getSpeciesSurveyCode());
}
}
return result;
Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java
===================================================================
--- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-02-05 15:02:50 UTC (rev 337)
+++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-02-05 16:56:47 UTC (rev 338)
@@ -210,7 +210,7 @@
if (protocol != null && !protocol.isSpeciesEmpty()) {
Map<String, Species> map = TuttiEntities.splitById(result);
for (SpeciesProtocol speciesProtocol : protocol.getSpecies()) {
- map.get(speciesProtocol.getSpeciesId()).setSurveyCode(speciesProtocol.getSurveyCode());
+ map.get(speciesProtocol.getSpeciesId()).setSurveyCode(speciesProtocol.getSpeciesSurveyCode());
}
}
return result;
Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo
===================================================================
(Binary files differ)
Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java
===================================================================
--- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java 2013-02-05 15:02:50 UTC (rev 337)
+++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java 2013-02-05 16:56:47 UTC (rev 338)
@@ -73,7 +73,7 @@
" maturityEnabled: true\n" +
" sexEnabled: true\n" +
" speciesId: 11242\n" +
- " surveyCode: BAR\n" +
+ " speciesSurveyCode: BAR\n" +
" weightEnabled: true\n" +
"- !SpeciesProtocol\n" +
" id: 2\n" +
@@ -85,7 +85,7 @@
" sexEnabled: true\n" +
" sizeEnabled: true\n" +
" speciesId: 3835\n" +
- " surveyCode: CHIN\n" +
+ " speciesSurveyCode: CHIN\n" +
" weightEnabled: true";
@@ -146,7 +146,7 @@
Assert.assertNotNull(sp1);
Assert.assertEquals("1", sp1.getId());
Assert.assertEquals("11242", sp1.getSpeciesId());
- Assert.assertEquals("BAR", sp1.getSurveyCode());
+ Assert.assertEquals("BAR", sp1.getSpeciesSurveyCode());
Assert.assertEquals("1394", sp1.getLengthStepPmfmId());
Assert.assertFalse(sp1.isAgeEnabled());
Assert.assertTrue(sp1.isCalcifySampleEnabled());
@@ -160,7 +160,7 @@
Assert.assertNotNull(sp2);
Assert.assertEquals("2", sp2.getId());
Assert.assertEquals("3835", sp2.getSpeciesId());
- Assert.assertEquals("CHIN", sp2.getSurveyCode());
+ Assert.assertEquals("CHIN", sp2.getSpeciesSurveyCode());
Assert.assertEquals("323", sp2.getLengthStepPmfmId());
Assert.assertTrue(sp2.isAgeEnabled());
Assert.assertTrue(sp2.isCalcifySampleEnabled());
@@ -185,7 +185,7 @@
SpeciesProtocol sp1 = new SpeciesProtocol();
sp1.setId("1");
sp1.setSpeciesId("11242");
- sp1.setSurveyCode("BAR");
+ sp1.setSpeciesSurveyCode("BAR");
sp1.setLengthStepPmfmId("1394");
sp1.setCalcifySampleEnabled(true);
sp1.setMaturityEnabled(true);
@@ -196,7 +196,7 @@
SpeciesProtocol sp2 = new SpeciesProtocol();
sp2.setId("2");
sp2.setSpeciesId("3835");
- sp2.setSurveyCode("CHIN");
+ sp2.setSpeciesSurveyCode("CHIN");
sp2.setLengthStepPmfmId("323");
sp2.setAgeEnabled(true);
sp2.setCalcifySampleEnabled(true);
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2013-02-05 15:02:50 UTC (rev 337)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2013-02-05 16:56:47 UTC (rev 338)
@@ -60,7 +60,6 @@
}
}
-
public static class StringParserFormatter extends Common.NullableParserFormatter<String> {
public StringParserFormatter(String defaultValue, boolean nullAllowed) {
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRow.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRow.java 2013-02-05 15:02:50 UTC (rev 337)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRow.java 2013-02-05 16:56:47 UTC (rev 338)
@@ -38,58 +38,58 @@
private static final long serialVersionUID = 1L;
- public static final String PROPERTY_ID = "id";
+ public static final String PROPERTY_PMFM_ID = "pmfmId";
- public static final String PROPERTY_TYPE = "type";
+ public static final String PROPERTY_PMFM_TYPE = "pmfmType";
- public static final String PROPERTY_PARAMETER = "parameter";
+ public static final String PROPERTY_PMFM_PARAMETER_NAME = "pmfmParameterName";
- public static final String PROPERTY_MATRIX = "matrix";
+ public static final String PROPERTY_PMFM_MATRIX_NAME = "pmfmMatrixName";
- public static final String PROPERTY_FRACTION = "fraction";
+ public static final String PROPERTY_PMFM_FRACTION_NAME = "pmfmFractionName";
- public static final String PROPERTY_METHOD = "method";
+ public static final String PROPERTY_PMFM_METHOD_NAME = "pmfmMethodName";
- public static final String PROPERTY_CARACTERISTIC = "caracteristic";
+ public static final String PROPERTY_PMFM = "pmfm";
- protected CaracteristicType type;
+ protected CaracteristicType pmfmType;
- protected Caracteristic caracteristic;
+ protected Caracteristic pmfm;
- public Caracteristic getCaracteristic() {
- return caracteristic;
+ public Caracteristic getPmfm() {
+ return pmfm;
}
- public void setCaracteristic(Caracteristic caracteristic) {
- this.caracteristic = caracteristic;
+ public void setPmfm(Caracteristic pmfm) {
+ this.pmfm = pmfm;
}
- public CaracteristicType getType() {
- return type;
+ public CaracteristicType getPmfmType() {
+ return pmfmType;
}
- public void setType(CaracteristicType type) {
- this.type = type;
+ public void setPmfmType(CaracteristicType pmfmType) {
+ this.pmfmType = pmfmType;
}
- public String getId() {
- return getCaracteristic().getId();
+ public String getPmfmId() {
+ return getPmfm().getId();
}
- public String getParameter() {
- return getCaracteristic().getParameterName();
+ public String getPmfmParameterName() {
+ return getPmfm().getParameterName();
}
- public String getMatrix() {
- return getCaracteristic().getMatrixName();
+ public String getPmfmMatrixName() {
+ return getPmfm().getMatrixName();
}
- public String getMethod() {
- return getCaracteristic().getMethodName();
+ public String getPmfmMethodName() {
+ return getPmfm().getMethodName();
}
- public String getFraction() {
- return getCaracteristic().getFractionName();
+ public String getPmfmFractionName() {
+ return getPmfm().getFractionName();
}
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRowModel.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRowModel.java 2013-02-05 15:02:50 UTC (rev 337)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRowModel.java 2013-02-05 16:56:47 UTC (rev 338)
@@ -44,29 +44,29 @@
// import definition
- newForeignKeyColumn(CaracteristicRow.PROPERTY_ID,
- CaracteristicRow.PROPERTY_CARACTERISTIC,
+ newForeignKeyColumn(CaracteristicRow.PROPERTY_PMFM_ID,
+ CaracteristicRow.PROPERTY_PMFM,
Caracteristic.class,
Caracteristic.PROPERTY_ID,
caracteristicMap);
- newMandatoryColumn(CaracteristicRow.PROPERTY_TYPE,
- CaracteristicRow.PROPERTY_TYPE,
+ newMandatoryColumn(CaracteristicRow.PROPERTY_PMFM_TYPE,
+ CaracteristicRow.PROPERTY_PMFM_TYPE,
Common.newEnumByNameParserFormatter(CaracteristicType.class));
- newIgnoredColumn(CaracteristicRow.PROPERTY_PARAMETER);
- newIgnoredColumn(CaracteristicRow.PROPERTY_MATRIX);
- newIgnoredColumn(CaracteristicRow.PROPERTY_FRACTION);
- newIgnoredColumn(CaracteristicRow.PROPERTY_METHOD);
+ newIgnoredColumn(CaracteristicRow.PROPERTY_PMFM_PARAMETER_NAME);
+ newIgnoredColumn(CaracteristicRow.PROPERTY_PMFM_MATRIX_NAME);
+ newIgnoredColumn(CaracteristicRow.PROPERTY_PMFM_FRACTION_NAME);
+ newIgnoredColumn(CaracteristicRow.PROPERTY_PMFM_METHOD_NAME);
// export definition
- newColumnForExport(CaracteristicRow.PROPERTY_ID);
- newColumnForExport(CaracteristicRow.PROPERTY_TYPE, Common.newEnumByNameParserFormatter(CaracteristicType.class));
- newColumnForExport(CaracteristicRow.PROPERTY_PARAMETER);
- newColumnForExport(CaracteristicRow.PROPERTY_MATRIX);
- newColumnForExport(CaracteristicRow.PROPERTY_FRACTION);
- newColumnForExport(CaracteristicRow.PROPERTY_METHOD);
+ newColumnForExport(CaracteristicRow.PROPERTY_PMFM_ID);
+ newColumnForExport(CaracteristicRow.PROPERTY_PMFM_TYPE, Common.newEnumByNameParserFormatter(CaracteristicType.class));
+ newColumnForExport(CaracteristicRow.PROPERTY_PMFM_PARAMETER_NAME);
+ newColumnForExport(CaracteristicRow.PROPERTY_PMFM_MATRIX_NAME);
+ newColumnForExport(CaracteristicRow.PROPERTY_PMFM_FRACTION_NAME);
+ newColumnForExport(CaracteristicRow.PROPERTY_PMFM_METHOD_NAME);
}
@Override
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicType.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicType.java 2013-02-05 15:02:50 UTC (rev 337)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicType.java 2013-02-05 16:56:47 UTC (rev 338)
@@ -32,7 +32,7 @@
*/
public enum CaracteristicType {
- LENGTH_CLASS,
+ LENGTH_STEP,
ENVIRONMENT,
HYDROLOGY,
GEAR
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java 2013-02-05 15:02:50 UTC (rev 337)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java 2013-02-05 16:56:47 UTC (rev 338)
@@ -40,12 +40,16 @@
private static final long serialVersionUID = 1L;
- public static final String PROPERTY_ID = "id";
+ public static final String PROPERTY_SPECIES = "species";
- public static final String PROPERTY_SURVEY_CODE = "surveyCode";
+ public static final String PROPERTY_SPECIES_ID = "speciesId";
- public static final String PROPERTY_SPECIES = "species";
+ public static final String PROPERTY_SPECIES_REF_TAX_CODE = "speciesRefTaxCode";
+ public static final String PROPERTY_SPECIES_NAME = "speciesName";
+
+ public static final String PROPERTY_SPECIES_SURVEY_CODE = "speciesSurveyCode";
+
public static final String PROPERTY_SIZE_ENABLED = "sizeEnabled";
public static final String PROPERTY_SEX_ENABLED = "sexEnabled";
@@ -54,15 +58,15 @@
public static final String PROPERTY_AGE_ENABLED = "ageEnabled";
- public static final String PROPERTY_LENGTH_STEP = "lengthStep";
+ public static final String PROPERTY_LENGTH_STEP_PMFM = "lengthStepPmfm";
- public static final String PROPERTY_LENGTH_STEP_PARAMETER_NAME = "lengthStepParameterName";
+ public static final String PROPERTY_LENGTH_STEP_PMFM_PARAMETER_NAME = "lengthStepPmfmParameterName";
- public static final String PROPERTY_LENGTH_STEP_MATRIX_NAME = "lengthStepMatrixName";
+ public static final String PROPERTY_LENGTH_STEP_PMFM_MATRIX_NAME = "lengthStepPmfmMatrixName";
- public static final String PROPERTY_LENGTH_STEP_FRACTION_NAME = "lengthStepFractionName";
+ public static final String PROPERTY_LENGTH_STEP_PMFM_FRACTION_NAME = "lengthStepPmfmFractionName";
- public static final String PROPERTY_LENGTH_STEP_METHOD_NAME = "lengthStepMethodName";
+ public static final String PROPERTY_LENGTH_STEP_PMFM_METHOD_NAME = "lengthStepPmfmMethodName";
public static final String PROPERTY_LENGTH_STEP_PMFM_ID = "lengthStepPmfmId";
@@ -76,7 +80,7 @@
protected Species species;
- protected Caracteristic lengthStep;
+ protected Caracteristic lengthStepPmfm;
public SpeciesRow() {
delegate = new SpeciesProtocol();
@@ -86,44 +90,60 @@
return species;
}
- public Caracteristic getLengthStep() {
- return lengthStep;
+ public String getSpeciesId() {
+ return species == null ? null : delegate.getSpeciesId();
}
- public void setLengthStep(Caracteristic lengthStep) {
- this.lengthStep = lengthStep;
- delegate.setLengthStepPmfmId(lengthStep == null ? null : lengthStep.getId());
+ public String getSpeciesName() {
+ return species == null ? null : species.getName();
}
- public String getLengthStepPmfmId() {
- return delegate.getLengthStepPmfmId();
+ public String getSpeciesRefTaxCode() {
+ return species.getRefTaxCode();
}
- public String getLengthStepParameterName() {
- return lengthStep == null ? null : lengthStep.getParameterName();
+ public void setSpecies(Species species) {
+ this.species = species;
+ delegate.setSpeciesId(species == null ? null : species.getId());
}
- public String getLengthStepMethodName() {
- return lengthStep == null ? null : lengthStep.getMethodName();
+ public String getSpeciesSurveyCode() {
+ return delegate.getSpeciesSurveyCode();
}
- public String getLengthStepMatrixName() {
- return lengthStep == null ? null : lengthStep.getMatrixName();
+ public void setSpeciesSurveyCode(String speciesSuurveyCode) {
+ delegate.setSpeciesSurveyCode(speciesSuurveyCode);
}
- public String getLengthStepFractionName() {
- return lengthStep == null ? null : lengthStep.getFractionName();
+ public Caracteristic getLengthStepPmfm() {
+ return lengthStepPmfm;
}
- public void setSpecies(Species species) {
- this.species = species;
- delegate.setSpeciesId(species == null ? null : species.getId());
+ public void setLengthStepPmfm(Caracteristic lengthStepPmfm) {
+ this.lengthStepPmfm = lengthStepPmfm;
+ delegate.setLengthStepPmfmId(lengthStepPmfm == null ? null : lengthStepPmfm.getId());
}
- public String getId() {
- return delegate.getSpeciesId();
+ public String getLengthStepPmfmId() {
+ return delegate.getLengthStepPmfmId();
}
+ public String getLengthStepPmfmParameterName() {
+ return lengthStepPmfm == null ? null : lengthStepPmfm.getParameterName();
+ }
+
+ public String getLengthStepPmfmMethodName() {
+ return lengthStepPmfm == null ? null : lengthStepPmfm.getMethodName();
+ }
+
+ public String getLengthStepPmfmMatrixName() {
+ return lengthStepPmfm == null ? null : lengthStepPmfm.getMatrixName();
+ }
+
+ public String getLengthStepPmfmFractionName() {
+ return lengthStepPmfm == null ? null : lengthStepPmfm.getFractionName();
+ }
+
public boolean isSizeEnabled() {
return delegate.isSizeEnabled();
}
@@ -179,16 +199,4 @@
public void setCalcifySampleEnabled(boolean calcifySampleEnabled) {
delegate.setCalcifySampleEnabled(calcifySampleEnabled);
}
-
- public String getSpeciesId() {
- return delegate.getSpeciesId();
- }
-
- public String getSurveyCode() {
- return delegate.getSurveyCode();
- }
-
- public void setSurveyCode(String surveyCode) {
- delegate.setSurveyCode(surveyCode);
- }
}
\ No newline at end of file
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java 2013-02-05 15:02:50 UTC (rev 337)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java 2013-02-05 16:56:47 UTC (rev 338)
@@ -46,24 +46,26 @@
// import definition
- newForeignKeyColumn(SpeciesRow.PROPERTY_ID,
+ newForeignKeyColumn(SpeciesRow.PROPERTY_SPECIES_ID,
SpeciesRow.PROPERTY_SPECIES,
Species.class,
Species.PROPERTY_ID,
speciesMap);
- newForeignKeyColumn(SpeciesRow.PROPERTY_LENGTH_STEP,
- SpeciesRow.PROPERTY_LENGTH_STEP,
+ newForeignKeyColumn(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_ID,
+ SpeciesRow.PROPERTY_LENGTH_STEP_PMFM,
Caracteristic.class,
Caracteristic.PROPERTY_ID,
caracteristicMap);
- newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_PARAMETER_NAME);
- newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_MATRIX_NAME);
- newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_FRACTION_NAME);
- newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_METHOD_NAME);
+ newIgnoredColumn(SpeciesRow.PROPERTY_SPECIES_REF_TAX_CODE);
+ newIgnoredColumn(SpeciesRow.PROPERTY_SPECIES_NAME);
+ newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_PARAMETER_NAME);
+ newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_MATRIX_NAME);
+ newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_FRACTION_NAME);
+ newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_METHOD_NAME);
- newMandatoryColumn(SpeciesRow.PROPERTY_SURVEY_CODE, new TuttiCsvUtil.StringParserFormatter(null,true));
+ newMandatoryColumn(SpeciesRow.PROPERTY_SPECIES_SURVEY_CODE, new TuttiCsvUtil.StringParserFormatter(null, true));
newMandatoryColumn(SpeciesRow.PROPERTY_SIZE_ENABLED, Common.PRIMITIVE_BOOLEAN);
newMandatoryColumn(SpeciesRow.PROPERTY_SEX_ENABLED, Common.PRIMITIVE_BOOLEAN);
newMandatoryColumn(SpeciesRow.PROPERTY_MATURITY_ENABLED, Common.PRIMITIVE_BOOLEAN);
@@ -74,13 +76,15 @@
// export definition
- newColumnForExport(SpeciesRow.PROPERTY_ID);
- newColumnForExport(SpeciesRow.PROPERTY_SURVEY_CODE);
- newColumnForExport(SpeciesRow.PROPERTY_LENGTH_STEP, SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_ID);
- newColumnForExport(SpeciesRow.PROPERTY_LENGTH_STEP_PARAMETER_NAME);
- newColumnForExport(SpeciesRow.PROPERTY_LENGTH_STEP_MATRIX_NAME);
- newColumnForExport(SpeciesRow.PROPERTY_LENGTH_STEP_FRACTION_NAME);
- newColumnForExport(SpeciesRow.PROPERTY_LENGTH_STEP_METHOD_NAME);
+ newColumnForExport(SpeciesRow.PROPERTY_SPECIES_ID);
+ newColumnForExport(SpeciesRow.PROPERTY_SPECIES_REF_TAX_CODE);
+ newColumnForExport(SpeciesRow.PROPERTY_SPECIES_NAME);
+ newColumnForExport(SpeciesRow.PROPERTY_SPECIES_SURVEY_CODE);
+ newColumnForExport(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_ID);
+ newColumnForExport(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_PARAMETER_NAME);
+ newColumnForExport(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_MATRIX_NAME);
+ newColumnForExport(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_FRACTION_NAME);
+ newColumnForExport(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_METHOD_NAME);
newColumnForExport(SpeciesRow.PROPERTY_SIZE_ENABLED, Common.PRIMITIVE_BOOLEAN);
newColumnForExport(SpeciesRow.PROPERTY_SEX_ENABLED, Common.PRIMITIVE_BOOLEAN);
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportService.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportService.java 2013-02-05 15:02:50 UTC (rev 337)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportService.java 2013-02-05 16:56:47 UTC (rev 338)
@@ -99,8 +99,8 @@
for (CaracteristicRow bean : importer) {
- CaracteristicType caracteristicType = bean.getType();
- Caracteristic caracteristic = bean.getCaracteristic();
+ CaracteristicType caracteristicType = bean.getPmfmType();
+ Caracteristic caracteristic = bean.getPmfm();
String id = caracteristic.getId();
ids.put(caracteristicType, id);
}
@@ -118,7 +118,7 @@
protocol.setLengthClassesPmfmId(
mergeIds(protocol.getLengthClassesPmfmId(),
- ids.get(CaracteristicType.LENGTH_CLASS)));
+ ids.get(CaracteristicType.LENGTH_STEP)));
protocol.setEnvironmentPmfmId(
mergeIds(protocol.getEnvironmentPmfmId(),
@@ -175,7 +175,7 @@
List<CaracteristicRow> rows = Lists.newArrayList();
if (!protocol.isLengthClassesPmfmIdEmpty()) {
- function.setType(CaracteristicType.LENGTH_CLASS);
+ function.setType(CaracteristicType.LENGTH_STEP);
rows.addAll(Lists.transform(protocol.getLengthClassesPmfmId(), function));
}
@@ -344,8 +344,8 @@
Caracteristic caracteristic = caracteristicMap.get(input);
Preconditions.checkNotNull(caracteristic, "Could not find a caracteristic with id: " + input);
CaracteristicRow result = new CaracteristicRow();
- result.setCaracteristic(caracteristic);
- result.setType(type);
+ result.setPmfm(caracteristic);
+ result.setPmfmType(type);
return result;
}
@@ -379,7 +379,7 @@
String pmfmId = input.getLengthStepPmfmId();
if (pmfmId != null) {
Caracteristic caracteristic = caracteristicMap.get(pmfmId);
- result.setLengthStep(caracteristic);
+ result.setLengthStepPmfm(caracteristic);
}
result.setSpecies(species);
return result;
Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java
===================================================================
--- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java 2013-02-05 15:02:50 UTC (rev 337)
+++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java 2013-02-05 16:56:47 UTC (rev 338)
@@ -86,7 +86,7 @@
" maturityEnabled: true\n" +
" sexEnabled: true\n" +
" speciesId: 11242\n" +
- " surveyCode: cruiseCode1\n" +
+ " speciesSurveyCode: cruiseCode1\n" +
" weightEnabled: true\n" +
"- !SpeciesProtocol\n" +
" ageEnabled: true\n" +
@@ -100,15 +100,15 @@
" weightEnabled: true";
public static final String PROTOCOL_CARACTERISTIC_FILE_CONTENT =
- "id;type;parameter;matrix;fraction;method\n" +
- "1;LENGTH_CLASS;parameterName1;matrixName1;fractionName1;methodName1;\n" +
+ "pmfmId;pmfmType;pmfmParameterName;pmfmMatrixName;pmfmFractionName;pmfmMethodName\n" +
+ "1;LENGTH_STEP;parameterName1;matrixName1;fractionName1;methodName1;\n" +
"2;ENVIRONMENT;parameterName2;matrixName2;fractionName2;methodName2;\n" +
"3;GEAR;parameterName3;matrixName3;fractionName3;methodName3;\n" +
"4;HYDROLOGY;parameterName4;matrixName4;fractionName4;methodName4;\n" +
"5;HYDROLOGY;parameterName5;matrixName5;fractionName5;methodName5;";
public static final String ALL_CARACTERISTIC_FILE_CONTENT =
- "id;type;parameter;matrix;fraction;method\n" +
+ "pmfmId;pmfmType;pmfmParameterName;pmfmMatrixName;pmfmFractionName;pmfmMethodName\n" +
"1;;parameterName1;matrixName1;fractionName1;methodName1;\n" +
"2;;parameterName2;matrixName2;fractionName2;methodName2;\n" +
"3;;parameterName3;matrixName3;fractionName3;methodName3;\n" +
@@ -116,9 +116,9 @@
"5;;parameterName5;matrixName5;fractionName5;methodName5;";
public static final String PROTOCOL_SPECIES_FILE_CONTENT =
- "id;surveyCode;lengthStep;lengthStepParameterName;lengthStepMatrixName;lengthStepFractionName;lengthStepMethodName;sizeEnabled;sexEnabled;maturityEnabled;ageEnabled;weightEnabled;countIfNoFrequencyEnabled;calcifySampleEnabled\n" +
- "1;cruiseCode1;2;parameterName2;matrixName2;fractionName2;methodName2;Y;Y;Y;Y;Y;Y;Y;\n" +
- "2;;;;;;;N;Y;N;Y;Y;Y;Y;";
+ "speciesId;speciesRefTaxCode;speciesName;speciesSurveyCode;lengthStepPmfmId;lengthStepPmfmParameterName;lengthStepPmfmMatrixName;lengthStepPmfmFractionName;lengthStepPmfmMethodName;sizeEnabled;sexEnabled;maturityEnabled;ageEnabled;weightEnabled;countIfNoFrequencyEnabled;calcifySampleEnabled\n" +
+ "1;speciesRefTaxCode1;speciesName1;cruiseCode1;2;parameterName2;matrixName2;fractionName2;methodName2;Y;Y;Y;Y;Y;Y;Y;\n" +
+ "2;speciesRefTaxCode2;speciesName2;;;;;;;N;Y;N;Y;Y;Y;Y;";
@Before
public void setUp() throws Exception {
@@ -155,7 +155,7 @@
protocol.setSpecies(Lists.<SpeciesProtocol>newArrayList());
SpeciesProtocol sp1 = new SpeciesProtocol();
sp1.setSpeciesId("11242");
- sp1.setSurveyCode("cruiseCode1");
+ sp1.setSpeciesSurveyCode("cruiseCode1");
sp1.setLengthStepPmfmId("1394");
sp1.setCalcifySampleEnabled(true);
sp1.setMaturityEnabled(true);
@@ -206,7 +206,7 @@
SpeciesProtocol sp1 = protocol.getSpecies().get(0);
Assert.assertNotNull(sp1);
Assert.assertEquals("11242", sp1.getSpeciesId());
- Assert.assertEquals("cruiseCode1", sp1.getSurveyCode());
+ Assert.assertEquals("cruiseCode1", sp1.getSpeciesSurveyCode());
Assert.assertEquals("1394", sp1.getLengthStepPmfmId());
Assert.assertFalse(sp1.isAgeEnabled());
Assert.assertTrue(sp1.isCalcifySampleEnabled());
@@ -322,7 +322,7 @@
SpeciesProtocol sp1 = protocol.getSpecies().get(0);
Assert.assertNotNull(sp1);
Assert.assertEquals("1", sp1.getSpeciesId());
- Assert.assertEquals("cruiseCode1", sp1.getSurveyCode());
+ Assert.assertEquals("cruiseCode1", sp1.getSpeciesSurveyCode());
Assert.assertEquals("2", sp1.getLengthStepPmfmId());
Assert.assertTrue(sp1.isAgeEnabled());
Assert.assertTrue(sp1.isCalcifySampleEnabled());
@@ -335,7 +335,7 @@
SpeciesProtocol sp2 = protocol.getSpecies().get(1);
Assert.assertNotNull(sp2);
Assert.assertEquals("2", sp2.getSpeciesId());
- Assert.assertNull(sp2.getSurveyCode());
+ Assert.assertNull(sp2.getSpeciesSurveyCode());
Assert.assertNull(sp2.getLengthStepPmfmId());
Assert.assertTrue(sp2.isAgeEnabled());
Assert.assertTrue(sp2.isCalcifySampleEnabled());
@@ -360,7 +360,7 @@
SpeciesProtocol sp1 = new SpeciesProtocol();
sp1.setSpeciesId("1");
- sp1.setSurveyCode("cruiseCode1");
+ sp1.setSpeciesSurveyCode("cruiseCode1");
sp1.setAgeEnabled(true);
sp1.setSizeEnabled(true);
sp1.setMaturityEnabled(true);
@@ -444,6 +444,8 @@
for (int i = 1; i < 3; i++) {
Species c = new Species();
c.setId("" + i);
+ c.setName("speciesName" + i);
+ c.setRefTaxCode("speciesRefTaxCode" + i);
result.put(i + "", c);
}
return result;
Modified: trunk/tutti-service/src/test/resources/log4j.properties
===================================================================
--- trunk/tutti-service/src/test/resources/log4j.properties 2013-02-05 15:02:50 UTC (rev 337)
+++ trunk/tutti-service/src/test/resources/log4j.properties 2013-02-05 16:56:47 UTC (rev 338)
@@ -23,7 +23,7 @@
###
log4j.rootCategory=WARN, A1
-log4j.logger.no.api=DEBUG
+#log4j.logger.no.api=DEBUG
log4j.appender.A1=org.apache.log4j.ConsoleAppender
log4j.appender.A1.layout=org.apache.log4j.PatternLayout
log4j.appender.A1.layout.ConversionPattern=%d %-4r [%t] %-5p %c %x - %m%n
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java 2013-02-05 15:02:50 UTC (rev 337)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java 2013-02-05 16:56:47 UTC (rev 338)
@@ -39,7 +39,7 @@
private static final long serialVersionUID = 1L;
- public static final String PROPERTY_CRUISE_CODE = "surveyCode";
+ public static final String PROPERTY_SPECIES_SURVEY_CODE = "speciesSurveyCode";
public static final String PROPERTY_SPECIES = "species";
@@ -61,7 +61,7 @@
protected Species species;
- protected String cruiseCode;
+ protected String speciesSurveyCode;
protected boolean sizeEnabled;
@@ -105,14 +105,14 @@
firePropertyChange(PROPERTY_SPECIES, oldValue, species);
}
- public String getCruiseCode() {
- return cruiseCode;
+ public String getSpeciesSurveyCode() {
+ return speciesSurveyCode;
}
- public void setCruiseCode(String cruiseCode) {
- Object oldValue = getCruiseCode();
- this.cruiseCode = cruiseCode;
- firePropertyChange(PROPERTY_CRUISE_CODE, oldValue, cruiseCode);
+ public void setSpeciesSurveyCode(String speciesSurveyCode) {
+ Object oldValue = getSpeciesSurveyCode();
+ this.speciesSurveyCode = speciesSurveyCode;
+ firePropertyChange(PROPERTY_SPECIES_SURVEY_CODE, oldValue, speciesSurveyCode);
}
public boolean isSizeEnabled() {
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java 2013-02-05 15:02:50 UTC (rev 337)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java 2013-02-05 16:56:47 UTC (rev 338)
@@ -42,10 +42,10 @@
n_("tutti.table.protocol.species.header.speciesId"),
n_("tutti.table.protocol.species.header.speciesId.tip"));
- public static final ColumnIdentifier<EditProtocolSpeciesRowModel> CRUISE_CODE_ID = ColumnIdentifier.newId(
- EditProtocolSpeciesRowModel.PROPERTY_CRUISE_CODE,
- n_("tutti.table.protocol.species.header.surveyCode"),
- n_("tutti.table.protocol.species.header.surveyCode.tip"));
+ public static final ColumnIdentifier<EditProtocolSpeciesRowModel> SURVEY_CODE_ID = ColumnIdentifier.newId(
+ EditProtocolSpeciesRowModel.PROPERTY_SPECIES_SURVEY_CODE,
+ n_("tutti.table.protocol.species.header.speciesSurveyCode"),
+ n_("tutti.table.protocol.species.header.speciesSurveyCode.tip"));
public static final ColumnIdentifier<EditProtocolSpeciesRowModel> SIZE_ENABLED = ColumnIdentifier.newId(
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-02-05 15:02:50 UTC (rev 337)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-02-05 16:56:47 UTC (rev 338)
@@ -258,7 +258,7 @@
addColumnToModel(columnModel,
null,
null,
- EditProtocolSpeciesTableModel.CRUISE_CODE_ID);
+ EditProtocolSpeciesTableModel.SURVEY_CODE_ID);
addLengthClassesColumnToModel(columnModel, model.getLengthClassesPmfmId());
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-02-05 15:02:50 UTC (rev 337)
+++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-02-05 16:56:47 UTC (rev 338)
@@ -329,8 +329,6 @@
tutti.table.protocol.species.header.calcifySample.tip=Prélèvement de pièces calcifiées
tutti.table.protocol.species.header.countIfNoFrequency=Dénombrement
tutti.table.protocol.species.header.countIfNoFrequency.tip=Dénombrement
-tutti.table.protocol.species.header.cruiseCode=Code
-tutti.table.protocol.species.header.cruiseCode.tip=Code campagne (non synchronisable)
tutti.table.protocol.species.header.lengthStep=Classe de Taille
tutti.table.protocol.species.header.lengthStep.tip=Comment mesurer les classes de taille (si vide alors pas de mesure)
tutti.table.protocol.species.header.maturity=Maturité
@@ -341,8 +339,8 @@
tutti.table.protocol.species.header.size.tip=Catégorisation sur la catégorie de tri ?
tutti.table.protocol.species.header.speciesId=Espèce
tutti.table.protocol.species.header.speciesId.tip=Espèce (code permanent - nom scientifique)
-tutti.table.protocol.species.header.surveyCode=
-tutti.table.protocol.species.header.surveyCode.tip=
+tutti.table.protocol.species.header.speciesSurveyCode=Code
+tutti.table.protocol.species.header.speciesSurveyCode.tip=Code campagne (non synchronisable)
tutti.table.protocol.species.header.weight=Pesée
tutti.table.protocol.species.header.weight.tip=Pesée
tutti.table.species.batch.header.ageCategory=Age
1
0
r337 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol tutti-service/src/main/java/fr/ifremer/tutti/service/protocol tutti-service/src/main/resources/i18n tutti-service/src/test/java/fr/ifremer/tutti/service/protocol tutti-ui-swing/src/main/resources/i18n
by tchemit@users.forge.codelutin.com 05 Feb '13
by tchemit@users.forge.codelutin.com 05 Feb '13
05 Feb '13
Author: tchemit
Date: 2013-02-05 16:02:50 +0100 (Tue, 05 Feb 2013)
New Revision: 337
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/337
Log:
fix api
Modified:
trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java
trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java
trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java
trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties
trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java
trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties
Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java
===================================================================
--- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java 2013-02-05 14:46:18 UTC (rev 336)
+++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java 2013-02-05 15:02:50 UTC (rev 337)
@@ -382,6 +382,8 @@
@Override
public List<Species> importTemporarySpecies(List<Species> species) {
+
+ List<Species> result = Lists.newArrayListWithCapacity(species.size());
Status status = new Status();
status.setId("2");
@@ -389,12 +391,15 @@
for (Species toCreate : species) {
Species created = create(name, toCreate, false);
created.setStatus(status);
+ result.add(created);
}
persistToFile(name);
+ return result;
}
@Override
public List<Vessel> importTemporaryVessel(List<Vessel> vessels) {
+ List<Vessel> result = Lists.newArrayListWithCapacity(vessels.size());
Status status = new Status();
status.setId("2");
@@ -408,13 +413,16 @@
created = create(nameFishing, toCreate, false);
}
created.setStatus(status);
+ result.add(created);
}
persistToFile(nameScientific);
persistToFile(nameFishing);
+ return result;
}
@Override
public List<Person> importTemporaryPerson(List<Person> persons) {
+ List<Person> result = Lists.newArrayListWithCapacity(persons.size());
Status status = new Status();
status.setId("2");
@@ -422,12 +430,15 @@
for (Person toCreate : persons) {
Person created = create(name, toCreate, false);
created.setStatus(status);
+ result.add(created);
}
persistToFile(name);
+ return result;
}
@Override
public List<Gear> importTemporaryGear(List<Gear> gears) {
+ List<Gear> result = Lists.newArrayListWithCapacity(gears.size());
Status status = new Status();
status.setId("2");
@@ -441,9 +452,11 @@
created = create(nameFishing, toCreate, false);
}
created.setStatus(status);
+ result.add(created);
}
persistToFile(nameScientific);
persistToFile(nameFishing);
+ return result;
}
//------------------------------------------------------------------------//
Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java
===================================================================
--- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-02-05 14:46:18 UTC (rev 336)
+++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-02-05 15:02:50 UTC (rev 337)
@@ -61,7 +61,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
import java.io.IOException;
import java.util.List;
@@ -288,27 +287,23 @@
}
@Override
- @Transactional(readOnly = false)
- public void importTemporarySpecies(List<Species> species) {
- referentialService.importTemporarySpecies(species);
+ public List<Species> importTemporarySpecies(List<Species> species) {
+ return referentialService.importTemporarySpecies(species);
}
@Override
- @Transactional(readOnly = false)
- public void importTemporaryVessel(List<Vessel> vessels) {
- referentialService.importTemporaryVessel(vessels);
+ public List<Vessel> importTemporaryVessel(List<Vessel> vessels) {
+ return referentialService.importTemporaryVessel(vessels);
}
@Override
- @Transactional(readOnly = false)
- public void importTemporaryPerson(List<Person> persons) {
- referentialService.importTemporaryPerson(persons);
+ public List<Person> importTemporaryPerson(List<Person> persons) {
+ return referentialService.importTemporaryPerson(persons);
}
@Override
- @Transactional(readOnly = false)
- public void importTemporaryGear(List<Gear> gears) {
- referentialService.importTemporaryGear(gears);
+ public List<Gear> importTemporaryGear(List<Gear> gears) {
+ return referentialService.importTemporaryGear(gears);
}
//------------------------------------------------------------------------//
Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java
===================================================================
--- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java 2013-02-05 14:46:18 UTC (rev 336)
+++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java 2013-02-05 15:02:50 UTC (rev 337)
@@ -69,23 +69,23 @@
"- !SpeciesProtocol\n" +
" id: 1\n" +
" calcifySampleEnabled: true\n" +
- " surveyCode: BAR\n" +
" lengthStepPmfmId: 1394\n" +
" maturityEnabled: true\n" +
" sexEnabled: true\n" +
" speciesId: 11242\n" +
+ " surveyCode: BAR\n" +
" weightEnabled: true\n" +
"- !SpeciesProtocol\n" +
" id: 2\n" +
" ageEnabled: true\n" +
" calcifySampleEnabled: true\n" +
" countIfNoFrequencyEnabled: true\n" +
- " surveyCode: CHIN\n" +
" lengthStepPmfmId: 323\n" +
" maturityEnabled: true\n" +
" sexEnabled: true\n" +
" sizeEnabled: true\n" +
" speciesId: 3835\n" +
+ " surveyCode: CHIN\n" +
" weightEnabled: true";
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java 2013-02-05 14:46:18 UTC (rev 336)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java 2013-02-05 15:02:50 UTC (rev 337)
@@ -42,7 +42,7 @@
public static final String PROPERTY_ID = "id";
- public static final String PROPERTY_CRUISE_CODE = "surveyCode";
+ public static final String PROPERTY_SURVEY_CODE = "surveyCode";
public static final String PROPERTY_SPECIES = "species";
@@ -184,11 +184,11 @@
return delegate.getSpeciesId();
}
- public String getCruiseCode() {
+ public String getSurveyCode() {
return delegate.getSurveyCode();
}
- public void setCruiseCode(String cruiseCode) {
- delegate.setSurveyCode(cruiseCode);
+ public void setSurveyCode(String surveyCode) {
+ delegate.setSurveyCode(surveyCode);
}
}
\ No newline at end of file
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java 2013-02-05 14:46:18 UTC (rev 336)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java 2013-02-05 15:02:50 UTC (rev 337)
@@ -63,7 +63,7 @@
newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_FRACTION_NAME);
newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_METHOD_NAME);
- newMandatoryColumn(SpeciesRow.PROPERTY_CRUISE_CODE, new TuttiCsvUtil.StringParserFormatter(null,true));
+ newMandatoryColumn(SpeciesRow.PROPERTY_SURVEY_CODE, new TuttiCsvUtil.StringParserFormatter(null,true));
newMandatoryColumn(SpeciesRow.PROPERTY_SIZE_ENABLED, Common.PRIMITIVE_BOOLEAN);
newMandatoryColumn(SpeciesRow.PROPERTY_SEX_ENABLED, Common.PRIMITIVE_BOOLEAN);
newMandatoryColumn(SpeciesRow.PROPERTY_MATURITY_ENABLED, Common.PRIMITIVE_BOOLEAN);
@@ -75,7 +75,7 @@
// export definition
newColumnForExport(SpeciesRow.PROPERTY_ID);
- newColumnForExport(SpeciesRow.PROPERTY_CRUISE_CODE);
+ newColumnForExport(SpeciesRow.PROPERTY_SURVEY_CODE);
newColumnForExport(SpeciesRow.PROPERTY_LENGTH_STEP, SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_ID);
newColumnForExport(SpeciesRow.PROPERTY_LENGTH_STEP_PARAMETER_NAME);
newColumnForExport(SpeciesRow.PROPERTY_LENGTH_STEP_MATRIX_NAME);
Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties
===================================================================
--- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-02-05 14:46:18 UTC (rev 336)
+++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-02-05 15:02:50 UTC (rev 337)
@@ -35,10 +35,12 @@
tutti.property.species=Espèce
tutti.property.stationNumber=Numéro de station
tutti.property.strata=Strate d'association
+tutti.property.surveyCode=
tutti.property.user=Utilisateur
tutti.property.vessel=Navire
tutti.property.zone=Zone
tutti.propety.no.species.cruiseCode=\#
+tutti.propety.no.species.surveyCode=
tutti.propety.no.vessel.internalRegistrationCode=Immatriculation inconnu
tutti.propety.no.vessel.name=Nom inconnu
tutti.service.config=Configuration des services de Tutti
Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java
===================================================================
--- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java 2013-02-05 14:46:18 UTC (rev 336)
+++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java 2013-02-05 15:02:50 UTC (rev 337)
@@ -82,11 +82,11 @@
"species: \n" +
"- !SpeciesProtocol\n" +
" calcifySampleEnabled: true\n" +
- " surveyCode: cruiseCode1\n" +
" lengthStepPmfmId: 1394\n" +
" maturityEnabled: true\n" +
" sexEnabled: true\n" +
" speciesId: 11242\n" +
+ " surveyCode: cruiseCode1\n" +
" weightEnabled: true\n" +
"- !SpeciesProtocol\n" +
" ageEnabled: true\n" +
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-02-05 14:46:18 UTC (rev 336)
+++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-02-05 15:02:50 UTC (rev 337)
@@ -341,6 +341,8 @@
tutti.table.protocol.species.header.size.tip=Catégorisation sur la catégorie de tri ?
tutti.table.protocol.species.header.speciesId=Espèce
tutti.table.protocol.species.header.speciesId.tip=Espèce (code permanent - nom scientifique)
+tutti.table.protocol.species.header.surveyCode=
+tutti.table.protocol.species.header.surveyCode.tip=
tutti.table.protocol.species.header.weight=Pesée
tutti.table.protocol.species.header.weight.tip=Pesée
tutti.table.species.batch.header.ageCategory=Age
1
0
r336 - in trunk: tutti-service/src/main/java/fr/ifremer/tutti/service tutti-service/src/main/java/fr/ifremer/tutti/service/protocol tutti-service/src/test/java/fr/ifremer/tutti/service/protocol tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol
by tchemit@users.forge.codelutin.com 05 Feb '13
by tchemit@users.forge.codelutin.com 05 Feb '13
05 Feb '13
Author: tchemit
Date: 2013-02-05 15:46:18 +0100 (Tue, 05 Feb 2013)
New Revision: 336
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/336
Log:
rename cruiseCode to surveyCode
Modified:
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java
trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-02-05 14:44:38 UTC (rev 335)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-02-05 14:46:18 UTC (rev 336)
@@ -122,7 +122,7 @@
// registerMultiJXPathDecorator(Caracteristic.class, CARACTERISTIC_WITH_UNIT, "${parameterName}$s#${matrixName}$s#${fractionName}$s#${methodName}$s (${unit}$s)", SEPARATOR, " - ");
registerTuttiDecorator(CaracteristicQualitativeValue.class, "${name}$s", SEPARATOR, " - ");
registerTuttiDecorator(Species.class, "${refTaxCode}$s#${name}$s", SEPARATOR, " - ");
-// registerMultiJXPathDecorator(Species.class, SPECIES_BY_CRUISE_CODE, "${cruiseCode}$s#${refTaxCode}$s#${name}$s", SEPARATOR, " - ");
+// registerMultiJXPathDecorator(Species.class, SPECIES_BY_CRUISE_CODE, "${surveyCode}$s#${refTaxCode}$s#${name}$s", SEPARATOR, " - ");
registerTuttiDecorator(Species.class, SPECIES_BY_REF_TAX_CODE, "${refTaxCode}$s", SEPARATOR, " - ");
registerTuttiDecorator(Species.class, SPECIES_BY_GENUS, "${name}$s", SEPARATOR, " - ");
registerTuttiDecorator(SpeciesProtocol.class, "${speciesId}", SEPARATOR, " - ");
@@ -178,7 +178,7 @@
n_("tutti.property.user");
n_("tutti.property.strata");
n_("tutti.property.refTaxCode");
- n_("tutti.property.cruiseCode");
+ n_("tutti.property.surveyCode");
n_("tutti.property.species");
n_("tutti.property.genusSpecies");
n_("tutti.property.sortedUnsortedCategory");
@@ -193,14 +193,14 @@
private static final long serialVersionUID = 1L;
public SpeciesDecorator() throws IllegalArgumentException, NullPointerException {
- super(Species.class, "${cruiseCode}$s#${refTaxCode}$s#${name}$s", DecoratorService.SEPARATOR, " - ");
+ super(Species.class, "${surveyCode}$s#${refTaxCode}$s#${name}$s", DecoratorService.SEPARATOR, " - ");
}
@Override
protected Object onNullValue(Species bean, String token) {
Object result = null;
- if ("cruiseCode".equals(token)) {
- result = _("tutti.propety.no.species.cruiseCode");
+ if ("surveyCode".equals(token)) {
+ result = _("tutti.propety.no.species.surveyCode");
}
return result;
}
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java 2013-02-05 14:44:38 UTC (rev 335)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java 2013-02-05 14:46:18 UTC (rev 336)
@@ -42,7 +42,7 @@
public static final String PROPERTY_ID = "id";
- public static final String PROPERTY_CRUISE_CODE = "cruiseCode";
+ public static final String PROPERTY_CRUISE_CODE = "surveyCode";
public static final String PROPERTY_SPECIES = "species";
@@ -185,10 +185,10 @@
}
public String getCruiseCode() {
- return delegate.getCruiseCode();
+ return delegate.getSurveyCode();
}
public void setCruiseCode(String cruiseCode) {
- delegate.setCruiseCode(cruiseCode);
+ delegate.setSurveyCode(cruiseCode);
}
}
\ No newline at end of file
Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java
===================================================================
--- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java 2013-02-05 14:44:38 UTC (rev 335)
+++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java 2013-02-05 14:46:18 UTC (rev 336)
@@ -82,7 +82,7 @@
"species: \n" +
"- !SpeciesProtocol\n" +
" calcifySampleEnabled: true\n" +
- " cruiseCode: cruiseCode1\n" +
+ " surveyCode: cruiseCode1\n" +
" lengthStepPmfmId: 1394\n" +
" maturityEnabled: true\n" +
" sexEnabled: true\n" +
@@ -116,7 +116,7 @@
"5;;parameterName5;matrixName5;fractionName5;methodName5;";
public static final String PROTOCOL_SPECIES_FILE_CONTENT =
- "id;cruiseCode;lengthStep;lengthStepParameterName;lengthStepMatrixName;lengthStepFractionName;lengthStepMethodName;sizeEnabled;sexEnabled;maturityEnabled;ageEnabled;weightEnabled;countIfNoFrequencyEnabled;calcifySampleEnabled\n" +
+ "id;surveyCode;lengthStep;lengthStepParameterName;lengthStepMatrixName;lengthStepFractionName;lengthStepMethodName;sizeEnabled;sexEnabled;maturityEnabled;ageEnabled;weightEnabled;countIfNoFrequencyEnabled;calcifySampleEnabled\n" +
"1;cruiseCode1;2;parameterName2;matrixName2;fractionName2;methodName2;Y;Y;Y;Y;Y;Y;Y;\n" +
"2;;;;;;;N;Y;N;Y;Y;Y;Y;";
@@ -155,7 +155,7 @@
protocol.setSpecies(Lists.<SpeciesProtocol>newArrayList());
SpeciesProtocol sp1 = new SpeciesProtocol();
sp1.setSpeciesId("11242");
- sp1.setCruiseCode("cruiseCode1");
+ sp1.setSurveyCode("cruiseCode1");
sp1.setLengthStepPmfmId("1394");
sp1.setCalcifySampleEnabled(true);
sp1.setMaturityEnabled(true);
@@ -206,7 +206,7 @@
SpeciesProtocol sp1 = protocol.getSpecies().get(0);
Assert.assertNotNull(sp1);
Assert.assertEquals("11242", sp1.getSpeciesId());
- Assert.assertEquals("cruiseCode1", sp1.getCruiseCode());
+ Assert.assertEquals("cruiseCode1", sp1.getSurveyCode());
Assert.assertEquals("1394", sp1.getLengthStepPmfmId());
Assert.assertFalse(sp1.isAgeEnabled());
Assert.assertTrue(sp1.isCalcifySampleEnabled());
@@ -322,7 +322,7 @@
SpeciesProtocol sp1 = protocol.getSpecies().get(0);
Assert.assertNotNull(sp1);
Assert.assertEquals("1", sp1.getSpeciesId());
- Assert.assertEquals("cruiseCode1", sp1.getCruiseCode());
+ Assert.assertEquals("cruiseCode1", sp1.getSurveyCode());
Assert.assertEquals("2", sp1.getLengthStepPmfmId());
Assert.assertTrue(sp1.isAgeEnabled());
Assert.assertTrue(sp1.isCalcifySampleEnabled());
@@ -335,7 +335,7 @@
SpeciesProtocol sp2 = protocol.getSpecies().get(1);
Assert.assertNotNull(sp2);
Assert.assertEquals("2", sp2.getSpeciesId());
- Assert.assertNull(sp2.getCruiseCode());
+ Assert.assertNull(sp2.getSurveyCode());
Assert.assertNull(sp2.getLengthStepPmfmId());
Assert.assertTrue(sp2.isAgeEnabled());
Assert.assertTrue(sp2.isCalcifySampleEnabled());
@@ -360,7 +360,7 @@
SpeciesProtocol sp1 = new SpeciesProtocol();
sp1.setSpeciesId("1");
- sp1.setCruiseCode("cruiseCode1");
+ sp1.setSurveyCode("cruiseCode1");
sp1.setAgeEnabled(true);
sp1.setSizeEnabled(true);
sp1.setMaturityEnabled(true);
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java 2013-02-05 14:44:38 UTC (rev 335)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java 2013-02-05 14:46:18 UTC (rev 336)
@@ -39,7 +39,7 @@
private static final long serialVersionUID = 1L;
- public static final String PROPERTY_CRUISE_CODE = "cruiseCode";
+ public static final String PROPERTY_CRUISE_CODE = "surveyCode";
public static final String PROPERTY_SPECIES = "species";
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java 2013-02-05 14:44:38 UTC (rev 335)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java 2013-02-05 14:46:18 UTC (rev 336)
@@ -44,8 +44,8 @@
public static final ColumnIdentifier<EditProtocolSpeciesRowModel> CRUISE_CODE_ID = ColumnIdentifier.newId(
EditProtocolSpeciesRowModel.PROPERTY_CRUISE_CODE,
- n_("tutti.table.protocol.species.header.cruiseCode"),
- n_("tutti.table.protocol.species.header.cruiseCode.tip"));
+ n_("tutti.table.protocol.species.header.surveyCode"),
+ n_("tutti.table.protocol.species.header.surveyCode.tip"));
public static final ColumnIdentifier<EditProtocolSpeciesRowModel> SIZE_ENABLED = ColumnIdentifier.newId(
1
0
r335 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service tutti-persistence/src/main/xmi tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service tutti-service/src/main/java/fr/ifremer/tutti/service
by tchemit@users.forge.codelutin.com 05 Feb '13
by tchemit@users.forge.codelutin.com 05 Feb '13
05 Feb '13
Author: tchemit
Date: 2013-02-05 15:44:38 +0100 (Tue, 05 Feb 2013)
New Revision: 335
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/335
Log:
#1838: [REFERENTIEL] - Import / Export des r?\195?\169f?\195?\169rentiels (add import api)
Modified:
trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java
trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java
trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java
trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java
trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java
trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo
trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java
trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceTest.java
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java
Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java
===================================================================
--- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-02-05 14:29:36 UTC (rev 334)
+++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-02-05 14:44:38 UTC (rev 335)
@@ -136,18 +136,18 @@
List<Vessel> getAllFishingVessel();
/**
- * Get all species with no {@link Species#cruiseCode} filled.
+ * Get all species with no {@link Species#surveyCode} filled.
*
- * @return all species with no {@code cruiseCode} filled at all.
+ * @return all species with no {@code surveyCode} filled at all.
* @since 0.1
*/
List<Species> getAllSpecies();
/**
- * Get all species with {@link Species#cruiseCode} filled by optional protocol.
+ * Get all species with {@link Species#surveyCode} filled by optional protocol.
*
* @param protocol optional protocol to fill some species cruisecode.
- * @return all species with {@code cruiseCode} filled for species definied in protocol.
+ * @return all species with {@code surveyCode} filled for species definied in protocol.
* @since 1.0
*/
List<Species> getAllSpecies(TuttiProtocol protocol);
@@ -184,6 +184,46 @@
boolean isSortedQualitativeValue(CaracteristicQualitativeValue value);
+ /**
+ * Import given temporary species.
+ *
+ * @param species species to import
+ * @return imported species
+ * @since 1.0
+ */
+ @Transactional(readOnly = false)
+ List<Species> importTemporarySpecies(List<Species> species);
+
+ /**
+ * Import given temporary vessels.
+ *
+ * @param vessels vessels to import
+ * @return imported vessels
+ * @since 1.0
+ */
+ @Transactional(readOnly = false)
+ List<Vessel> importTemporaryVessel(List<Vessel> vessels);
+
+ /**
+ * Import given temporary persons.
+ *
+ * @param persons persons to import
+ * @return imported persons
+ * @since 1.0
+ */
+ @Transactional(readOnly = false)
+ List<Person> importTemporaryPerson(List<Person> persons);
+
+ /**
+ * Import given temporary gears.
+ *
+ * @param gears gears to import
+ * @return imported gears
+ * @since 1.0
+ */
+ @Transactional(readOnly = false)
+ List<Gear> importTemporaryGear(List<Gear> gears);
+
//------------------------------------------------------------------------//
//-- Program methods --//
//------------------------------------------------------------------------//
Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java
===================================================================
--- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java 2013-02-05 14:29:36 UTC (rev 334)
+++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java 2013-02-05 14:44:38 UTC (rev 335)
@@ -58,6 +58,7 @@
import fr.ifremer.tutti.persistence.entities.referential.Gear;
import fr.ifremer.tutti.persistence.entities.referential.Person;
import fr.ifremer.tutti.persistence.entities.referential.Species;
+import fr.ifremer.tutti.persistence.entities.referential.Status;
import fr.ifremer.tutti.persistence.entities.referential.Vessel;
import fr.ifremer.tutti.persistence.entities.referential.Zone;
import org.apache.commons.io.FileUtils;
@@ -254,10 +255,10 @@
@Override
public List<Species> getAllSpecies(TuttiProtocol protocol) {
List<Species> result = getAllSpecies();
- if (protocol!=null && !protocol.isSpeciesEmpty()) {
- Map<String, Species> map =TuttiEntities.splitById(result);
+ if (protocol != null && !protocol.isSpeciesEmpty()) {
+ Map<String, Species> map = TuttiEntities.splitById(result);
for (SpeciesProtocol speciesProtocol : protocol.getSpecies()) {
- map.get(speciesProtocol.getSpeciesId()).setCruiseCode(speciesProtocol.getCruiseCode());
+ map.get(speciesProtocol.getSpeciesId()).setSurveyCode(speciesProtocol.getSurveyCode());
}
}
return result;
@@ -379,7 +380,72 @@
return value != null && value.getId().equals("311");
}
+ @Override
+ public List<Species> importTemporarySpecies(List<Species> species) {
+ Status status = new Status();
+ status.setId("2");
+ String name = getKey(Species.class, null);
+ for (Species toCreate : species) {
+ Species created = create(name, toCreate, false);
+ created.setStatus(status);
+ }
+ persistToFile(name);
+ }
+
+ @Override
+ public List<Vessel> importTemporaryVessel(List<Vessel> vessels) {
+ Status status = new Status();
+ status.setId("2");
+
+ String nameScientific = getKey(Vessel.class, "Scientific");
+ String nameFishing = getKey(Vessel.class, "Fishing");
+ for (Vessel toCreate : vessels) {
+ Vessel created;
+ if (toCreate.isScientificVessel()) {
+ created = create(nameScientific, toCreate, false);
+ } else {
+ created = create(nameFishing, toCreate, false);
+ }
+ created.setStatus(status);
+ }
+ persistToFile(nameScientific);
+ persistToFile(nameFishing);
+ }
+
+ @Override
+ public List<Person> importTemporaryPerson(List<Person> persons) {
+ Status status = new Status();
+ status.setId("2");
+
+ String name = getKey(Person.class, null);
+ for (Person toCreate : persons) {
+ Person created = create(name, toCreate, false);
+ created.setStatus(status);
+ }
+ persistToFile(name);
+ }
+
+ @Override
+ public List<Gear> importTemporaryGear(List<Gear> gears) {
+ Status status = new Status();
+ status.setId("2");
+
+ String nameScientific = getKey(Gear.class, "Scientific");
+ String nameFishing = getKey(Gear.class, "Fishing");
+ for (Gear toCreate : gears) {
+ Gear created;
+ if (toCreate.isScientificGear()) {
+ created = create(nameScientific, toCreate, false);
+ } else {
+ created = create(nameFishing, toCreate, false);
+ }
+ created.setStatus(status);
+ }
+ persistToFile(nameScientific);
+ persistToFile(nameFishing);
+ }
+
//------------------------------------------------------------------------//
//-- Program methods --//
//------------------------------------------------------------------------//
Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java
===================================================================
--- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-02-05 14:29:36 UTC (rev 334)
+++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-02-05 14:44:38 UTC (rev 335)
@@ -61,6 +61,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import java.io.IOException;
import java.util.List;
@@ -210,7 +211,7 @@
if (protocol != null && !protocol.isSpeciesEmpty()) {
Map<String, Species> map = TuttiEntities.splitById(result);
for (SpeciesProtocol speciesProtocol : protocol.getSpecies()) {
- map.get(speciesProtocol.getSpeciesId()).setCruiseCode(speciesProtocol.getCruiseCode());
+ map.get(speciesProtocol.getSpeciesId()).setSurveyCode(speciesProtocol.getSurveyCode());
}
}
return result;
@@ -286,6 +287,30 @@
return referentialService.getGear(gearId);
}
+ @Override
+ @Transactional(readOnly = false)
+ public void importTemporarySpecies(List<Species> species) {
+ referentialService.importTemporarySpecies(species);
+ }
+
+ @Override
+ @Transactional(readOnly = false)
+ public void importTemporaryVessel(List<Vessel> vessels) {
+ referentialService.importTemporaryVessel(vessels);
+ }
+
+ @Override
+ @Transactional(readOnly = false)
+ public void importTemporaryPerson(List<Person> persons) {
+ referentialService.importTemporaryPerson(persons);
+ }
+
+ @Override
+ @Transactional(readOnly = false)
+ public void importTemporaryGear(List<Gear> gears) {
+ referentialService.importTemporaryGear(gears);
+ }
+
//------------------------------------------------------------------------//
//-- Program methods --//
//------------------------------------------------------------------------//
Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java
===================================================================
--- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2013-02-05 14:29:36 UTC (rev 334)
+++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2013-02-05 14:44:38 UTC (rev 335)
@@ -169,4 +169,40 @@
Caracteristic getCaracteristic(Integer pmfmId);
boolean isSortedQualitativeValue(CaracteristicQualitativeValue value);
+
+ /**
+ * Import given temporary species.
+ *
+ * @param species species to import
+ * @since 1.0
+ */
+ @Transactional(readOnly = false)
+ List<Species> importTemporarySpecies(List<Species> species);
+
+ /**
+ * Import given temporary vessels.
+ *
+ * @param vessels vessels to import
+ * @since 1.0
+ */
+ @Transactional(readOnly = false)
+ List<Vessel> importTemporaryVessel(List<Vessel> vessels);
+
+ /**
+ * Import given temporary persons.
+ *
+ * @param persons persons to import
+ * @since 1.0
+ */
+ @Transactional(readOnly = false)
+ List<Person> importTemporaryPerson(List<Person> persons);
+
+ /**
+ * Import given temporary gears.
+ *
+ * @param gears gears to import
+ * @since 1.0
+ */
+ @Transactional(readOnly = false)
+ List<Gear> importTemporaryGear(List<Gear> gears);
}
Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java
===================================================================
--- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-02-05 14:29:36 UTC (rev 334)
+++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-02-05 14:44:38 UTC (rev 335)
@@ -421,8 +421,7 @@
Caracteristic result = getCaracteristic(pmfmId);
// Search the qualitative value to skip
- for (Iterator iterator = result.getQualitativeValue().iterator(); iterator.hasNext(); ) {
- CaracteristicQualitativeValue qv = (CaracteristicQualitativeValue) iterator.next();
+ for (CaracteristicQualitativeValue qv : result.getQualitativeValue()) {
if (qv != null && qv.getId() != null
&& enumeration.QUALITATIVE_UNSORTED_ID.equals(Integer.valueOf(qv.getId()))) {
result.removeQualitativeValue(qv);
@@ -462,6 +461,30 @@
return target;
}
+ @Override
+ public List<Species> importTemporarySpecies(List<Species> species) {
+ //TODO
+ return null;
+ }
+
+ @Override
+ public List<Vessel> importTemporaryVessel(List<Vessel> vessels) {
+ //TODO
+ return null;
+ }
+
+ @Override
+ public List<Person> importTemporaryPerson(List<Person> persons) {
+ //TODO
+ return null;
+ }
+
+ @Override
+ public List<Gear> importTemporaryGear(List<Gear> gears) {
+ //TODO
+ return null;
+ }
+
//------------------------------------------------------------------------//
//-- Internal methods --//
//------------------------------------------------------------------------//
Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo
===================================================================
(Binary files differ)
Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java
===================================================================
--- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java 2013-02-05 14:29:36 UTC (rev 334)
+++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java 2013-02-05 14:44:38 UTC (rev 335)
@@ -69,7 +69,7 @@
"- !SpeciesProtocol\n" +
" id: 1\n" +
" calcifySampleEnabled: true\n" +
- " cruiseCode: BAR\n" +
+ " surveyCode: BAR\n" +
" lengthStepPmfmId: 1394\n" +
" maturityEnabled: true\n" +
" sexEnabled: true\n" +
@@ -80,7 +80,7 @@
" ageEnabled: true\n" +
" calcifySampleEnabled: true\n" +
" countIfNoFrequencyEnabled: true\n" +
- " cruiseCode: CHIN\n" +
+ " surveyCode: CHIN\n" +
" lengthStepPmfmId: 323\n" +
" maturityEnabled: true\n" +
" sexEnabled: true\n" +
@@ -146,7 +146,7 @@
Assert.assertNotNull(sp1);
Assert.assertEquals("1", sp1.getId());
Assert.assertEquals("11242", sp1.getSpeciesId());
- Assert.assertEquals("BAR", sp1.getCruiseCode());
+ Assert.assertEquals("BAR", sp1.getSurveyCode());
Assert.assertEquals("1394", sp1.getLengthStepPmfmId());
Assert.assertFalse(sp1.isAgeEnabled());
Assert.assertTrue(sp1.isCalcifySampleEnabled());
@@ -160,7 +160,7 @@
Assert.assertNotNull(sp2);
Assert.assertEquals("2", sp2.getId());
Assert.assertEquals("3835", sp2.getSpeciesId());
- Assert.assertEquals("CHIN", sp2.getCruiseCode());
+ Assert.assertEquals("CHIN", sp2.getSurveyCode());
Assert.assertEquals("323", sp2.getLengthStepPmfmId());
Assert.assertTrue(sp2.isAgeEnabled());
Assert.assertTrue(sp2.isCalcifySampleEnabled());
@@ -185,7 +185,7 @@
SpeciesProtocol sp1 = new SpeciesProtocol();
sp1.setId("1");
sp1.setSpeciesId("11242");
- sp1.setCruiseCode("BAR");
+ sp1.setSurveyCode("BAR");
sp1.setLengthStepPmfmId("1394");
sp1.setCalcifySampleEnabled(true);
sp1.setMaturityEnabled(true);
@@ -196,7 +196,7 @@
SpeciesProtocol sp2 = new SpeciesProtocol();
sp2.setId("2");
sp2.setSpeciesId("3835");
- sp2.setCruiseCode("CHIN");
+ sp2.setSurveyCode("CHIN");
sp2.setLengthStepPmfmId("323");
sp2.setAgeEnabled(true);
sp2.setCalcifySampleEnabled(true);
Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceTest.java
===================================================================
--- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceTest.java 2013-02-05 14:29:36 UTC (rev 334)
+++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceTest.java 2013-02-05 14:44:38 UTC (rev 335)
@@ -25,6 +25,7 @@
*/
import com.google.common.base.Preconditions;
+import com.google.common.collect.Lists;
import fr.ifremer.adagio.core.service.technical.CacheService;
import fr.ifremer.tutti.persistence.DatabaseFixtures;
import fr.ifremer.tutti.persistence.DatabaseResource;
@@ -46,6 +47,7 @@
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
+import org.junit.Ignore;
import org.junit.Test;
import org.nuiton.util.ApplicationConfig;
@@ -320,6 +322,227 @@
persist(Caracteristic.class, CaracteristicEnum.MacroWasteSizeCategory.name(), result);
}
+ @Ignore
+ @Test
+ public void importSpecies() {
+ List<Species> species = Lists.newArrayList();
+
+ long timestamp1 = System.nanoTime();
+ Species sp1 = new Species();
+ sp1.setId("Don't care" + timestamp1);
+ sp1.setRefTaxCode("Don't care" + timestamp1);
+ sp1.setSurveyCode("Don't care" + timestamp1);
+ sp1.setName("Genus name" + timestamp1);
+ species.add(sp1);
+
+ long timestamp2 = System.nanoTime();
+ Species sp2 = new Species();
+ sp2.setId("Don't care" + timestamp2);
+ sp2.setRefTaxCode("Don't care" + timestamp2);
+ sp2.setSurveyCode("Don't care" + timestamp2);
+ sp2.setName("Genus name" + timestamp2);
+ species.add(sp2);
+
+ Assert.assertNull(service.getSpecies(sp1.getId()));
+ Assert.assertNull(service.getSpecies(sp2.getId()));
+
+ List<Species> speciesList = service.importTemporarySpecies(species);
+ Assert.assertNotNull(speciesList);
+ Assert.assertEquals(2, speciesList.size());
+
+ Species createdSp1 = speciesList.get(0);
+ Assert.assertNotNull(createdSp1);
+ Assert.assertEquals(sp1.getName(), createdSp1.getName());
+ Assert.assertNotNull(createdSp1.getRefTaxCode());
+ Assert.assertNotSame(sp1.getRefTaxCode(), createdSp1.getRefTaxCode());
+ Assert.assertNull(createdSp1.getSurveyCode());
+ Assert.assertNotNull(createdSp1.getId());
+ Assert.assertNotSame(sp1.getId(), createdSp1.getId());
+ Assert.assertEquals(createdSp1, service.getSpecies(createdSp1.getId()));
+
+ Species createdSp2 = speciesList.get(1);
+ Assert.assertNotNull(createdSp2);
+ Assert.assertEquals(sp2.getName(), createdSp2.getName());
+ Assert.assertNull(createdSp2.getRefTaxCode());
+ Assert.assertNull(createdSp2.getSurveyCode());
+ Assert.assertNotNull(createdSp2.getId());
+ Assert.assertNotSame(sp2.getId(), createdSp2.getId());
+ Assert.assertEquals(createdSp2, service.getSpecies(createdSp2.getId()));
+ }
+
+ @Ignore
+ @Test
+ public void importVessel() {
+ List<Vessel> vessels = Lists.newArrayList();
+
+ // scientificVessel
+ long timestamp1 = System.nanoTime();
+ Vessel v1 = new Vessel();
+ v1.setId("Don't care" + timestamp1);
+ v1.setName("Name" + timestamp1);
+ v1.setInternalRegistrationCode("Immat" + timestamp1);
+ v1.setScientificVessel(true);
+ vessels.add(v1);
+
+ // fishingVessel
+ long timestamp2 = System.nanoTime();
+ Vessel v2 = new Vessel();
+ v2.setId("Don't care" + timestamp2);
+ v2.setName("Name" + timestamp2);
+ v2.setInternalRegistrationCode("Immat" + timestamp2);
+ v1.setScientificVessel(false);
+ vessels.add(v2);
+
+ Assert.assertNull(service.getVessel(v1.getId()));
+ Assert.assertNull(service.getVessel(v2.getId()));
+
+ List<Vessel> vesselList = service.importTemporaryVessel(vessels);
+
+ Assert.assertNotNull(vesselList);
+ Assert.assertEquals(2, vesselList.size());
+
+ List<Vessel> allScientificVessel = service.getAllScientificVessel();
+ List<Vessel> allFishingVessel = service.getAllFishingVessel();
+
+ Vessel createdV1 = vesselList.get(0);
+ Assert.assertNotNull(createdV1);
+ Assert.assertEquals(v1.getName(), createdV1.getName());
+ Assert.assertEquals(v1.getInternalRegistrationCode(), createdV1.getInternalRegistrationCode());
+ Assert.assertNotNull(createdV1.getId());
+ Assert.assertNotSame(v1.getId(), createdV1.getId());
+ Assert.assertEquals(createdV1, service.getVessel(createdV1.getId()));
+
+ Assert.assertTrue(allScientificVessel.contains(createdV1));
+ Assert.assertFalse(allFishingVessel.contains(createdV1));
+
+ Vessel createdV2 = vesselList.get(1);
+ Assert.assertNotNull(createdV2);
+ Assert.assertEquals(v2.getName(), createdV2.getName());
+ Assert.assertEquals(v2.getInternalRegistrationCode(), createdV2.getInternalRegistrationCode());
+ Assert.assertNotNull(createdV2.getId());
+ Assert.assertNotSame(v2.getId(), createdV2.getId());
+ Assert.assertEquals(createdV2, service.getVessel(createdV2.getId()));
+ Assert.assertFalse(allScientificVessel.contains(createdV1));
+ Assert.assertTrue(allFishingVessel.contains(createdV1));
+ }
+
+ @Ignore
+ @Test
+ public void importPerson() {
+ List<Person> persons = Lists.newArrayList();
+
+ long timestamp1 = System.nanoTime();
+ Person p1 = new Person();
+ p1.setId("Don't care" + timestamp1);
+ p1.setName("Don't care" + timestamp1);
+ p1.setFirstName("FirstName" + timestamp1);
+ p1.setLastName("MastName" + timestamp1);
+ p1.setDescription("Dont care" + timestamp1);
+ p1.setDescription("Dont care" + timestamp1);
+ persons.add(p1);
+
+ long timestamp2 = System.nanoTime();
+ Person p2 = new Person();
+ p2.setId("Don't care" + timestamp2);
+ p2.setName("Don't care" + timestamp2);
+ p2.setFirstName("FirstName" + timestamp2);
+ p2.setLastName("LastName" + timestamp2);
+ p2.setDescription("Don't care" + timestamp2);
+ p2.setDepartment("Don't care" + timestamp2);
+ persons.add(p2);
+
+ Assert.assertNull(service.getSpecies(p1.getId()));
+ Assert.assertNull(service.getSpecies(p2.getId()));
+
+ List<Person> personList = service.importTemporaryPerson(persons);
+
+ Assert.assertNotNull(personList);
+ Assert.assertEquals(2, personList.size());
+
+ Person createdP1 = personList.get(0);
+ Assert.assertNotNull(createdP1);
+ Assert.assertEquals(p1.getFirstName(), createdP1.getFirstName());
+ Assert.assertEquals(p1.getLastName(), createdP1.getLastName());
+
+ Assert.assertNull(createdP1.getName());
+ Assert.assertNull(createdP1.getDepartment());
+ Assert.assertNull(createdP1.getDescription());
+
+ Assert.assertNotNull(createdP1.getId());
+ Assert.assertNotSame(p1.getId(), createdP1.getId());
+
+ Assert.assertEquals(createdP1, service.getPerson(Integer.valueOf(createdP1.getId())));
+
+
+ Person createdP2 = personList.get(1);
+ Assert.assertNotNull(createdP2);
+ Assert.assertEquals(p2.getFirstName(), createdP2.getFirstName());
+ Assert.assertEquals(p2.getLastName(), createdP2.getLastName());
+
+ Assert.assertNull(createdP1.getName());
+ Assert.assertNull(createdP1.getDepartment());
+ Assert.assertNull(createdP1.getDescription());
+
+ Assert.assertNotNull(createdP2.getId());
+ Assert.assertNotSame(p2.getId(), createdP2.getId());
+
+ Assert.assertEquals(createdP2, service.getPerson(Integer.valueOf(createdP2.getId())));
+ }
+
+ @Ignore
+ @Test
+ public void importGear() {
+ List<Gear> gears = Lists.newArrayList();
+
+ // scientific gear
+ long timestamp1 = System.nanoTime();
+ Gear g1 = new Gear();
+ g1.setId("Don't care" + timestamp1);
+ g1.setDescription("Don't care" + timestamp1);
+ g1.setScientificGear(true);
+ g1.setName("Name" + timestamp1);
+ g1.setLabel("Label" + timestamp1);
+ gears.add(g1);
+
+ // fishing gear
+ long timestamp2 = System.nanoTime();
+ Gear g2 = new Gear();
+ g2.setId("Don't care" + timestamp2);
+ g2.setDescription("Don't care" + timestamp2);
+ g2.setName("Name" + timestamp2);
+ g2.setLabel("Label" + timestamp2);
+ g1.setScientificGear(false);
+
+ gears.add(g2);
+
+ List<Gear> gearList = service.importTemporaryGear(gears);
+
+ List<Gear> allScientificGear = service.getAllScientificGear();
+ List<Gear> allFishingGear = service.getAllFishingGear();
+
+ Gear createdG1 = gearList.get(0);
+ Assert.assertNotNull(createdG1);
+ Assert.assertEquals(g1.getName(), createdG1.getName());
+ Assert.assertEquals(g1.getLabel(), createdG1.getLabel());
+
+ Assert.assertNotNull(createdG1.getId());
+ Assert.assertNotSame(g1.getId(), createdG1.getId());
+ Assert.assertEquals(createdG1, service.getGear(Integer.valueOf(createdG1.getId())));
+ Assert.assertTrue(allScientificGear.contains(createdG1));
+ Assert.assertFalse(allFishingGear.contains(createdG1));
+
+ Gear createdG2 = gearList.get(1);
+ Assert.assertNotNull(createdG2);
+ Assert.assertEquals(g2.getName(), createdG2.getName());
+ Assert.assertEquals(g2.getLabel(), createdG2.getLabel());
+
+ Assert.assertNotNull(createdG2.getId());
+ Assert.assertNotSame(g2.getId(), createdG2.getId());
+ Assert.assertEquals(createdG2, service.getGear(Integer.valueOf(createdG2.getId())));
+ Assert.assertFalse(allScientificGear.contains(createdG1));
+ Assert.assertTrue(allFishingGear.contains(createdG1));
+ }
+
protected <S extends IdAware> void persistList(Class<S> type, List<S> result) {
persistList(type, null, result);
}
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-02-05 14:29:36 UTC (rev 334)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-02-05 14:44:38 UTC (rev 335)
@@ -312,6 +312,26 @@
return driver.getGear(gearCode);
}
+ @Override
+ public List<Species> importTemporarySpecies(List<Species> species) {
+ return driver.importTemporarySpecies(species);
+ }
+
+ @Override
+ public List<Vessel> importTemporaryVessel(List<Vessel> vessels) {
+ return driver.importTemporaryVessel(vessels);
+ }
+
+ @Override
+ public List<Person> importTemporaryPerson(List<Person> persons) {
+ return driver.importTemporaryPerson(persons);
+ }
+
+ @Override
+ public List<Gear> importTemporaryGear(List<Gear> gears) {
+ return driver.importTemporaryGear(gears);
+ }
+
//------------------------------------------------------------------------//
//-- Program methods --//
//------------------------------------------------------------------------//
@@ -484,6 +504,11 @@
}
@Override
+ public void changeSpeciesBatchSpecies(String batchId, Species species) {
+ driver.changeSpeciesBatchSpecies(batchId, species);
+ }
+
+ @Override
public List<SpeciesBatchFrequency> getAllSpeciesBatchFrequency(String speciesBatchId) {
return driver.getAllSpeciesBatchFrequency(speciesBatchId);
}
1
0
r334 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content/operation resources/i18n
by kmorin@users.forge.codelutin.com 05 Feb '13
by kmorin@users.forge.codelutin.com 05 Feb '13
05 Feb '13
Author: kmorin
Date: 2013-02-05 15:29:36 +0100 (Tue, 05 Feb 2013)
New Revision: 334
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/334
Log:
add attachment button to fishing operation
Added:
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AttachmentsAction.java
Modified:
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx
trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties
Copied: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AttachmentsAction.java (from rev 332, trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/ImportCasinoAction.java)
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AttachmentsAction.java (rev 0)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AttachmentsAction.java 2013-02-05 14:29:36 UTC (rev 334)
@@ -0,0 +1,31 @@
+package fr.ifremer.tutti.ui.swing.content.operation;
+
+import fr.ifremer.tutti.ui.swing.AbstractTuttiAction;
+
+import java.awt.event.ActionEvent;
+
+import static org.nuiton.i18n.I18n._;
+
+/**
+ *
+ * @author kmorin <kmorin(a)codelutin.com>
+ * @since 1.0
+ */
+public class AttachmentsAction extends AbstractTuttiAction<EditFishingOperationUIModel, EditFishingOperationUIHandler> {
+
+ private static final long serialVersionUID = 1L;
+
+ public AttachmentsAction(EditFishingOperationUIHandler handler) {
+ super(handler,
+ "attachments",
+ "edit-attachment",
+ _("tutti.action.attachments", 0),
+ _("tutti.action.attachments.tip"),
+ true);
+ }
+
+ @Override
+ protected void doAction(ActionEvent event) throws Exception {
+ //TODO
+ }
+}
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-02-05 14:07:43 UTC (rev 333)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-02-05 14:29:36 UTC (rev 334)
@@ -456,3 +456,7 @@
#importCasinoButton {
_tuttiAction: {ImportCasinoAction.class};
}
+
+#attachmentsButton {
+ _tuttiAction: {AttachmentsAction.class};
+}
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx 2013-02-05 14:07:43 UTC (rev 333)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx 2013-02-05 14:29:36 UTC (rev 334)
@@ -455,6 +455,7 @@
<cell columns='6'>
<JPanel layout='{new GridLayout(1,0)}'>
<JButton id='importCasinoButton'/>
+ <JButton id='attachmentsButton'/>
</JPanel>
</cell>
</row>
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-02-05 14:07:43 UTC (rev 333)
+++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-02-05 14:29:36 UTC (rev 334)
@@ -3,6 +3,8 @@
tutti.action.about=À propos
tutti.action.about.tip=À Propos
tutti.action.addSpecies.tip=Ajouter une espèce
+tutti.action.attachments=Pièces jointes (%s)
+tutti.action.attachments.tip=Pièces jointes
tutti.action.cancel=Annuler
tutti.action.cancel.editCruise=Annuler
tutti.action.cancel.editCruise.tip=Annuler l'édition (ou la création) de la campagne
1
0
05 Feb '13
Author: kmorin
Date: 2013-02-05 15:07:43 +0100 (Tue, 05 Feb 2013)
New Revision: 333
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/333
Log:
- new protocol: filter scientific vessels by default
- clone protocol: let the name but in error
- fishing operation: distance in meters + add coordinate editor type in labels
- catches: row in orange if to confirm
- catches: remove computed weight
- catches: readd titiles
Modified:
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java
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/catches/EditCatchesUI.css
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java
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/frequency/FrequencyCellComponent.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java
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/SpeciesFrequencyUIHandler.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java
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/AbstractTuttiUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java 2013-02-05 14:01:13 UTC (rev 332)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java 2013-02-05 14:07:43 UTC (rev 333)
@@ -475,7 +475,11 @@
}
protected String decorate(Object object) {
- return getDecorator(object.getClass(), null).toString(object);
+ String result = "";
+ if (object != null) {
+ getDecorator(object.getClass(), null).toString(object);
+ }
+ return result;
}
protected <O> ListCellRenderer newListCellRender(Class<O> type) {
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-02-05 14:01:13 UTC (rev 332)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-02-05 14:07:43 UTC (rev 333)
@@ -200,6 +200,10 @@
public Color getColorCellWithValue() {
return applicationConfig.getOptionAsColor(TuttiApplicationConfigOption.COLOR_CELL_WITH_VALUE.getKey());
}
+
+ public Color getColorRowToConfirm() {
+ return applicationConfig.getOptionAsColor(TuttiApplicationConfigOption.COLOR_ROW_TO_CONFIRM.getKey());
+ }
public KeyStroke getShortcutClosePopup() {
return applicationConfig.getOptionAsKeyStroke(TuttiApplicationConfigOption.SHORTCUT_CLOSE_POPUP.getKey());
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java 2013-02-05 14:01:13 UTC (rev 332)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java 2013-02-05 14:07:43 UTC (rev 333)
@@ -154,6 +154,13 @@
new Color(128, 255, 128).toString(),
Color.class
),
+
+ COLOR_ROW_TO_CONFIRM(
+ "tutti.ui.color.rowToConfirm",
+ n_("tutti.option.ui.color.rowToConfirm.description"),
+ Color.ORANGE.toString(),
+ Color.class
+ ),
SHORTCUT_CLOSE_POPUP(
"tutti.ui.shortcut.closePopup",
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java 2013-02-05 14:01:13 UTC (rev 332)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java 2013-02-05 14:07:43 UTC (rev 333)
@@ -109,6 +109,7 @@
.addOption(TuttiApplicationConfigOption.COLOR_ROW_INVALID)
.addOption(TuttiApplicationConfigOption.COLOR_ROW_READ_ONLY)
.addOption(TuttiApplicationConfigOption.COLOR_CELL_WITH_VALUE)
+ .addOption(TuttiApplicationConfigOption.COLOR_ROW_TO_CONFIRM)
.addOption(TuttiApplicationConfigOption.DATE_FORMAT)
.addOption(TuttiApplicationConfigOption.COORDINATE_EDITOR_TYPE);
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-02-05 14:01:13 UTC (rev 332)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-02-05 14:07:43 UTC (rev 333)
@@ -179,7 +179,7 @@
EditCruiseUIModel model = getModel();
- model.setVesselType(VesselTypeEnum.ALL);
+ model.setVesselType(model.isCreate() ? VesselTypeEnum.SCIENTIFIC : VesselTypeEnum.ALL);
// Change vessel list and gear list when vessel type changes
model.addPropertyChangeListener(EditCruiseUIModel.PROPERTY_VESSEL_TYPE, new PropertyChangeListener() {
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-02-05 14:01:13 UTC (rev 332)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-02-05 14:07:43 UTC (rev 333)
@@ -108,12 +108,12 @@
}
#gearLongitudeLabel {
- text: "tutti.label.fishingOperation.gearLongitude";
+ text: {_("tutti.label.fishingOperation.gearLongitude", ((CoordinateEditorType)handler.getConfig().getCoordinateEditorType()).toString())};
actionIcon: "coordinates";
}
#gearLatitudeLabel {
- text: "tutti.label.fishingOperation.gearLatitude";
+ text: {_("tutti.label.fishingOperation.gearLatitude", ((CoordinateEditorType)handler.getConfig().getCoordinateEditorType()).toString())};
actionIcon: "coordinates";
}
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-02-05 14:01:13 UTC (rev 332)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-02-05 14:07:43 UTC (rev 333)
@@ -179,7 +179,7 @@
&& latE != null && longE != null) {
LatLng start = new LatLng(latS, longS);
LatLng end = new LatLng(latE, longE);
- Double distance = LatLngTool.distance(start, end, LengthUnit.KILOMETER);
+ Double distance = LatLngTool.distance(start, end, LengthUnit.METER);
source.setTrawlDistance(distance.floatValue());
}
}
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-02-05 14:01:13 UTC (rev 332)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-02-05 14:07:43 UTC (rev 333)
@@ -28,11 +28,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.AbstractTuttiAction;
+import fr.ifremer.tutti.ui.swing.MainUI;
import fr.ifremer.tutti.ui.swing.TuttiScreen;
import fr.ifremer.tutti.ui.swing.TuttiUI;
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.TuttiUIUtil;
+import java.awt.BorderLayout;
import jaxx.runtime.validator.swing.SwingValidator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -41,6 +44,18 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.List;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JProgressBar;
+import javax.swing.border.EmptyBorder;
+import javax.swing.border.TitledBorder;
+import jaxx.runtime.SwingUtil;
+import jaxx.runtime.swing.ErrorDialogUI;
/**
* Handler of UI {@link FishingOperationsUI}.
@@ -57,6 +72,11 @@
private final FishingOperationsUI ui;
private final PersistenceService persistenceService;
+
+ private static final ExecutorService executorService =
+ Executors.newSingleThreadExecutor();
+
+ private static final Timer t = new Timer();
protected SelectFishingOperationAction selectFishingOperationAction;
@@ -284,4 +304,6 @@
// FishingOperation operation = getModel().getSelectedFishingOperation();
// selectFishingOperation(operation);
// }
+
+
}
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-02-05 14:01:13 UTC (rev 332)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-02-05 14:07:43 UTC (rev 333)
@@ -106,10 +106,6 @@
layout:{speciesTabPanelLayout};
}
-#speciesTabCreateBatchReminderLabel {
- title: {_("tutti.title.createBatch")};
-}
-
#speciesTable {
border: {BorderFactory.createTitledBorder(_("tutti.legend.catch.species"))};
}
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2013-02-05 14:01:13 UTC (rev 332)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2013-02-05 14:07:43 UTC (rev 333)
@@ -309,7 +309,7 @@
<SplitSpeciesBatchUI id='speciesTabSplitBatch'
constructorParams='this'/>
</JXTitledPanel>
- <JXTitledPanel id='speciesTabFrequencyEditorLabel'
+ <JXTitledPanel id='speciesTabFrequencyEditorReminderLabel'
constraints='EditCatchesUIHandler.EDIT_FREQUENCY_CARD'>
<SpeciesFrequencyUI id='speciesTabFrequencyEditor'
constructorParams='speciesTabContent'/>
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-02-05 14:01:13 UTC (rev 332)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-02-05 14:07:43 UTC (rev 333)
@@ -39,10 +39,10 @@
import javax.swing.JPanel;
import javax.swing.JTabbedPane;
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.LayoutManager;
+import org.jdesktop.swingx.JXTitledPanel;
+import static org.nuiton.i18n.I18n._;
+
/**
* @author tchemit <chemit(a)codelutin.com>
* @since 0.3
@@ -268,36 +268,40 @@
registerValidators(getValidator(), ui.getSpeciesTabContent().getHandler().getValidator());
}
- public void setSelectedCard(String card) {
- Component selectedComponent = getTabPanel().getSelectedComponent();
- if (selectedComponent.getClass().isAssignableFrom(JPanel.class)) {
- JPanel panel = (JPanel) selectedComponent;
- LayoutManager layoutManager = panel.getLayout();
- if (layoutManager.getClass().isAssignableFrom(CardLayout2Ext.class)) {
- CardLayout2Ext layout = (CardLayout2Ext) layoutManager;
- layout.setSelected(card);
+ public void setSpeciesSelectedCard(String card) {
+ JPanel panel = ui.getSpeciesTabPanel();
+ CardLayout2Ext layout = (CardLayout2Ext) panel.getLayout();
+ layout.setSelected(card);
- if (MAIN_CARD.equals(card)) {
- registerValidators();
+ if (MAIN_CARD.equals(card)) {
+ registerValidators();
- } else {
- Container cardContainer = (Container) layout.getComponent(panel, card);
- TuttiUI tuttiUi = null;
- if (TuttiUI.class.isInstance(cardContainer)) {
- tuttiUi = (TuttiUI) cardContainer;
-
- } else {
- for (Component comp : cardContainer.getComponents()) {
- if (TuttiUI.class.isInstance(comp)) {
- tuttiUi = (TuttiUI) comp;
- }
- }
- }
- if (tuttiUi != null) {
- registerValidators(tuttiUi.getHandler().getValidator());
- }
- }
+ } else {
+ TuttiUI tuttiUi = null;
+ JXTitledPanel titlePanel = null;
+ String title = "";
+ if (CREATE_BATCH_CARD.equals(card)) {
+ tuttiUi = ui.getSpeciesTabCreateBatch();
+ titlePanel = ui.getSpeciesTabCreateBatchReminderLabel();
+ title = "tutti.title.createBatch";
+
+ } else if (SPLIT_BATCH_CARD.equals(card)) {
+ tuttiUi = ui.getSpeciesTabSplitBatch();
+ titlePanel = ui.getSpeciesTabSplitBatchReminderLabel();
+ title = "tutti.title.splitBatch";
+
+ } else if (EDIT_FREQUENCY_CARD.equals(card)) {
+ tuttiUi = ui.getSpeciesTabFrequencyEditor();
+ titlePanel = ui.getSpeciesTabFrequencyEditorReminderLabel();
+ title = "tutti.title.editFrequency";
}
+
+ if (tuttiUi != null) {
+ registerValidators(tuttiUi.getHandler().getValidator());
+ }
+ if (titlePanel != null) {
+ titlePanel.setTitle(ui.getSpeciesTabFishingOperationReminderLabel().getTitle() + " - " + _(title));
+ }
}
}
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java 2013-02-05 14:01:13 UTC (rev 332)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java 2013-02-05 14:07:43 UTC (rev 333)
@@ -94,8 +94,6 @@
public static final String PROPERTY_COMPUTED_NUMBER = "computedNumber";
- public static final String PROPERTY_COMPUTED_WEIGHT = "computedWeight";
-
public static final String PROPERTY_ATTACHMENTS = "attachments";
public static final String PROPERTY_BATCH_PARENT = "batchParent";
@@ -182,18 +180,11 @@
protected Integer number;
/**
- * Total computed weight (from frequencies).
- *
- * @since 0.2
- */
- protected Float computedWeight;
-
- /**
* Total computed number (from frequencies).
*
* @since 0.2
*/
- protected Float computedNumber;
+ protected Integer computedNumber;
/**
* Comment on this catches.
@@ -569,22 +560,11 @@
firePropertyChange(PROPERTY_FREQUENCY, null, frequency);
}
- public Float getComputedWeight() {
- return computedWeight;
- }
-
- public void setComputedWeight(Float computedWeight) {
- Object oldValue = getComputedWeight();
- this.computedWeight = computedWeight;
- firePropertyChange(PROPERTY_COMPUTED_WEIGHT, oldValue,
- computedWeight);
- }
-
- public Float getComputedNumber() {
+ public Integer getComputedNumber() {
return computedNumber;
}
- public void setComputedNumber(Float computedNumber) {
+ public void setComputedNumber(Integer computedNumber) {
Object oldValue = getComputedNumber();
this.computedNumber = computedNumber;
firePropertyChange(PROPERTY_COMPUTED_NUMBER, oldValue,
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-02-05 14:01:13 UTC (rev 332)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-02-05 14:07:43 UTC (rev 333)
@@ -58,6 +58,8 @@
import fr.ifremer.tutti.ui.swing.util.editor.AttachmentCellComponent;
import fr.ifremer.tutti.ui.swing.util.editor.LongTextCellComponent;
import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier;
+import java.awt.Color;
+import java.awt.Component;
import jaxx.runtime.JAXXUtil;
import jaxx.runtime.SwingUtil;
import jaxx.runtime.context.JAXXContextEntryDef;
@@ -80,6 +82,9 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.jdesktop.swingx.decorator.ComponentAdapter;
+import org.jdesktop.swingx.decorator.HighlightPredicate;
+import org.jdesktop.swingx.decorator.Highlighter;
import static org.nuiton.i18n.I18n._;
import static org.nuiton.i18n.I18n.n_;
@@ -635,8 +640,35 @@
table.setModel(tableModel);
table.setColumnModel(columnModel);
+ Color toConfirmColor = getConfig().getColorRowToConfirm();
+ // paint the cell in orange if the row is to confirm
+ Highlighter attachmentHighlighter = TuttiUIUtil.newBackgroundColorHighlighter(
+ new HighlightPredicate() {
+
+ public boolean isHighlighted(Component renderer, ComponentAdapter adapter) {
+ int rowIndex = adapter.convertRowIndexToModel(adapter.row);
+ SpeciesBatchRowModel row = getTableModel().getEntry(rowIndex);
+ return row.getSpeciesToConfirm();
+ }
+
+ }, toConfirmColor);
+ table.addHighlighter(attachmentHighlighter);
+
initBatchTable(table, columnModel, tableModel);
+
+ // paint the cell in dark orange if the row is to confirm and the cell is not editable
+ attachmentHighlighter = TuttiUIUtil.newBackgroundColorHighlighter(
+ new HighlightPredicate() {
+ public boolean isHighlighted(Component renderer, ComponentAdapter adapter) {
+ int rowIndex = adapter.convertRowIndexToModel(adapter.row);
+ SpeciesBatchRowModel row = getTableModel().getEntry(rowIndex);
+ return row.getSpeciesToConfirm() && !adapter.isEditable();
+ }
+
+ }, toConfirmColor.darker());
+ table.addHighlighter(attachmentHighlighter);
+
getModel().addPropertyChangeListener(SpeciesBatchUIModel.PROPERTY_TABLE_VIEW_MODE, new PropertyChangeListener() {
@Override
public void propertyChange(PropertyChangeEvent evt) {
@@ -673,7 +705,7 @@
CreateSpeciesBatchUI createBatchEditor = parent.getSpeciesTabCreateBatch();
createBatchEditor.getHandler().openUI(getModel());
- parent.getHandler().setSelectedCard(EditCatchesUIHandler.CREATE_BATCH_CARD);
+ parent.getHandler().setSpeciesSelectedCard(EditCatchesUIHandler.CREATE_BATCH_CARD);
}
public void addSpeciesBatch(CreateSpeciesBatchUIModel createModel) {
@@ -743,7 +775,7 @@
SplitSpeciesBatchUI splitBatchEditor = parent.getSpeciesTabSplitBatch();
splitBatchEditor.getHandler().editBatch(parentBatch);
- parent.getHandler().setSelectedCard(EditCatchesUIHandler.SPLIT_BATCH_CARD);
+ parent.getHandler().setSpeciesSelectedCard(EditCatchesUIHandler.SPLIT_BATCH_CARD);
}
}
@@ -806,12 +838,12 @@
}
public void updateTotalFromFrequencies(SpeciesBatchRowModel row) {
- Float totalNumber = null;
+ Integer totalNumber = null;
Float totalWeight = null;
List<SpeciesFrequencyRowModel> frequency = row.getFrequency();
if (CollectionUtils.isNotEmpty(frequency)) {
- totalNumber = 0f;
+ totalNumber = 0;
totalWeight = 0f;
for (SpeciesFrequencyRowModel frequencyModel : frequency) {
totalNumber += frequencyModel.getNumber();
@@ -829,7 +861,6 @@
}
row.setComputedNumber(totalNumber);
- row.setComputedWeight(totalWeight);
}
//------------------------------------------------------------------------//
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/FrequencyCellComponent.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/FrequencyCellComponent.java 2013-02-05 14:01:13 UTC (rev 332)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/FrequencyCellComponent.java 2013-02-05 14:07:43 UTC (rev 333)
@@ -142,7 +142,7 @@
frequencyEditor.getHandler().editBatch(editRow, this);
// open frequency editor
- parent.getHandler().setSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD);
+ parent.getHandler().setSpeciesSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD);
}
public void validateEdition(SpeciesFrequencyUIModel frequencyModel) {
@@ -223,11 +223,9 @@
Preconditions.checkNotNull(editRow, "No editRow found in editor.");
- Object result;
+ Object result = null;
if (columnIdentifier == SpeciesBatchTableModel.COMPUTED_NUMBER) {
result = editRow.getComputedNumber();
- } else {
- result = editRow.getComputedWeight();
}
if (log.isInfoEnabled()) {
log.info("editor value (" + columnIdentifier + "): " + result);
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java 2013-02-05 14:01:13 UTC (rev 332)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java 2013-02-05 14:07:43 UTC (rev 333)
@@ -51,12 +51,8 @@
public static final String PROPERTY_WEIGHT = "weight";
- public static final String PROPERTY_COMPUTED_WEIGHT = "computedWeight";
-
-
public static final String PROPERTY_LENGHT_STEP_CARACTERISTIC = "lengthStepCaracteristic";
-
/**
* Length step.
*
@@ -79,13 +75,6 @@
protected Float weight;
/**
- * Computed weight from number + relation taille-poids.
- *
- * @since 0.2
- */
- protected Float computedWeight;
-
- /**
* Length step caracteristic.
*
* @since 0.3
@@ -157,16 +146,6 @@
firePropertyChange(PROPERTY_WEIGHT, oldValue, weight);
}
- public Float getComputedWeight() {
- return computedWeight;
- }
-
- public void setComputedWeight(Float computedWeight) {
- Object oldValue = getComputedWeight();
- this.computedWeight = computedWeight;
- firePropertyChange(PROPERTY_COMPUTED_WEIGHT, oldValue, computedWeight);
- }
-
public Caracteristic getLengthStepCaracteristic() {
return lengthStepCaracteristic;
}
@@ -177,12 +156,6 @@
firePropertyChange(PROPERTY_LENGHT_STEP_CARACTERISTIC, oldValue, lengthStepCaracteristic);
}
-// //TODO Use validator
-// @Override
-// public boolean isValid() {
-// return lengthStep != null && number != null && lengthStepCaracteristic != null;
-// }
-
@Override
public int compareTo(SpeciesFrequencyRowModel o) {
int result = ordering.compare(lengthStep, o.lengthStep);
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-02-05 14:01:13 UTC (rev 332)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java 2013-02-05 14:07:43 UTC (rev 333)
@@ -60,11 +60,6 @@
n_("tutti.table.species.frequency.header.weight"),
n_("tutti.table.species.frequency.header.weight"));
- public static final ColumnIdentifier<SpeciesFrequencyRowModel> COMPUTED_WEIGHT = ColumnIdentifier.newId(
- SpeciesFrequencyRowModel.PROPERTY_COMPUTED_WEIGHT,
- n_("tutti.table.species.frequency.header.computedWeight"),
- n_("tutti.table.species.frequency.header.computedWeight"));
-
private final SpeciesFrequencyUIModel uiModel;
private final Map<Float, SpeciesFrequencyRowModel> rowCache;
@@ -74,7 +69,7 @@
super(columnModel, true, true);
this.uiModel = uiModel;
this.rowCache = Maps.newTreeMap();
- setNoneEditableCols(COMPUTED_WEIGHT);
+ setNoneEditableCols();
}
@Override
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-02-05 14:01:13 UTC (rev 332)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-02-05 14:07:43 UTC (rev 333)
@@ -89,8 +89,7 @@
super(context,
SpeciesFrequencyRowModel.PROPERTY_LENGTH_STEP,
SpeciesFrequencyRowModel.PROPERTY_NUMBER,
- SpeciesFrequencyRowModel.PROPERTY_WEIGHT,
- SpeciesFrequencyRowModel.PROPERTY_COMPUTED_WEIGHT);
+ SpeciesFrequencyRowModel.PROPERTY_WEIGHT);
this.ui = ui;
}
@@ -257,13 +256,6 @@
TuttiUI.DECIMAL3_PATTERN);
}
- { // ComputedWeight
-
- addFloatColumnToModel(columnModel,
- SpeciesFrequencyTableModel.COMPUTED_WEIGHT,
- TuttiUI.DECIMAL3_PATTERN);
- }
-
// create table model
SpeciesFrequencyTableModel tableModel =
new SpeciesFrequencyTableModel(columnModel, model);
@@ -295,7 +287,7 @@
getModel().setValid(false);
EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class);
- parent.getHandler().setSelectedCard(EditCatchesUIHandler.MAIN_CARD);
+ parent.getHandler().setSpeciesSelectedCard(EditCatchesUIHandler.MAIN_CARD);
}
//------------------------------------------------------------------------//
@@ -415,7 +407,7 @@
newRow.setLengthStepCaracteristic(rowModel.getLengthStepCaracteristic());
newRow.setLengthStep(rowModel.getLengthStep());
newRow.setNumber(rowModel.getNumber());
- newRow.setComputedWeight(rowModel.getComputedWeight());
+ newRow.setWeight(rowModel.getWeight());
editFrequency.add(newRow);
}
@@ -476,8 +468,8 @@
ui.getValidator().setBean(model);
model.setRows(editFrequency);
- model.setStep(lengthStep);
model.setLengthStepCaracteristic(lengthStepCaracteristic);
+ model.setSimpleCount(speciesBatch.getComputedNumber());
SpeciesFrequencyUIModel.ConfigurationMode mode = SpeciesFrequencyUIModel.ConfigurationMode.SIMPLE;
if (protocol != null) {
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java 2013-02-05 14:01:13 UTC (rev 332)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java 2013-02-05 14:07:43 UTC (rev 333)
@@ -180,7 +180,7 @@
getModel().setValid(false);
EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class);
- parent.getHandler().setSelectedCard(EditCatchesUIHandler.MAIN_CARD);
+ parent.getHandler().setSpeciesSelectedCard(EditCatchesUIHandler.MAIN_CARD);
}
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 2013-02-05 14:01:13 UTC (rev 332)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 2013-02-05 14:07:43 UTC (rev 333)
@@ -232,7 +232,7 @@
getModel().setValid(false);
EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class);
- parent.getHandler().setSelectedCard(EditCatchesUIHandler.MAIN_CARD);
+ parent.getHandler().setSpeciesSelectedCard(EditCatchesUIHandler.MAIN_CARD);
}
//------------------------------------------------------------------------//
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-02-05 14:01:13 UTC (rev 332)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-02-05 14:07:43 UTC (rev 333)
@@ -221,7 +221,6 @@
if (mustClone != null && mustClone) {
ui.setContextValue(false, MainUIHandler.CLONE_PROTOCOL);
model.setId(null);
- model.setName(null);
}
} else {
@@ -265,12 +264,13 @@
addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.WEIGHT_ENABLED, table);
addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.COUNT_IF_NO_FREQUENCY_ENABLED, table);
- addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.CALCIFY_SAMPLE_ENABLED, table);
addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.SIZE_ENABLED, table);
addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.SEX_ENABLED, table);
addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.MATURITY_ENABLED, table);
addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.AGE_ENABLED, table);
+
+ addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.CALCIFY_SAMPLE_ENABLED, table);
EditProtocolSpeciesTableModel tableModel =
new EditProtocolSpeciesTableModel(columnModel);
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java
===================================================================
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2013-02-05 14:01:13 UTC (rev 332)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2013-02-05 14:07:43 UTC (rev 333)
@@ -47,7 +47,6 @@
import org.jdesktop.swingx.autocomplete.ComboBoxCellEditor;
import org.jdesktop.swingx.autocomplete.ObjectToStringConverter;
import org.jdesktop.swingx.decorator.ComponentAdapter;
-import org.jdesktop.swingx.decorator.HighlightPredicate;
import org.jdesktop.swingx.decorator.Highlighter;
import org.jdesktop.swingx.table.TableColumnExt;
import org.nuiton.util.decorator.Decorator;
@@ -75,6 +74,7 @@
import java.util.Enumeration;
import java.util.List;
import java.util.Set;
+import org.jdesktop.swingx.decorator.HighlightPredicate;
import static org.nuiton.i18n.I18n._;
@@ -298,25 +298,15 @@
Highlighter commentHighlighter = TuttiUIUtil.newBackgroundColorHighlighter(
new HighlightPredicate.AndHighlightPredicate(
new HighlightPredicate.IdentifierHighlightPredicate(SpeciesBatchTableModel.COMMENT),
- new HighlightPredicate() {
- @Override
- public boolean isHighlighted(Component renderer, ComponentAdapter adapter) {
- boolean result = adapter.getValue() != null;
- return result;
- }
- }), cellWithValueColor);
+ new HighlightPredicate.NotHighlightPredicate(new HighlightPredicate.EqualsHighlightPredicate())
+ ), cellWithValueColor);
table.addHighlighter(commentHighlighter);
Highlighter attachmentHighlighter = TuttiUIUtil.newBackgroundColorHighlighter(
new HighlightPredicate.AndHighlightPredicate(
new HighlightPredicate.IdentifierHighlightPredicate(SpeciesBatchTableModel.ATTACHMENTS),
- new HighlightPredicate() {
- @Override
- public boolean isHighlighted(Component renderer, ComponentAdapter adapter) {
- boolean result = adapter.getValue() != null;
- return result;
- }
- }), cellWithValueColor);
+ new HighlightPredicate.NotHighlightPredicate(new HighlightPredicate.EqualsHighlightPredicate())
+ ), cellWithValueColor);
table.addHighlighter(attachmentHighlighter);
// paint in a special color inValid rows
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-02-05 14:01:13 UTC (rev 332)
+++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-02-05 14:07:43 UTC (rev 333)
@@ -174,8 +174,8 @@
tutti.label.fishingOperation.fishingOperationValid=Trait valide
tutti.label.fishingOperation.gear=Engin
tutti.label.fishingOperation.gearDate=Date
-tutti.label.fishingOperation.gearLatitude=Latitude
-tutti.label.fishingOperation.gearLongitude=Longitude
+tutti.label.fishingOperation.gearLatitude=Latitude (%s)
+tutti.label.fishingOperation.gearLongitude=Longitude (%s)
tutti.label.fishingOperation.gearShootingEnd=Fin de traine
tutti.label.fishingOperation.gearShootingStart=Début de traine
tutti.label.fishingOperation.gearTime=Heure
@@ -185,7 +185,7 @@
tutti.label.fishingOperation.stationNumber=Code Station
tutti.label.fishingOperation.strata=Strate
tutti.label.fishingOperation.subStrata=Sous strate
-tutti.label.fishingOperation.trawlDistance=Distance chalutée
+tutti.label.fishingOperation.trawlDistance=Distance chalutée (m)
tutti.label.fishingOperation.vessel=Navire
tutti.label.frequencyConfiguration.lengthStepCaracteristic=Type de mesure
tutti.label.frequencyConfiguration.maxStep=Classe max
@@ -273,6 +273,7 @@
tutti.option.ui.color.cellWithValue.description=Couleur d'une cellule avec des données
tutti.option.ui.color.rowInvalid.description=Ligne invalide
tutti.option.ui.color.rowReadOnly.description=Cellule non éditable
+tutti.option.ui.color.rowToConfirm.description=Ligne à confirmer
tutti.option.ui.config.file.description=Chemin du fichier de configuration des interfaces graphiques
tutti.option.ui.coordinateEditorType.description=Type de l'éditeur de coordonnées
tutti.option.ui.dateFormat.description=Format de dates
@@ -370,11 +371,12 @@
tutti.title.create.cruise=Créer une nouvelle campagne
tutti.title.create.program=Créer une nouvelle série de campagne
tutti.title.create.protocol=Créer un nouveau protocol de saisie
-tutti.title.createBatch=Créer un lot pour une nouvelle espèce
+tutti.title.createBatch=Création d'un lot
tutti.title.edit.cruise=Éditer une campagne existante
tutti.title.edit.operations=Saisie des opérations de pêches (%s)
tutti.title.edit.program=Éditer une série de campagne existante
tutti.title.edit.protocol=Éditer un protocol de saisie existant
+tutti.title.editFrequency=Mensuration
tutti.title.home=Sélection de la campagne
tutti.title.noSelectedCruise=Pas de campagne sélectionné
tutti.title.noSelectedProgram=Pas de série de campagne sélectionné
@@ -382,6 +384,7 @@
tutti.title.selectedCruise=Campagne %s
tutti.title.selectedProgram=Série de campagne %s
tutti.title.selectedProtocol=Protocole %s
+tutti.title.splitBatch=Catégorisation du lot
tutti.title.validate.operations=Validation des opérations de pêches (%s)
tutti.to.be.done=< A FAIRE >
tutti.tooltip.attachment.none=Pas de pièce-jointes
1
0
r332 - trunk/tutti-service/src/main/java/fr/ifremer/tutti/service
by kmorin@users.forge.codelutin.com 05 Feb '13
by kmorin@users.forge.codelutin.com 05 Feb '13
05 Feb '13
Author: kmorin
Date: 2013-02-05 15:01:13 +0100 (Tue, 05 Feb 2013)
New Revision: 332
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/332
Log:
default decorator
Modified:
trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java
Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java
===================================================================
--- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-02-05 09:48:26 UTC (rev 331)
+++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-02-05 14:01:13 UTC (rev 332)
@@ -211,7 +211,7 @@
private static final long serialVersionUID = 1L;
public VesselDecorator() throws IllegalArgumentException, NullPointerException {
- super(Vessel.class, "${name}$s#${internalRegistrationCode}$s", DecoratorService.SEPARATOR, " - ");
+ super(Vessel.class, "${internalRegistrationCode}$s#${name}$s", DecoratorService.SEPARATOR, " - ");
}
@Override
1
0