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

Feb. 7, 2013

Author: tchemit Date: 2013-02-07 09:26:42 +0100 (Thu, 07 Feb 2013) New Revision: 355 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/355 Log: - implements referential import / export service (but not the persistence one) - improve tests Added: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/GearModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/PersonModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/SpeciesModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselModel.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java 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/entities/TuttiEntities.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.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/referential/ExportTemporaryGearExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.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-07 06:58:15 UTC (rev 354) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-02-07 08:26:42 UTC (rev 355) @@ -46,7 +46,6 @@ import fr.ifremer.tutti.persistence.entities.referential.Zone; import org.springframework.transaction.annotation.Transactional; -import java.io.File; import java.util.List; /** @@ -186,74 +185,42 @@ boolean isSortedQualitativeValue(CaracteristicQualitativeValue value); /** - * Import temporary species from the given csv import file. + * Import given temporary species. * - * @param importFile csv file to import + * @param species species to import * @since 1.0 */ @Transactional(readOnly = false) - void importTemporarySpecies(File importFile); + List<Species> importTemporarySpecies(List<Species> species); /** - * Export some example temporary species to the given file. + * Import given temporary vessels. * - * @param exportFile file where to export data + * @param vessels vessels to import * @since 1.0 */ - void exportTemporarySpeciesExample(File exportFile); - - /** - * Import temporary vessels from the given csv import file. - * - * @param importfile csv file to import - * @since 1.0 - */ @Transactional(readOnly = false) - void importTemporaryVessel(File importfile); + List<Vessel> importTemporaryVessel(List<Vessel> vessels); /** - * Export some example temporary vessels to the given file. + * Import given temporary persons. * - * @param exportFile file where to export data + * @param persons persons to import * @since 1.0 */ - void exportTemporaryVesselExample(File exportFile); - - /** - * Import temporary persons from the given csv import file. - * - * @param importFile csv file to import - * @since 1.0 - */ @Transactional(readOnly = false) - void importTemporaryPerson(File importFile); + List<Person> importTemporaryPerson(List<Person> persons); /** - * Export some example temporary person to the given file. + * Import given temporary gears. * - * @param exportFile file where to export data + * @param gears gears to import * @since 1.0 */ - void exportTemporaryPersonExample(File exportFile); - - /** - * Import temporary gears from the given csv import file. - * - * @param importFile csv file to import - * @since 1.0 - */ @Transactional(readOnly = false) - void importTemporaryGear(File importFile); + List<Gear> importTemporaryGear(List<Gear> gears); - /** - * Export some example temporary gears to the given file. - * - * @param exportFile file where to export data - * @since 1.0 - */ - void exportTemporaryGearExample(File exportFile); - //------------------------------------------------------------------------// //-- 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-07 06:58:15 UTC (rev 354) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java 2013-02-07 08:26:42 UTC (rev 355) @@ -380,45 +380,25 @@ } @Override - public void importTemporarySpecies(File importFile) { + public List<Species> importTemporarySpecies(List<Species> species) { throw new IllegalStateException("method 'importTemporarySpecies' not implemented"); } @Override - public void importTemporaryVessel(File importfile) { + public List<Vessel> importTemporaryVessel(List<Vessel> vessels) { throw new IllegalStateException("method 'importTemporaryVessel' not implemented"); } @Override - public void importTemporaryPerson(File importFile) { + public List<Person> importTemporaryPerson(List<Person> persons) { throw new IllegalStateException("method 'importTemporaryPerson' not implemented"); } @Override - public void importTemporaryGear(File importFile) { + public List<Gear> importTemporaryGear(List<Gear> gears) { throw new IllegalStateException("method 'importTemporaryGear' not implemented"); } - @Override - public void exportTemporarySpeciesExample(File exportFile) { - throw new IllegalStateException("method 'exportTemporarySpeciesExample' not implemented"); - } - - @Override - public void exportTemporaryVesselExample(File exportFile) { - throw new IllegalStateException("method 'exportTemporaryVesselExample' not implemented"); - } - - @Override - public void exportTemporaryPersonExample(File exportFile) { - throw new IllegalStateException("method 'exportTemporaryPersonExample' not implemented"); - } - - @Override - public void exportTemporaryGearExample(File exportFile) { - throw new IllegalStateException("method 'exportTemporaryGearExample' not implemented"); - } - //------------------------------------------------------------------------// //-- 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-07 06:58:15 UTC (rev 354) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-02-07 08:26:42 UTC (rev 355) @@ -62,7 +62,6 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; -import java.io.File; import java.io.IOException; import java.util.List; import java.util.Map; @@ -288,50 +287,25 @@ } @Override - public void importTemporarySpecies(File importFile) { - - List<Species> species = null; - referentialService.importTemporarySpecies(species); + public List<Species> importTemporarySpecies(List<Species> species) { + return referentialService.importTemporarySpecies(species); } @Override - public void importTemporaryVessel(File importfile) { - List<Vessel> vessels = null; - referentialService.importTemporaryVessel(vessels); + public List<Vessel> importTemporaryVessel(List<Vessel> vessels) { + return referentialService.importTemporaryVessel(vessels); } @Override - public void importTemporaryPerson(File importFile) { - List<Person> persons = null; - referentialService.importTemporaryPerson(persons); + public List<Person> importTemporaryPerson(List<Person> persons) { + return referentialService.importTemporaryPerson(persons); } @Override - public void importTemporaryGear(File importFile) { - List<Gear> gears = null; - referentialService.importTemporaryGear(gears); + public List<Gear> importTemporaryGear(List<Gear> gears) { + return referentialService.importTemporaryGear(gears); } - @Override - public void exportTemporarySpeciesExample(File exportFile) { - //TODO - } - - @Override - public void exportTemporaryVesselExample(File exportFile) { - //TODO - } - - @Override - public void exportTemporaryPersonExample(File exportFile) { - //TODO - } - - @Override - public void exportTemporaryGearExample(File exportFile) { - //TODO - } - //------------------------------------------------------------------------// //-- Program methods --// //------------------------------------------------------------------------// Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java 2013-02-07 06:58:15 UTC (rev 354) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java 2013-02-07 08:26:42 UTC (rev 355) @@ -34,10 +34,13 @@ import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicType; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.SystemUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.cfg.Environment; +import java.io.File; import java.sql.Connection; import java.sql.DriverManager; import java.sql.ResultSet; @@ -302,4 +305,33 @@ return result; } + public static File getTestSpecificDirectory(Class<?> testClassName, + String methodName, + String classifier, + long timestamp) { + // Trying to look for the temporary folder to store data for the test + String tempDirPath = System.getProperty("java.io.tmpdir"); + if (tempDirPath == null) { + // can this really occur ? + tempDirPath = ""; + if (log.isWarnEnabled()) { + log.warn("'\"java.io.tmpdir\" not defined"); + } + } + File tempDirFile = SystemUtils.getJavaIoTmpDir(); + + // create the directory to store database data + String dataBasePath = testClassName.getName() + + File.separator // a directory with the test class name + + methodName; // a sub-directory with the method name + + if (StringUtils.isNotBlank(classifier)) { + dataBasePath += classifier; + } + dataBasePath += '_' + + timestamp; // and a timestamp + File databaseFile = new File(tempDirFile, dataBasePath); + return databaseFile; + } + } 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-07 06:58:15 UTC (rev 354) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-02-07 08:26:42 UTC (rev 355) @@ -54,6 +54,7 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.transaction.annotation.Transactional; import java.io.File; import java.io.IOException; @@ -315,45 +316,29 @@ } @Override - public void importTemporarySpecies(File importFile) { - driver.importTemporarySpecies(importFile); + @Transactional(readOnly = false) + public List<Species> importTemporarySpecies(List<Species> species) { + return driver.importTemporarySpecies(species); } @Override - public void importTemporaryVessel(File importFile) { - driver.importTemporaryVessel(importFile); + @Transactional(readOnly = false) + public List<Vessel> importTemporaryVessel(List<Vessel> vessels) { + return driver.importTemporaryVessel(vessels); } @Override - public void importTemporaryPerson(File importFile) { - driver.importTemporaryPerson(importFile); + @Transactional(readOnly = false) + public List<Person> importTemporaryPerson(List<Person> persons) { + return driver.importTemporaryPerson(persons); } @Override - public void importTemporaryGear(File importFile) { - driver.importTemporaryGear(importFile); + @Transactional(readOnly = false) + public List<Gear> importTemporaryGear(List<Gear> gears) { + return driver.importTemporaryGear(gears); } - @Override - public void exportTemporarySpeciesExample(File exportFile) { - driver.exportTemporarySpeciesExample(exportFile); - } - - @Override - public void exportTemporaryVesselExample(File exportFile) { - driver.exportTemporaryVesselExample(exportFile); - } - - @Override - public void exportTemporaryPersonExample(File exportFile) { - driver.exportTemporaryPersonExample(exportFile); - } - - @Override - public void exportTemporaryGearExample(File exportFile) { - driver.exportTemporaryGearExample(exportFile); - } - //------------------------------------------------------------------------// //-- Program methods --// //------------------------------------------------------------------------// Added: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/GearModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/GearModel.java (rev 0) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/GearModel.java 2013-02-07 08:26:42 UTC (rev 355) @@ -0,0 +1,57 @@ +package fr.ifremer.tutti.service.referential; + +/* + * #%L + * Tutti :: Service + * $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 fr.ifremer.tutti.persistence.entities.referential.Gear; +import fr.ifremer.tutti.service.TuttiCsvUtil; + +/** + * Model to import / export {@link Gear} in csv format. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.0 + */ +public class GearModel extends TuttiCsvUtil.AbstractTuttiImportExportModel<Gear> { + + public GearModel(char separator) { + super(separator); + + // import definition + + newMandatoryColumn(Gear.PROPERTY_NAME); + newMandatoryColumn(Gear.PROPERTY_LABEL); + + // export definition + + newColumnForExport(Gear.PROPERTY_NAME); + newColumnForExport(Gear.PROPERTY_LABEL); + } + + @Override + public Gear newEmptyInstance() { + return new Gear(); + } + +} Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/GearModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/PersonModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/PersonModel.java (rev 0) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/PersonModel.java 2013-02-07 08:26:42 UTC (rev 355) @@ -0,0 +1,58 @@ +package fr.ifremer.tutti.service.referential; + +/* + * #%L + * Tutti :: Service + * $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 fr.ifremer.tutti.persistence.entities.referential.Person; +import fr.ifremer.tutti.persistence.entities.referential.Species; +import fr.ifremer.tutti.service.TuttiCsvUtil; + +/** + * Model to import / export {@link Person} in csv format. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.0 + */ +public class PersonModel extends TuttiCsvUtil.AbstractTuttiImportExportModel<Person> { + + public PersonModel(char separator) { + super(separator); + + // import definition + + newMandatoryColumn(Person.PROPERTY_FIRST_NAME); + newMandatoryColumn(Person.PROPERTY_LAST_NAME); + + // export definition + + newColumnForExport(Person.PROPERTY_FIRST_NAME); + newColumnForExport(Person.PROPERTY_LAST_NAME); + } + + @Override + public Person newEmptyInstance() { + return new Person(); + } + +} Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/PersonModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/SpeciesModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/SpeciesModel.java (rev 0) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/SpeciesModel.java 2013-02-07 08:26:42 UTC (rev 355) @@ -0,0 +1,55 @@ +package fr.ifremer.tutti.service.referential; + +/* + * #%L + * Tutti :: Service + * $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 fr.ifremer.tutti.persistence.entities.referential.Species; +import fr.ifremer.tutti.service.TuttiCsvUtil; + +/** + * Model to import / export {@link Species} in csv format. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.0 + */ +public class SpeciesModel extends TuttiCsvUtil.AbstractTuttiImportExportModel<Species> { + + public SpeciesModel(char separator) { + super(separator); + + // import definition + + newMandatoryColumn(Species.PROPERTY_NAME); + + // export definition + + newColumnForExport(Species.PROPERTY_NAME); + } + + @Override + public Species newEmptyInstance() { + return new Species(); + } + +} Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/SpeciesModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java (rev 0) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java 2013-02-07 08:26:42 UTC (rev 355) @@ -0,0 +1,360 @@ +package fr.ifremer.tutti.service.referential; + +/* + * #%L + * Tutti :: Service + * $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.base.Charsets; +import com.google.common.collect.Lists; +import com.google.common.io.Closeables; +import com.google.common.io.Files; +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.Vessel; +import fr.ifremer.tutti.service.AbstractTuttiService; +import fr.ifremer.tutti.service.PersistenceService; +import fr.ifremer.tutti.service.TuttiServiceContext; +import fr.ifremer.tutti.service.TuttiServiceTechnicalException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.csv.Export; +import org.nuiton.util.csv.Import; + +import java.io.BufferedWriter; +import java.io.File; +import java.io.IOException; +import java.io.Reader; +import java.util.List; + +/** + * Service to import or export referential. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.0 + */ +public class TuttiReferentialImportExportService extends AbstractTuttiService { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(TuttiReferentialImportExportService.class); + + protected PersistenceService persistenceService; + + @Override + public void setServiceContext(TuttiServiceContext context) { + super.setServiceContext(context); + persistenceService = getService(PersistenceService.class); + } + + public List<Species> importTemporarySpecies(File file) throws IOException { + + if (log.isInfoEnabled()) { + log.info("Will import species from file: " + file); + } + + List<Species> toImport = Lists.newArrayList(); + + Reader reader = Files.newReader(file, Charsets.UTF_8); + try { + SpeciesModel csvModel = new SpeciesModel(getCsvSeparator()); + Import<Species> importer = Import.newImport(csvModel, reader); + + try { + + for (Species bean : importer) { + toImport.add(bean); + } + importer.close(); + } finally { + Closeables.closeQuietly(importer); + } + reader.close(); + } catch (Exception e) { + throw new IOException("Could not import species from file " + file, e); + } finally { + + Closeables.closeQuietly(reader); + } + + List<Species> result = + persistenceService.importTemporarySpecies(toImport); + return result; + } + + public List<Vessel> importTemporaryVessel(File file) throws IOException { + if (log.isInfoEnabled()) { + log.info("Will import vessels from file: " + file); + } + + List<Vessel> toImport = Lists.newArrayList(); + + Reader reader = Files.newReader(file, Charsets.UTF_8); + try { + VesselModel csvModel = new VesselModel(getCsvSeparator()); + Import<Vessel> importer = Import.newImport(csvModel, reader); + + try { + + for (Vessel bean : importer) { + toImport.add(bean); + } + importer.close(); + } finally { + Closeables.closeQuietly(importer); + } + reader.close(); + } catch (Exception e) { + throw new IOException("Could not import vessels from file " + file, e); + } finally { + + Closeables.closeQuietly(reader); + } + List<Vessel> result = + persistenceService.importTemporaryVessel(toImport); + return result; + } + + public List<Person> importTemporaryPerson(File file) throws IOException { + if (log.isInfoEnabled()) { + log.info("Will import persons from file: " + file); + } + + List<Person> toImport = Lists.newArrayList(); + + Reader reader = Files.newReader(file, Charsets.UTF_8); + try { + PersonModel csvModel = new PersonModel(getCsvSeparator()); + Import<Person> importer = Import.newImport(csvModel, reader); + + try { + + for (Person bean : importer) { + toImport.add(bean); + } + importer.close(); + } finally { + Closeables.closeQuietly(importer); + } + reader.close(); + } catch (Exception e) { + throw new IOException("Could not import persons from file " + file, e); + } finally { + + Closeables.closeQuietly(reader); + } + List<Person> result = + persistenceService.importTemporaryPerson(toImport); + return result; + } + + public List<Gear> importTemporaryGear(File file) throws IOException { + if (log.isInfoEnabled()) { + log.info("Will import gears from file: " + file); + } + + List<Gear> toImport = Lists.newArrayList(); + + Reader reader = Files.newReader(file, Charsets.UTF_8); + try { + GearModel csvModel = new GearModel(getCsvSeparator()); + Import<Gear> importer = Import.newImport(csvModel, reader); + + try { + + for (Gear bean : importer) { + toImport.add(bean); + } + importer.close(); + } finally { + Closeables.closeQuietly(importer); + } + reader.close(); + } catch (Exception e) { + throw new IOException("Could not import gears from file " + file, e); + } finally { + + Closeables.closeQuietly(reader); + } + List<Gear> result = + persistenceService.importTemporaryGear(toImport); + return result; + } + + public void exportTemporarySpeciesExample(File file) throws IOException { + + List<Species> toExport = Lists.newArrayList(); + + Species s; + + s = new Species(); + s.setName("Temporary Species name 1"); + toExport.add(s); + + s = new Species(); + s.setName("Temporary Species name 2"); + toExport.add(s); + + s = new Species(); + s.setName("Temporary Species name 3"); + toExport.add(s); + + SpeciesModel csvModel = new SpeciesModel(getCsvSeparator()); + + BufferedWriter writer = Files.newWriter(file, Charsets.UTF_8); + try { + Export export = Export.newExport(csvModel, toExport); + export.write(writer); + writer.close(); + } catch (IOException e) { + throw e; + } catch (Exception e) { + throw new TuttiServiceTechnicalException("Could not export species to file: " + file, e); + } finally { + Closeables.closeQuietly(writer); + } + + } + + public void exportTemporaryVesselExample(File file) throws IOException { + List<Vessel> toExport = Lists.newArrayList(); + + Vessel v; + + v = new Vessel(); + v.setName("Temporary fishing vessel name 1"); + v.setInternalRegistrationCode("International registration code F1"); + v.setScientificVessel(false); + toExport.add(v); + + v = new Vessel(); + v.setName("Temporary fishing vessel name 2"); + v.setInternalRegistrationCode("International registration code F2"); + v.setScientificVessel(false); + toExport.add(v); + + v = new Vessel(); + v.setName("Temporary scientific vessel name 3"); + v.setInternalRegistrationCode("International registration code S3"); + v.setScientificVessel(true); + toExport.add(v); + + v = new Vessel(); + v.setName("Temporary scientific vessel name 4"); + v.setInternalRegistrationCode("International registration code S4"); + v.setScientificVessel(true); + toExport.add(v); + + VesselModel csvModel = new VesselModel(getCsvSeparator()); + + BufferedWriter writer = Files.newWriter(file, Charsets.UTF_8); + try { + Export export = Export.newExport(csvModel, toExport); + export.write(writer); + writer.close(); + } catch (IOException e) { + throw e; + } catch (Exception e) { + throw new TuttiServiceTechnicalException("Could not export species to file: " + file, e); + } finally { + Closeables.closeQuietly(writer); + } + } + + public void exportTemporaryPersonExample(File file) throws IOException { + List<Person> toExport = Lists.newArrayList(); + + Person p; + + p = new Person(); + p.setFirstName("First name 1"); + p.setLastName("Last name 1"); + toExport.add(p); + + p = new Person(); + p.setFirstName("First name 2"); + p.setLastName("Last name 2"); + toExport.add(p); + + p = new Person(); + p.setFirstName("First name 3"); + p.setLastName("Last name 3"); + toExport.add(p); + + + PersonModel csvModel = new PersonModel(getCsvSeparator()); + + BufferedWriter writer = Files.newWriter(file, Charsets.UTF_8); + try { + Export export = Export.newExport(csvModel, toExport); + export.write(writer); + writer.close(); + } catch (IOException e) { + throw e; + } catch (Exception e) { + throw new TuttiServiceTechnicalException("Could not export species to file: " + file, e); + } finally { + Closeables.closeQuietly(writer); + } + } + + public void exportTemporaryGearExample(File file) throws IOException { + List<Gear> toExport = Lists.newArrayList(); + + Gear g; + + g = new Gear(); + g.setName("Gear name 1"); + g.setLabel("Gear label 1"); + toExport.add(g); + + g = new Gear(); + g.setName("Gear name 2"); + g.setLabel("Gear label 2"); + toExport.add(g); + + g = new Gear(); + g.setName("Gear name 3"); + g.setLabel("Gear label 3"); + toExport.add(g); + + GearModel csvModel = new GearModel(getCsvSeparator()); + + BufferedWriter writer = Files.newWriter(file, Charsets.UTF_8); + try { + Export export = Export.newExport(csvModel, toExport); + export.write(writer); + writer.close(); + } catch (IOException e) { + throw e; + } catch (Exception e) { + throw new TuttiServiceTechnicalException("Could not export species to file: " + file, e); + } finally { + Closeables.closeQuietly(writer); + } + } + + protected char getCsvSeparator() { + return context.getConfig().getCsvSeparator(); + } +} Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselModel.java (rev 0) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselModel.java 2013-02-07 08:26:42 UTC (rev 355) @@ -0,0 +1,60 @@ +package fr.ifremer.tutti.service.referential; + +/* + * #%L + * Tutti :: Service + * $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 fr.ifremer.tutti.persistence.entities.referential.Vessel; +import fr.ifremer.tutti.service.TuttiCsvUtil; +import org.nuiton.util.csv.Common; + +/** + * Model to import / export {@link Vessel} in csv format. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.0 + */ +public class VesselModel extends TuttiCsvUtil.AbstractTuttiImportExportModel<Vessel> { + + public VesselModel(char separator) { + super(separator); + + // import definition + + newMandatoryColumn(Vessel.PROPERTY_NAME); + newMandatoryColumn(Vessel.PROPERTY_INTERNAL_REGISTRATION_CODE); + newMandatoryColumn(Vessel.PROPERTY_SCIENTIFIC_VESSEL, Common.PRIMITIVE_BOOLEAN); + + // export definition + + newColumnForExport(Vessel.PROPERTY_NAME); + newColumnForExport(Vessel.PROPERTY_INTERNAL_REGISTRATION_CODE); + newColumnForExport(Vessel.PROPERTY_SCIENTIFIC_VESSEL, Common.PRIMITIVE_BOOLEAN); + } + + @Override + public Vessel newEmptyInstance() { + return new Vessel(); + } + +} Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native 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-07 06:58:15 UTC (rev 354) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java 2013-02-07 08:26:42 UTC (rev 355) @@ -28,12 +28,11 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.io.Files; +import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Species; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.SystemUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; @@ -122,9 +121,9 @@ @Before public void setUp() throws Exception { - datadirectory = getTestSpecificDirectory(getClass(), - name.getMethodName(), - null); + datadirectory = TuttiEntities.getTestSpecificDirectory(getClass(), + name.getMethodName(), + null, TIMESTAMP); service = new TuttiProtocolImportExportService() { @@ -397,34 +396,6 @@ Assert.assertEquals(PROTOCOL_SPECIES_FILE_CONTENT, exportFileToString); } - public static File getTestSpecificDirectory(Class<?> testClassName, - String methodName, - String classifier) { - // Trying to look for the temporary folder to store data for the test - String tempDirPath = System.getProperty("java.io.tmpdir"); - if (tempDirPath == null) { - // can this really occur ? - tempDirPath = ""; - if (log.isWarnEnabled()) { - log.warn("'\"java.io.tmpdir\" not defined"); - } - } - File tempDirFile = SystemUtils.getJavaIoTmpDir(); - - // create the directory to store database data - String dataBasePath = testClassName.getName() - + File.separator // a directory with the test class name - + methodName; // a sub-directory with the method name - - if (StringUtils.isNotBlank(classifier)) { - dataBasePath += classifier; - } - dataBasePath += '_' - + TIMESTAMP; // and a timestamp - File databaseFile = new File(tempDirFile, dataBasePath); - return databaseFile; - } - protected Map<String, Caracteristic> createCaracteristics() { Map<String, Caracteristic> result = Maps.newTreeMap(); for (int i = 1; i < 6; i++) { Added: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java (rev 0) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java 2013-02-07 08:26:42 UTC (rev 355) @@ -0,0 +1,343 @@ +package fr.ifremer.tutti.service.referential; + +/* + * #%L + * Tutti :: Service + * $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.base.Charsets; +import com.google.common.collect.Lists; +import com.google.common.io.Files; +import fr.ifremer.tutti.persistence.RessourceClassLoader; +import fr.ifremer.tutti.persistence.config.TuttiPersistenceConfigOption; +import fr.ifremer.tutti.persistence.entities.TuttiEntities; +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.Vessel; +import fr.ifremer.tutti.service.PersistenceService; +import fr.ifremer.tutti.service.TuttiServiceContext; +import fr.ifremer.tutti.service.config.TuttiServiceConfig; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TestName; +import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.beans.Binder; +import org.nuiton.util.beans.BinderFactory; + +import java.io.File; +import java.util.List; + +/** + * @author tchemit <chemit(a)codelutin.com> + * @since 1.0 + */ +public class TuttiReferentialImportExportServiceTest { + + public static final long TIMESTAMP = System.nanoTime(); + + @Rule + public final TestName name = new TestName(); + + protected File datadirectory; + + protected TuttiReferentialImportExportService service; + + private ClassLoader oldClassLoader; + + public static final String SPECIES_FILE_CONTENT = + "name\n" + + "Temporary Species name 1;\n" + + "Temporary Species name 2;\n" + + "Temporary Species name 3;"; + + public static final String GEAR_FILE_CONTENT = + "name;label\n" + + "Gear name 1;Gear label 1;\n" + + "Gear name 2;Gear label 2;\n" + + "Gear name 3;Gear label 3;"; + + public static final String PERSON_FILE_CONTENT = + "firstName;lastName\n" + + "First name 1;Last name 1;\n" + + "First name 2;Last name 2;\n" + + "First name 3;Last name 3;"; + + public static final String VESSEL_FILE_CONTENT = + "name;internalRegistrationCode;scientificVessel\n" + + "Temporary fishing vessel name 1;International registration code F1;N;\n" + + "Temporary fishing vessel name 2;International registration code F2;N;\n" + + "Temporary scientific vessel name 3;International registration code S3;Y;\n" + + "Temporary scientific vessel name 4;International registration code S4;Y;"; + + @Test + public void importTemporarySpecies() throws Exception { + + File file = new File(datadirectory, "importSpecies.csv"); + + Files.createParentDirs(file); + + Files.write(SPECIES_FILE_CONTENT, file, Charsets.UTF_8); + + List<Species> result = service.importTemporarySpecies(file); + + Assert.assertNotNull(result); + Assert.assertEquals(3, result.size()); + for (int i = 1; i <= 3; i++) { + Species actual = result.get(i - 1); + Assert.assertNotNull(actual); + Assert.assertEquals("" + i, actual.getId()); + Assert.assertEquals("Temporary Species name " + i, actual.getName()); + } + } + + @Test + public void importTemporaryVessel() throws Exception { + File file = new File(datadirectory, "importVessel.csv"); + + Files.createParentDirs(file); + + Files.write(VESSEL_FILE_CONTENT, file, Charsets.UTF_8); + + List<Vessel> result = service.importTemporaryVessel(file); + + Assert.assertNotNull(result); + Assert.assertEquals(4, result.size()); + for (int i = 1; i <= 2; i++) { + Vessel actual = result.get(i - 1); + Assert.assertNotNull(actual); + Assert.assertEquals("" + i, actual.getId()); + Assert.assertEquals("Temporary fishing vessel name " + i, actual.getName()); + Assert.assertEquals("International registration code F" + i, actual.getInternalRegistrationCode()); + Assert.assertFalse(actual.isScientificVessel()); + } + for (int i = 3; i <= 4; i++) { + Vessel actual = result.get(i - 1); + Assert.assertNotNull(actual); + Assert.assertEquals("" + i, actual.getId()); + Assert.assertEquals("Temporary scientific vessel name " + i, actual.getName()); + Assert.assertEquals("International registration code S" + i, actual.getInternalRegistrationCode()); + Assert.assertTrue(actual.isScientificVessel()); + } + } + + @Test + public void importTemporaryPerson() throws Exception { + File file = new File(datadirectory, "importPerson.csv"); + + Files.createParentDirs(file); + + Files.write(PERSON_FILE_CONTENT, file, Charsets.UTF_8); + + List<Person> result = service.importTemporaryPerson(file); + + Assert.assertNotNull(result); + Assert.assertEquals(3, result.size()); + for (int i = 1; i <= 3; i++) { + Person actual = result.get(i - 1); + Assert.assertNotNull(actual); + Assert.assertEquals("" + i, actual.getId()); + Assert.assertEquals("First name " + i, actual.getFirstName()); + Assert.assertEquals("Last name " + i, actual.getLastName()); + } + } + + @Test + public void importTemporaryGear() throws Exception { + File file = new File(datadirectory, "importGear.csv"); + + Files.createParentDirs(file); + + Files.write(GEAR_FILE_CONTENT, file, Charsets.UTF_8); + + List<Gear> result = service.importTemporaryGear(file); + + Assert.assertNotNull(result); + Assert.assertEquals(3, result.size()); + for (int i = 1; i <= 3; i++) { + Gear actual = result.get(i - 1); + Assert.assertNotNull(actual); + Assert.assertEquals("" + i, actual.getId()); + Assert.assertEquals("Gear name " + i, actual.getName()); + Assert.assertEquals("Gear label " + i, actual.getLabel()); + } + } + + @Test + public void exportTemporarySpeciesExample() throws Exception { + + File file = new File(datadirectory, "importSpecies.csv"); + + Assert.assertFalse(file.exists()); + service.exportTemporarySpeciesExample(file); + Assert.assertTrue(file.exists()); + + String exportFileToString = Files.toString(file, Charsets.UTF_8).trim(); + Assert.assertEquals(SPECIES_FILE_CONTENT, exportFileToString); + } + + @Test + public void exportTemporaryVesselExample() throws Exception { + File file = new File(datadirectory, "importVessel.csv"); + + Assert.assertFalse(file.exists()); + service.exportTemporaryVesselExample(file); + Assert.assertTrue(file.exists()); + + String exportFileToString = Files.toString(file, Charsets.UTF_8).trim(); + Assert.assertEquals(VESSEL_FILE_CONTENT, exportFileToString); + } + + @Test + public void exportTemporaryPersonExample() throws Exception { + File file = new File(datadirectory, "importPerson.csv"); + + Assert.assertFalse(file.exists()); + service.exportTemporaryPersonExample(file); + Assert.assertTrue(file.exists()); + + String exportFileToString = Files.toString(file, Charsets.UTF_8).trim(); + Assert.assertEquals(PERSON_FILE_CONTENT, exportFileToString); + } + + @Test + public void exportTemporaryGearExample() throws Exception { + File file = new File(datadirectory, "importGear.csv"); + + Assert.assertFalse(file.exists()); + service.exportTemporaryGearExample(file); + Assert.assertTrue(file.exists()); + + String exportFileToString = Files.toString(file, Charsets.UTF_8).trim(); + Assert.assertEquals(GEAR_FILE_CONTENT, exportFileToString); + } + + @Before + public void setUp() throws Exception { + datadirectory = TuttiEntities.getTestSpecificDirectory(getClass(), + name.getMethodName(), + null, TIMESTAMP); + + ApplicationConfig applicationConfig = + new ApplicationConfig("tutti-test.properties"); + applicationConfig.loadDefaultOptions( + TuttiPersistenceConfigOption.values()); + applicationConfig.setDefaultOption("tutti.data.directory", + new File(datadirectory, "data").getAbsolutePath()); + applicationConfig.parse(); + + RessourceClassLoader loader = + new RessourceClassLoader(getClass().getClassLoader()); + + oldClassLoader = Thread.currentThread().getContextClassLoader(); + Thread.currentThread().setContextClassLoader(loader); + + TuttiServiceConfig config = + new TuttiServiceConfig(applicationConfig); + + TuttiServiceContext serviceContext = + new TuttiServiceContext(loader, config); + + service = new TuttiReferentialImportExportService() { + + @Override + protected char getCsvSeparator() { + return ';'; + } + + @Override + public void setServiceContext(TuttiServiceContext context) { + this.context = context; + persistenceService = new PersistenceService() { + @Override + public List<Species> importTemporarySpecies(List<Species> species) { + Binder<Species, Species> binder = BinderFactory.newBinder(Species.class); + List<Species> result = Lists.newArrayList(); + int i = 1; + for (Species source : species) { + Species target = new Species(); + binder.copy(source, target); + target.setId("" + i++); + result.add(target); + } + return result; + } + + @Override + public List<Vessel> importTemporaryVessel(List<Vessel> vessels) { + Binder<Vessel, Vessel> binder = BinderFactory.newBinder(Vessel.class); + List<Vessel> result = Lists.newArrayList(); + int i = 1; + for (Vessel source : vessels) { + Vessel target = new Vessel(); + binder.copy(source, target); + target.setId("" + i++); + result.add(target); + } + return result; + } + + @Override + public List<Person> importTemporaryPerson(List<Person> persons) { + Binder<Person, Person> binder = BinderFactory.newBinder(Person.class); + List<Person> result = Lists.newArrayList(); + int i = 1; + for (Person source : persons) { + Person target = new Person(); + binder.copy(source, target); + target.setId("" + i++); + result.add(target); + } + return result; + } + + @Override + public List<Gear> importTemporaryGear(List<Gear> gears) { + Binder<Gear, Gear> binder = BinderFactory.newBinder(Gear.class); + List<Gear> result = Lists.newArrayList(); + int i = 1; + for (Gear source : gears) { + Gear target = new Gear(); + binder.copy(source, target); + target.setId("" + i++); + result.add(target); + } + return result; + } + }; + persistenceService.setServiceContext(context); + } + }; + service.setServiceContext(serviceContext); + } + + @After + public void tearDown() throws Exception { + // push back old classLoader + if (oldClassLoader != null) { + Thread.currentThread().setContextClassLoader(oldClassLoader); + } + } +} Property changes on: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java 2013-02-07 06:58:15 UTC (rev 354) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java 2013-02-07 08:26:42 UTC (rev 355) @@ -24,6 +24,7 @@ * #L% */ +import fr.ifremer.tutti.service.referential.TuttiReferentialImportExportService; import fr.ifremer.tutti.ui.swing.AbstractTuttiAction; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; @@ -93,7 +94,9 @@ "referential to file: " + file); } - getHandler().persistenceService.exportTemporaryGearExample(file); + TuttiReferentialImportExportService service = + getContext().getService(TuttiReferentialImportExportService.class); + service.exportTemporaryGearExample(file); sendMessage("Exemple de référentiel temporaire d'engins exporté " + "dans le fichier " + file + "."); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java 2013-02-07 06:58:15 UTC (rev 354) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java 2013-02-07 08:26:42 UTC (rev 355) @@ -24,6 +24,7 @@ * #L% */ +import fr.ifremer.tutti.service.referential.TuttiReferentialImportExportService; import fr.ifremer.tutti.ui.swing.AbstractTuttiAction; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; @@ -93,8 +94,11 @@ "referential to file: " + file); } - getHandler().persistenceService.exportTemporaryPersonExample(file); + TuttiReferentialImportExportService service = + getContext().getService(TuttiReferentialImportExportService.class); + service.exportTemporaryPersonExample(file); + sendMessage("Exemple de référentiel temporaire de personnes exporté " + "dans le fichier " + file + "."); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java 2013-02-07 06:58:15 UTC (rev 354) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java 2013-02-07 08:26:42 UTC (rev 355) @@ -24,6 +24,7 @@ * #L% */ +import fr.ifremer.tutti.service.referential.TuttiReferentialImportExportService; import fr.ifremer.tutti.ui.swing.AbstractTuttiAction; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; @@ -93,8 +94,11 @@ "referential to file: " + file); } - getHandler().persistenceService.exportTemporarySpeciesExample(file); + TuttiReferentialImportExportService service = + getContext().getService(TuttiReferentialImportExportService.class); + service.exportTemporarySpeciesExample(file); + sendMessage("Exemple de référentiel temporaire d'espèces exporté " + "dans le fichier " + file + "."); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java 2013-02-07 06:58:15 UTC (rev 354) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java 2013-02-07 08:26:42 UTC (rev 355) @@ -24,6 +24,7 @@ * #L% */ +import fr.ifremer.tutti.service.referential.TuttiReferentialImportExportService; import fr.ifremer.tutti.ui.swing.AbstractTuttiAction; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; @@ -93,8 +94,11 @@ "referential to file: " + file); } - getHandler().persistenceService.exportTemporaryVesselExample(file); + TuttiReferentialImportExportService service = + getContext().getService(TuttiReferentialImportExportService.class); + service.exportTemporaryVesselExample(file); + sendMessage("Exemple de référentiel temporaire de navires exporté " + "dans le fichier " + file + "."); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java 2013-02-07 06:58:15 UTC (rev 354) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java 2013-02-07 08:26:42 UTC (rev 355) @@ -24,6 +24,7 @@ * #L% */ +import fr.ifremer.tutti.service.referential.TuttiReferentialImportExportService; import fr.ifremer.tutti.ui.swing.AbstractTuttiAction; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; @@ -93,8 +94,11 @@ "referential from file: " + file); } - getHandler().persistenceService.importTemporaryGear(file); + TuttiReferentialImportExportService service = + getContext().getService(TuttiReferentialImportExportService.class); + service.importTemporaryGear(file); + sendMessage("Référentiel temporaire d'engins importé depuis le " + "fichier " + file + "."); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java 2013-02-07 06:58:15 UTC (rev 354) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java 2013-02-07 08:26:42 UTC (rev 355) @@ -24,6 +24,7 @@ * #L% */ +import fr.ifremer.tutti.service.referential.TuttiReferentialImportExportService; import fr.ifremer.tutti.ui.swing.AbstractTuttiAction; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; @@ -93,8 +94,11 @@ "referential from file: " + file); } - getHandler().persistenceService.importTemporaryPerson(file); + TuttiReferentialImportExportService service = + getContext().getService(TuttiReferentialImportExportService.class); + service.importTemporaryPerson(file); + sendMessage("Référentiel temporaire de personnes importé depuis le " + "fichier " + file + "."); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java 2013-02-07 06:58:15 UTC (rev 354) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java 2013-02-07 08:26:42 UTC (rev 355) @@ -24,6 +24,7 @@ * #L% */ +import fr.ifremer.tutti.service.referential.TuttiReferentialImportExportService; import fr.ifremer.tutti.ui.swing.AbstractTuttiAction; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; @@ -93,8 +94,11 @@ "referential from file: " + file); } - getHandler().persistenceService.importTemporarySpecies(file); + TuttiReferentialImportExportService service = + getContext().getService(TuttiReferentialImportExportService.class); + service.importTemporarySpecies(file); + sendMessage("Référentiel temporaire d'espèces importé depuis le " + "fichier " + file + "."); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java 2013-02-07 06:58:15 UTC (rev 354) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java 2013-02-07 08:26:42 UTC (rev 355) @@ -24,6 +24,7 @@ * #L% */ +import fr.ifremer.tutti.service.referential.TuttiReferentialImportExportService; import fr.ifremer.tutti.ui.swing.AbstractTuttiAction; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; @@ -93,8 +94,11 @@ "referential from file: " + file); } - getHandler().persistenceService.importTemporaryVessel(file); + TuttiReferentialImportExportService service = + getContext().getService(TuttiReferentialImportExportService.class); + service.importTemporaryVessel(file); + sendMessage("Référentiel temporaire de navires importé depuis le " + "fichier " + file + "."); }

1 0

r354 - in trunk/tutti-persistence/src: main/java/fr/ifremer/tutti/persistence/service test/java/fr/ifremer/tutti/persistence/service
by tchemit＠users.forge.codelutin.com Feb. 7, 2013

Feb. 7, 2013

Author: tchemit Date: 2013-02-07 07:58:15 +0100 (Thu, 07 Feb 2013) New Revision: 354 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/354 Log: remove dead code Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceService.java trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImplTest.java trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceTest.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceService.java 2013-02-07 06:57:49 UTC (rev 353) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceService.java 2013-02-07 06:58:15 UTC (rev 354) @@ -43,8 +43,6 @@ List<SpeciesBatch> getAllRootSpeciesBatch(String fishingOperationId); -// List<SpeciesBatch> getAllSpeciesBatch(String fishingOperationId); -// SpeciesBatch getSpeciesBatch(String id); List<SpeciesBatchFrequency> getAllSpeciesBatchFrequency( Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImplTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImplTest.java 2013-02-07 06:57:49 UTC (rev 353) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImplTest.java 2013-02-07 06:58:15 UTC (rev 354) @@ -119,9 +119,9 @@ @Test public void createAndSaveCatchBatch() throws Exception { - CatchBatch catchBatch = null; - CatchBatch createdCatchBatch = null; - CatchBatch reloadedCatchBatch = null; + CatchBatch catchBatch; + CatchBatch createdCatchBatch; + CatchBatch reloadedCatchBatch; catchBatch = new CatchBatch(); catchBatch.setFishingOperation(fishingOperation); Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceTest.java 2013-02-07 06:57:49 UTC (rev 353) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceTest.java 2013-02-07 06:58:15 UTC (rev 354) @@ -153,9 +153,9 @@ @Test public void createSpeciesBatch(/*SpeciesBatch bean, String parentBatchId*/) { - SpeciesBatch esp1Batch = null; - SpeciesBatch esp2Batch = null; - SpeciesBatch batch = null; + SpeciesBatch esp1Batch; + SpeciesBatch esp2Batch; + SpeciesBatch batch; Species taxon1 = species.get(0); Species taxon2 = species.get(1); @@ -304,9 +304,9 @@ @Test public void deleteSpeciesBatch(/*String id*/) { - SpeciesBatch esp1Batch = null; + SpeciesBatch esp1Batch; SpeciesBatch childBatch = null; - SpeciesBatch batch = null; + SpeciesBatch batch; Species taxon1 = species.get(0); // -----------------------------------------------------------------------------

1 0

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

Feb. 7, 2013

Author: tchemit Date: 2013-02-07 07:57:49 +0100 (Thu, 07 Feb 2013) New Revision: 353 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/353 Log: fix db loading Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUIHandler.java 2013-02-06 17:18:50 UTC (rev 352) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUIHandler.java 2013-02-07 06:57:49 UTC (rev 353) @@ -77,6 +77,11 @@ context.setMainUI(ui); } + protected MainUIHandler(TuttiUIContext context) { + super(context, null); + this.persistenceService = null; + } + //------------------------------------------------------------------------// //-- AbstractTuttiUIHandler methods --// //------------------------------------------------------------------------// @@ -266,6 +271,7 @@ ui.getValidatorMessageWidget().registerValidator(validator); } + @Override public void clearValidators() { ui.getValidatorMessageWidget().clearValidators(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java 2013-02-06 17:18:50 UTC (rev 352) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java 2013-02-07 06:57:49 UTC (rev 353) @@ -63,7 +63,7 @@ log.info("Full launch mode, try to update."); } - MainUIHandler handler = new MainUIHandler(context, null); + MainUIHandler handler = new MainUIHandler(context); // try to update jre - i18n - application and exit if so new UpdateApplicationAction(handler).doAction(null);

1 0

r352 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing
by tchemit＠users.forge.codelutin.com Feb. 6, 2013

Feb. 6, 2013

Author: tchemit Date: 2013-02-06 18:18:50 +0100 (Wed, 06 Feb 2013) New Revision: 352 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/352 Log: fix message notifier NPE Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUIHandler.java 2013-02-06 17:16:20 UTC (rev 351) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUIHandler.java 2013-02-06 17:18:50 UTC (rev 352) @@ -74,7 +74,6 @@ protected MainUIHandler(TuttiUIContext context, MainUI ui) { super(context, ui); this.persistenceService = context.getService(PersistenceService.class); - context.addMessageNotifier(this); context.setMainUI(ui); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java 2013-02-06 17:16:20 UTC (rev 351) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java 2013-02-06 17:18:50 UTC (rev 352) @@ -93,6 +93,7 @@ context.open(); MainUI mainUI = new MainUI(context); + context.addMessageNotifier(mainUI.getHandler()); mainUI.setVisible(true); }

1 0

r351 - trunk/tutti-service/src/main/java/fr/ifremer/tutti/service
by tchemit＠users.forge.codelutin.com Feb. 6, 2013

Feb. 6, 2013

Author: tchemit Date: 2013-02-06 18:16:20 +0100 (Wed, 06 Feb 2013) New Revision: 351 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/351 Log: remove getAllSpeciesBatch method Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 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-06 17:14:16 UTC (rev 350) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-02-06 17:16:20 UTC (rev 351) @@ -495,16 +495,6 @@ } @Override - public List<SpeciesBatch> getAllSpeciesBatch(String fishingOperationId) { - return driver.getAllSpeciesBatch(fishingOperationId); - } - - @Override - public SpeciesBatch getSpeciesBatch(String id) { - return driver.getSpeciesBatch(id); - } - - @Override public SpeciesBatch createSpeciesBatch(SpeciesBatch bean, String parentBatchId) { return driver.createSpeciesBatch(bean, parentBatchId);

1 0

r350 - in trunk/tutti-persistence/src: main/java/fr/ifremer/tutti/persistence main/java/fr/ifremer/tutti/persistence/service test/java/fr/ifremer/tutti/persistence/service
by tchemit＠users.forge.codelutin.com Feb. 6, 2013

Feb. 6, 2013

Author: tchemit Date: 2013-02-06 18:14:16 +0100 (Wed, 06 Feb 2013) New Revision: 350 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/350 Log: remove getAllSpeciesBatch method 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/SpeciesBatchPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceTest.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-06 10:54:11 UTC (rev 349) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-02-06 17:14:16 UTC (rev 350) @@ -353,10 +353,10 @@ List<SpeciesBatch> getAllRootSpeciesBatch(String fishingOperationId); - List<SpeciesBatch> getAllSpeciesBatch(String fishingOperationId); +// List<SpeciesBatch> getAllSpeciesBatch(String fishingOperationId); +// +// SpeciesBatch getSpeciesBatch(String id); - SpeciesBatch getSpeciesBatch(String id); - @Transactional(readOnly = false) SpeciesBatch createSpeciesBatch(SpeciesBatch bean, String parentBatchId); 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-06 10:54:11 UTC (rev 349) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java 2013-02-06 17:14:16 UTC (rev 350) @@ -599,15 +599,7 @@ return result; } - @Override - public List<SpeciesBatch> getAllSpeciesBatch(final String fishingOperationId) { - List<SpeciesBatch> result = getAllTraitFilterBatches( - SpeciesBatch.class.getName(), fishingOperationId, null); - return result; - } - - @Override - public SpeciesBatch getSpeciesBatch(String id) { + private SpeciesBatch getSpeciesBatch(String id) { SpeciesBatch result = getBean(SpeciesBatch.class.getName(), id); 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-06 10:54:11 UTC (rev 349) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-02-06 17:14:16 UTC (rev 350) @@ -472,15 +472,15 @@ return speciesBatchService.getAllRootSpeciesBatch(fishingOperationId); } - @Override - public List<SpeciesBatch> getAllSpeciesBatch(String fishingOperationId) { - return speciesBatchService.getAllSpeciesBatch(fishingOperationId); - } +// @Override +// public List<SpeciesBatch> getAllSpeciesBatch(String fishingOperationId) { +// return speciesBatchService.getAllSpeciesBatch(fishingOperationId); +// } - @Override - public SpeciesBatch getSpeciesBatch(String id) { - return speciesBatchService.getSpeciesBatch(id); - } +// @Override +// public SpeciesBatch getSpeciesBatch(String id) { +// return speciesBatchService.getSpeciesBatch(id); +// } @Override public SpeciesBatch createSpeciesBatch(SpeciesBatch bean, String parentBatchId) { Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceService.java 2013-02-06 10:54:11 UTC (rev 349) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceService.java 2013-02-06 17:14:16 UTC (rev 350) @@ -43,8 +43,8 @@ List<SpeciesBatch> getAllRootSpeciesBatch(String fishingOperationId); - List<SpeciesBatch> getAllSpeciesBatch(String fishingOperationId); - +// List<SpeciesBatch> getAllSpeciesBatch(String fishingOperationId); +// SpeciesBatch getSpeciesBatch(String id); List<SpeciesBatchFrequency> getAllSpeciesBatchFrequency( Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2013-02-06 10:54:11 UTC (rev 349) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2013-02-06 17:14:16 UTC (rev 350) @@ -57,11 +57,9 @@ import java.io.Serializable; import java.text.MessageFormat; import java.util.ArrayList; -import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Set; /** @@ -107,59 +105,59 @@ return result; } +// @Override +// public List<SpeciesBatch> getAllSpeciesBatch(String fishingOperationId) { +// Iterator<Object[]> list = queryList("allSpeciesBatch", +// "fishingOperationId", IntegerType.INSTANCE, Integer.valueOf(fishingOperationId)); +// +// List<SpeciesBatch> result = new ArrayList<SpeciesBatch>(); +// List<SpeciesBatch> rootBatchs = new ArrayList<SpeciesBatch>(); +// +// Map<String, SpeciesBatch> batchMapById = new HashMap<String, SpeciesBatch>(); +// Map<String, String> parentBatchMapById = new HashMap<String, String>(); +// while (list.hasNext()) { +// Object[] source = list.next(); +// SpeciesBatch speciesBatch = loadSpeciesBatch(source, false); +// batchMapById.put(speciesBatch.getId(), speciesBatch); +// +// Integer parentbatchId = (Integer) source[11]; +// if (parentbatchId != null) { +// parentBatchMapById.put(speciesBatch.getId(), parentbatchId.toString()); +// } +// } +// +// for (Iterator iterator = batchMapById.values().iterator(); iterator.hasNext(); ) { +// SpeciesBatch speciesBatch = (SpeciesBatch) iterator.next(); +// +// // Retrieve the parent SpeciesBatch +// String parentbatchId = parentBatchMapById.get(speciesBatch.getId()); +// if (parentbatchId != null) { +// SpeciesBatch parentSpeciesBatch = batchMapById.get(parentbatchId); +// +// // If found, link the batch with its parent : +// if (parentSpeciesBatch != null) { +// speciesBatch.setParentBatch(parentSpeciesBatch); +// if (parentSpeciesBatch.getChildBatchs() == null) { +// parentSpeciesBatch.setChildBatchs(Lists.newArrayList(speciesBatch)); +// } else { +// parentSpeciesBatch.addChildBatchs(speciesBatch); +// } +// } +// +// // If no parent found = batch is a child of the catch batch +// else { +// rootBatchs.add(speciesBatch); +// } +// } +// } +// +// // Apply inheritance, starting with the catch batch children +// applyInheritedProperties(rootBatchs, null, null, result); +// +// return result; +// } +// @Override - public List<SpeciesBatch> getAllSpeciesBatch(String fishingOperationId) { - Iterator<Object[]> list = queryList("allSpeciesBatch", - "fishingOperationId", IntegerType.INSTANCE, Integer.valueOf(fishingOperationId)); - - List<SpeciesBatch> result = new ArrayList<SpeciesBatch>(); - List<SpeciesBatch> rootBatchs = new ArrayList<SpeciesBatch>(); - - Map<String, SpeciesBatch> batchMapById = new HashMap<String, SpeciesBatch>(); - Map<String, String> parentBatchMapById = new HashMap<String, String>(); - while (list.hasNext()) { - Object[] source = list.next(); - SpeciesBatch speciesBatch = loadSpeciesBatch(source, false); - batchMapById.put(speciesBatch.getId(), speciesBatch); - - Integer parentbatchId = (Integer) source[11]; - if (parentbatchId != null) { - parentBatchMapById.put(speciesBatch.getId(), parentbatchId.toString()); - } - } - - for (Iterator iterator = batchMapById.values().iterator(); iterator.hasNext(); ) { - SpeciesBatch speciesBatch = (SpeciesBatch) iterator.next(); - - // Retrieve the parent SpeciesBatch - String parentbatchId = parentBatchMapById.get(speciesBatch.getId()); - if (parentbatchId != null) { - SpeciesBatch parentSpeciesBatch = batchMapById.get(parentbatchId); - - // If found, link the batch with its parent : - if (parentSpeciesBatch != null) { - speciesBatch.setParentBatch(parentSpeciesBatch); - if (parentSpeciesBatch.getChildBatchs() == null) { - parentSpeciesBatch.setChildBatchs(Lists.newArrayList(speciesBatch)); - } else { - parentSpeciesBatch.addChildBatchs(speciesBatch); - } - } - - // If no parent found = batch is a child of the catch batch - else { - rootBatchs.add(speciesBatch); - } - } - } - - // Apply inheritance, starting with the catch batch children - applyInheritedProperties(rootBatchs, null, null, result); - - return result; - } - - @Override public SpeciesBatch getSpeciesBatch(String id) { Object[] source = queryUnique("speciesBatch", "batchId", IntegerType.INSTANCE, Integer.valueOf(id)); Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceTest.java 2013-02-06 10:54:11 UTC (rev 349) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceTest.java 2013-02-06 17:14:16 UTC (rev 350) @@ -268,12 +268,12 @@ assertNotNull(rootSpeciesBatch); assertEquals(2, rootSpeciesBatch.size()); - // ----------------------------------------------------------------------------- - // 4. Test get all species - // ----------------------------------------------------------------------------- - List<SpeciesBatch> allSpeciesBatch = service.getAllSpeciesBatch(fishingOperation.getId()); - assertNotNull(allSpeciesBatch); - assertEquals(5, allSpeciesBatch.size()); +// // ----------------------------------------------------------------------------- +// // 4. Test get all species +// // ----------------------------------------------------------------------------- +// List<SpeciesBatch> allSpeciesBatch = service.getAllSpeciesBatch(fishingOperation.getId()); +// assertNotNull(allSpeciesBatch); +// assertEquals(5, allSpeciesBatch.size()); } @Test

1 0

Feb. 6, 2013

Author: tchemit Date: 2013-02-06 11:54:11 +0100 (Wed, 06 Feb 2013) New Revision: 349 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/349 Log: add UI generic parameter in handler and in actions Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractChangeScreenAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiAction.java 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/MainUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUI.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/UpdateApplicationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/UpdateReferentialAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/CancelEditCruiseAction.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/cruise/SaveCruiseAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/CloneProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/DeleteProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCatchesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCruiseAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditProgramAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewCruiseAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewProgramAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ValidateCatchesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchTableUIHandler.java 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/NewFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SaveFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SelectFishingOperationAction.java 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/ImportPupitriAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java 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/SelectSpeciesUIHandler.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/SpeciesFrequencyUIHandler.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/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/CaracteristicTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/CancelEditProgramAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/SaveProgramAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CancelEditProtocolAction.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/content/protocol/ExportAllCaracteristicAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolCaracteristicAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolSpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolCaracteristicAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolSpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SaveProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.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/AbstractChangeScreenAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractChangeScreenAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractChangeScreenAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -33,7 +33,7 @@ * @author kmorin <kmorin(a)codelutin.com> * @since 1.0 */ -public abstract class AbstractChangeScreenAction extends AbstractTuttiAction<TuttiUIContext, MainUIHandler> { +public abstract class AbstractChangeScreenAction extends AbstractTuttiAction<TuttiUIContext, MainUI, MainUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -57,7 +57,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public abstract class AbstractTuttiAction<M extends AbstractBean, H extends AbstractTuttiUIHandler<M>> extends AbstractAction { +public abstract class AbstractTuttiAction<M extends AbstractBean, UI extends TuttiUI<M, ?>, H extends AbstractTuttiUIHandler<M, UI>> extends AbstractAction { private static final long serialVersionUID = 1L; @@ -92,6 +92,10 @@ putValue(SHORT_DESCRIPTION, tip); } + public final UI getUI() { + return handler.getUI(); + } + protected String getActionName() { return (String) getValue("actionName"); } 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-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -89,7 +89,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.1 */ -public abstract class AbstractTuttiUIHandler<M> implements UIMessageNotifier { +public abstract class AbstractTuttiUIHandler<M, UI extends TuttiUI<M, ?>> implements UIMessageNotifier { /** Logger. */ private static final Log log = @@ -101,14 +101,25 @@ public abstract void onCloseUI(); - public abstract M getModel(); - public abstract SwingValidator<M> getValidator(); + /** + * Global application context. + * + * @since 0.1 + */ protected final TuttiUIContext context; - protected AbstractTuttiUIHandler(TuttiUIContext context) { + /** + * UI handled. + * + * @since 0.1 + */ + protected final UI ui; + + protected AbstractTuttiUIHandler(TuttiUIContext context, UI ui) { this.context = context; + this.ui = ui; } //------------------------------------------------------------------------// @@ -128,6 +139,14 @@ return new DefaultComboBoxModel(items.toArray()); } + public final M getModel() { + return ui.getModel(); + } + + public final UI getUI() { + return ui; + } + @Override public void showInformationMessage(String message) { context.showInformationMessage(message); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUIHandler.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/MainUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -60,22 +60,19 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.1 */ -public class MainUIHandler extends AbstractTuttiUIHandler<TuttiUIContext> { +public class MainUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, MainUI> { /** Logger. */ private static final Log log = LogFactory.getLog(MainUIHandler.class); public static final String CLONE_PROTOCOL = "cloneProtocol"; - protected MainUI ui; - protected JComponent currentBody; protected final PersistenceService persistenceService; protected MainUIHandler(TuttiUIContext context, MainUI ui) { - super(context); - this.ui = ui; + super(context, ui); this.persistenceService = context.getService(PersistenceService.class); context.addMessageNotifier(this); context.setMainUI(ui); @@ -139,11 +136,6 @@ } @Override - public TuttiUIContext getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<TuttiUIContext> getValidator() { return null; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUI.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUI.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUI.java 2013-02-06 10:54:11 UTC (rev 349) @@ -32,7 +32,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.1 */ -public interface TuttiUI<M, H extends AbstractTuttiUIHandler<M>> extends JAXXObject { +public interface TuttiUI<M, H extends AbstractTuttiUIHandler<M, ?>> extends JAXXObject { M getModel(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/UpdateApplicationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/UpdateApplicationAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/UpdateApplicationAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -40,7 +40,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class UpdateApplicationAction extends AbstractTuttiAction<TuttiUIContext, MainUIHandler> { +public class UpdateApplicationAction extends AbstractTuttiAction<TuttiUIContext, MainUI, MainUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/UpdateReferentialAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/UpdateReferentialAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/UpdateReferentialAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -40,7 +40,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class UpdateReferentialAction extends AbstractTuttiAction<TuttiUIContext, MainUIHandler> { +public class UpdateReferentialAction extends AbstractTuttiAction<TuttiUIContext, MainUI, MainUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/CancelEditCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/CancelEditCruiseAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/CancelEditCruiseAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -37,7 +37,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class CancelEditCruiseAction extends AbstractTuttiAction<EditCruiseUIModel, EditCruiseUIHandler> { +public class CancelEditCruiseAction extends AbstractTuttiAction<EditCruiseUIModel, EditCruiseUI, EditCruiseUIHandler> { private static final long serialVersionUID = 1L; 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-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -54,19 +54,12 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.1 */ -public class EditCruiseUIHandler extends AbstractTuttiUIHandler<EditCruiseUIModel> { +public class EditCruiseUIHandler extends AbstractTuttiUIHandler<EditCruiseUIModel, EditCruiseUI> { /** Logger. */ private static final Log log = LogFactory.getLog(EditCruiseUIHandler.class); /** - * UI. - * - * @since 0.1 - */ - private final EditCruiseUI ui; - - /** * Persistence service. * * @since 0.1 @@ -74,8 +67,7 @@ private final PersistenceService persistenceService; public EditCruiseUIHandler(TuttiUI parentUi, EditCruiseUI ui) { - super(parentUi.getHandler().getContext()); - this.ui = ui; + super(parentUi.getHandler().getContext(), ui); persistenceService = context.getService(PersistenceService.class); } @@ -279,11 +271,6 @@ } @Override - public EditCruiseUIModel getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<EditCruiseUIModel> getValidator() { return ui.getValidator(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -41,7 +41,7 @@ * @author kmorin <kmorin(a)codelutin.com> * @since 1.0 */ -public class SaveCruiseAction extends AbstractTuttiAction<EditCruiseUIModel, EditCruiseUIHandler> { +public class SaveCruiseAction extends AbstractTuttiAction<EditCruiseUIModel, EditCruiseUI, EditCruiseUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/CloneProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/CloneProtocolAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/CloneProtocolAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -41,7 +41,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class CloneProtocolAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUIHandler> { +public class CloneProtocolAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/DeleteProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/DeleteProtocolAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/DeleteProtocolAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -42,7 +42,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class DeleteProtocolAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUIHandler> { +public class DeleteProtocolAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCatchesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCatchesAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCatchesAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -39,7 +39,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class EditCatchesAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUIHandler> { +public class EditCatchesAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCruiseAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditCruiseAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -39,7 +39,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class EditCruiseAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUIHandler> { +public class EditCruiseAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditProgramAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditProgramAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditProgramAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -39,7 +39,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class EditProgramAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUIHandler> { +public class EditProgramAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditProtocolAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/EditProtocolAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -41,7 +41,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class EditProtocolAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUIHandler> { +public class EditProtocolAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -43,7 +43,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class ExportProtocolAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUIHandler> { +public class ExportProtocolAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -44,7 +44,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class ImportProtocolAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUIHandler> { +public class ImportProtocolAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewCruiseAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewCruiseAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -37,7 +37,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class NewCruiseAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUIHandler> { +public class NewCruiseAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewProgramAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewProgramAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewProgramAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -37,7 +37,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class NewProgramAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUIHandler> { +public class NewProgramAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewProtocolAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/NewProtocolAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -39,7 +39,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class NewProtocolAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUIHandler> { +public class NewProtocolAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -51,7 +51,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.1 */ -public class SelectCruiseUIHandler extends AbstractTuttiUIHandler<SelectCruiseUIModel> { +public class SelectCruiseUIHandler extends AbstractTuttiUIHandler<SelectCruiseUIModel, SelectCruiseUI> { /** Logger. */ private static final Log log = @@ -59,20 +59,12 @@ protected final PersistenceService persistenceService; - protected final SelectCruiseUI ui; - public SelectCruiseUIHandler(TuttiUI<?, ?> parentUI, SelectCruiseUI ui) { - super(parentUI.getHandler().getContext()); - this.ui = ui; + super(parentUI.getHandler().getContext(), ui); persistenceService = context.getService(PersistenceService.class); } @Override - public SelectCruiseUIModel getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<SelectCruiseUIModel> getValidator() { return ui.getValidator(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ValidateCatchesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ValidateCatchesAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ValidateCatchesAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -39,7 +39,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class ValidateCatchesAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUIHandler> { +public class ValidateCatchesAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchTableUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchTableUIHandler.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchTableUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -52,7 +52,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.2 */ -public abstract class AbstractTuttiBatchTableUIHandler<R extends AbstractTuttiBeanUIModel, M extends AbstractTuttiBatchUIModel<R, M>> extends AbstractTuttiTableUIHandler<R, M> { +public abstract class AbstractTuttiBatchTableUIHandler<R extends AbstractTuttiBeanUIModel, M extends AbstractTuttiBatchUIModel<R, M>, UI extends TuttiUI<M, ?>> extends AbstractTuttiTableUIHandler<R, M, UI> { /** Logger. */ private static final Log log = @@ -61,8 +61,9 @@ public abstract void selectFishingOperation(FishingOperation bean); protected AbstractTuttiBatchTableUIHandler(TuttiUI<?, ?> parentUi, + UI ui, String... properties) { - super(parentUi.getHandler().getContext(), properties); + super(parentUi.getHandler().getContext(), ui, properties); } public final void saveSelectedRowIfRequired(FocusEvent event) { 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-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AttachmentsAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -34,7 +34,7 @@ * @author kmorin <kmorin(a)codelutin.com> * @since 1.0 */ -public class AttachmentsAction extends AbstractTuttiAction<EditFishingOperationUIModel, EditFishingOperationUIHandler> { +public class AttachmentsAction extends AbstractTuttiAction<EditFishingOperationUIModel, EditFishingOperationUI, EditFishingOperationUIHandler> { private static final long serialVersionUID = 1L; 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-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/CancelEditFishingOperationAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -39,7 +39,7 @@ * @author kmorin <kmorin(a)codelutin.com> * @since 1.0 */ -public class CancelEditFishingOperationAction extends AbstractTuttiAction<EditFishingOperationUIModel, EditFishingOperationUIHandler> { +public class CancelEditFishingOperationAction extends AbstractTuttiAction<EditFishingOperationUIModel, EditFishingOperationUI, EditFishingOperationUIHandler> { private static final long serialVersionUID = 1L; @@ -76,8 +76,11 @@ log.info("Cancel edition for fishingOperation "); } // cancel to create a new fishingOperation - parentUi.getFishingOperationTabContent().getHandler().selectFishingOperation(null); - parentUi.getCatchesTabContent().getHandler().selectFishingOperation(null, ""); + delegate.setFishingOperation(null); + delegate.doAction(event); + +// parentUi.getFishingOperationTabContent().getHandler().selectFishingOperation(null); +// parentUi.getCatchesTabContent().getHandler().selectFishingOperation(null, ""); // parentHandler.closeCurrentFishingOperation(); } else { 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-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -73,15 +73,13 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.1 */ -public class EditFishingOperationUIHandler extends AbstractTuttiTabContainerUIHandler<EditFishingOperationUIModel> +public class EditFishingOperationUIHandler extends AbstractTuttiTabContainerUIHandler<EditFishingOperationUIModel, EditFishingOperationUI> implements TabHandler { /** Logger. */ private static final Log log = LogFactory.getLog(EditFishingOperationUIHandler.class); - private final EditFishingOperationUI ui; - private final FishingOperationsUI parentUi; private final PersistenceService persistenceService; @@ -114,8 +112,7 @@ public EditFishingOperationUIHandler(FishingOperationsUI parentUi, EditFishingOperationUI ui) { - super(parentUi.getHandler().getContext()); - this.ui = ui; + super(parentUi.getHandler().getContext(), ui); this.parentUi = parentUi; this.persistenceService = context.getService(PersistenceService.class); this.fishingOperationMonitor = new TuttiBeanMonitor<EditFishingOperationUIModel>( @@ -407,11 +404,6 @@ } @Override - public EditFishingOperationUIModel getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<EditFishingOperationUIModel> getValidator() { return ui.getValidator(); } 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-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -51,14 +51,12 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.1 */ -public class FishingOperationsUIHandler extends AbstractTuttiTabContainerUIHandler<FishingOperationsUIModel> { +public class FishingOperationsUIHandler extends AbstractTuttiTabContainerUIHandler<FishingOperationsUIModel, FishingOperationsUI> { /** Logger. */ private static final Log log = LogFactory.getLog(FishingOperationsUIHandler.class); - private final FishingOperationsUI ui; - private final PersistenceService persistenceService; private static final ExecutorService executorService = @@ -70,8 +68,7 @@ public FishingOperationsUIHandler(TuttiUI parentUI, FishingOperationsUI ui) { - super(parentUI.getHandler().getContext()); - this.ui = ui; + super(parentUI.getHandler().getContext(), ui); persistenceService = context.getService(PersistenceService.class); } @@ -197,11 +194,6 @@ } @Override - public FishingOperationsUIModel getModel() { - return ui.getModel(); - } - - @Override public boolean canCloseUI(TuttiScreen nextScreen) { boolean result = super.canCloseUI(nextScreen); if (getTabPanel().getSelectedIndex() == 0) { 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-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/ImportCasinoAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -36,7 +36,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class ImportCasinoAction extends AbstractTuttiAction<EditFishingOperationUIModel, EditFishingOperationUIHandler> { +public class ImportCasinoAction extends AbstractTuttiAction<EditFishingOperationUIModel, EditFishingOperationUI, EditFishingOperationUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/NewFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/NewFishingOperationAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/NewFishingOperationAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -42,7 +42,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class NewFishingOperationAction extends AbstractTuttiAction<FishingOperationsUIModel, FishingOperationsUIHandler> { +public class NewFishingOperationAction extends AbstractTuttiAction<FishingOperationsUIModel, FishingOperationsUI, FishingOperationsUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SaveFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SaveFishingOperationAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SaveFishingOperationAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -51,7 +51,7 @@ * @author kmorin <kmorin(a)codelutin.com> * @since 1.0 */ -public class SaveFishingOperationAction extends AbstractTuttiAction<EditFishingOperationUIModel, EditFishingOperationUIHandler> { +public class SaveFishingOperationAction extends AbstractTuttiAction<EditFishingOperationUIModel, EditFishingOperationUI, EditFishingOperationUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SelectFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SelectFishingOperationAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/SelectFishingOperationAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -32,6 +32,7 @@ import javax.swing.JLabel; import javax.swing.JTabbedPane; +import javax.swing.SwingUtilities; import java.awt.BorderLayout; import java.awt.event.ActionEvent; @@ -43,7 +44,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class SelectFishingOperationAction extends AbstractTuttiAction<FishingOperationsUIModel, FishingOperationsUIHandler> { +public class SelectFishingOperationAction extends AbstractTuttiAction<FishingOperationsUIModel, FishingOperationsUI, FishingOperationsUIHandler> { private static final long serialVersionUID = 1L; @@ -128,6 +129,12 @@ } - ui.repaint(); + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + getHandler().getUi().repaint(); + } + }); + } } \ No newline at end of file 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-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -24,6 +24,8 @@ * #L% */ +import com.google.common.base.Preconditions; +import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.PersistenceService; @@ -34,6 +36,7 @@ import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import jaxx.runtime.swing.CardLayout2Ext; import jaxx.runtime.validator.swing.SwingValidator; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTitledPanel; @@ -47,7 +50,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.3 */ -public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<EditCatchesUIModel> +public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<EditCatchesUIModel, EditCatchesUI> implements TabHandler { public static final String MAIN_CARD = "main"; @@ -63,13 +66,6 @@ LogFactory.getLog(EditCatchesUIHandler.class); /** - * UI. - * - * @since 0.3 - */ - private final EditCatchesUI ui; - - /** * Persistence service. * * @since 0.3 @@ -84,8 +80,7 @@ private final TuttiBeanMonitor<EditCatchesUIModel> fishingOperationMonitor; public EditCatchesUIHandler(FishingOperationsUI parentUi, EditCatchesUI ui) { - super(parentUi.getHandler().getContext()); - this.ui = ui; + super(parentUi.getHandler().getContext(), ui); this.persistenceService = context.getService(PersistenceService.class); this.fishingOperationMonitor = new TuttiBeanMonitor<EditCatchesUIModel>( EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_WEIGHT, @@ -141,11 +136,6 @@ } @Override - public EditCatchesUIModel getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<EditCatchesUIModel> getValidator() { return ui.getValidator(); } @@ -181,9 +171,14 @@ public void selectFishingOperation(FishingOperation bean, String fishingOperationText) { + boolean empty = bean == null; + Preconditions.checkState(!empty, "can not edit a null fishing operation."); + boolean newOperation = TuttiEntities.isNew(bean); + boolean wasModified = fishingOperationMonitor.wasModified(); + // 1) Save any modification of the current fishingOperation - if (fishingOperationMonitor.wasModified()) { + if (wasModified) { save(); } @@ -195,32 +190,43 @@ // 2) Use new selected fishingOperation - boolean empty = bean == null; - EditCatchesUIModel model = getModel(); - if (empty || !bean.equals(model.getFishingOperation()) || fishingOperationMonitor.wasModified()) { + boolean otherOperation = + ObjectUtils.notEqual(bean, model.getFishingOperation()); + if (empty || newOperation || otherOperation || wasModified) { + CatchBatch batch; - if (empty) { + if (empty || newOperation) { + + // create a new CatchBatch + if (log.isInfoEnabled()) { + log.info("Create a new CatchBatch"); + } batch = new CatchBatch(); - model.setCatchBatch(null); - model.setFishingOperation(null); + batch.setFishingOperation(bean); + } else { + String operationId = bean.getId(); + if (log.isInfoEnabled()) { - log.info("Get species batch for fishingOperation: " + - bean.getId() + " - " + fishingOperationText); + log.info("Load existing CatchBatch from operation id: " + + operationId); } - //TODO id can not be null - batch = persistenceService.getCatchBatchFromFishingOperation(bean.getId()); + batch = persistenceService.getCatchBatchFromFishingOperation( + operationId); - model.setCatchBatch(batch); - model.setFishingOperation(bean); +// model.setCatchBatch(batch); +// model.setFishingOperation(bean); } + model.setCatchBatch(batch); + model.setFishingOperation(bean); + model.fromBean(batch); model.setModify(false); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ImportPupitriAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -36,7 +36,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class ImportPupitriAction extends AbstractTuttiAction<EditCatchesUIModel, EditCatchesUIHandler> { +public class ImportPupitriAction extends AbstractTuttiAction<EditCatchesUIModel, EditCatchesUI, EditCatchesUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -52,26 +52,18 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.2 */ -public class AccidentalBatchUIHandler extends AbstractTuttiBatchTableUIHandler<AccidentalBatchRowModel, AccidentalBatchUIModel> { +public class AccidentalBatchUIHandler extends AbstractTuttiBatchTableUIHandler<AccidentalBatchRowModel, AccidentalBatchUIModel, AccidentalBatchUI> { /** Logger. */ private static final Log log = LogFactory.getLog(AccidentalBatchUIHandler.class); - /** - * UI. - * - * @since 0.2 - */ - private final AccidentalBatchUI ui; - public AccidentalBatchUIHandler(TuttiUI<?, ?> parentUi, AccidentalBatchUI ui) { - super(parentUi, + super(parentUi, ui, AccidentalBatchRowModel.PROPERTY_SPECIES, AccidentalBatchRowModel.PROPERTY_WEIGHT, AccidentalBatchRowModel.PROPERTY_COMMENT); - this.ui = ui; } //------------------------------------------------------------------------// @@ -177,11 +169,6 @@ //------------------------------------------------------------------------// @Override - public AccidentalBatchUIModel getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<AccidentalBatchUIModel> getValidator() { return null; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -52,29 +52,21 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.1 */ -public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<BenthosBatchRowModel, BenthosBatchUIModel> { +public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<BenthosBatchRowModel, BenthosBatchUIModel, BenthosBatchUI> { /** Logger. */ private static final Log log = LogFactory.getLog(BenthosBatchUIHandler.class); - /** - * UI. - * - * @since 0.2 - */ - private final BenthosBatchUI ui; - public BenthosBatchUIHandler(TuttiUI<?, ?> parentUi, BenthosBatchUI ui) { - super(parentUi, + super(parentUi, ui, BenthosBatchRowModel.PROPERTY_SPECIES_TO_CONFIRM, BenthosBatchRowModel.PROPERTY_SPECIES, BenthosBatchRowModel.PROPERTY_WEIGHT, BenthosBatchRowModel.PROPERTY_NUMBER, BenthosBatchRowModel.PROPERTY_SAMPLE_WEIGHT, BenthosBatchRowModel.PROPERTY_COMMENT); - this.ui = ui; } //------------------------------------------------------------------------// @@ -180,11 +172,6 @@ //------------------------------------------------------------------------// @Override - public BenthosBatchUIModel getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<BenthosBatchUIModel> getValidator() { return ui.getValidator(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchUIHandler.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -51,27 +51,19 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.2 */ -public class MacroWasteBatchUIHandler extends AbstractTuttiBatchTableUIHandler<MacroWasteBatchRowModel, MacroWasteBatchUIModel> { +public class MacroWasteBatchUIHandler extends AbstractTuttiBatchTableUIHandler<MacroWasteBatchRowModel, MacroWasteBatchUIModel, MacroWasteBatchUI> { /** Logger. */ private static final Log log = LogFactory.getLog(MacroWasteBatchUIHandler.class); - /** - * UI. - * - * @since 0.2 - */ - private final MacroWasteBatchUI ui; - public MacroWasteBatchUIHandler(TuttiUI<?, ?> parentUi, MacroWasteBatchUI ui) { - super(parentUi, + super(parentUi, ui, MacroWasteBatchRowModel.PROPERTY_MACRO_WASTE_CATEGORY, MacroWasteBatchRowModel.PROPERTY_MACRO_WASTE_SIZE_CATEGORY, MacroWasteBatchRowModel.PROPERTY_WEIGHT, MacroWasteBatchRowModel.PROPERTY_NUMBER, MacroWasteBatchRowModel.PROPERTY_COMMENT); - this.ui = ui; } //------------------------------------------------------------------------// @@ -182,11 +174,6 @@ //------------------------------------------------------------------------// @Override - public MacroWasteBatchUIModel getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<MacroWasteBatchUIModel> getValidator() { return ui.getValidator(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchUIHandler.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -52,26 +52,18 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.2 */ -public class PlanktonBatchUIHandler extends AbstractTuttiBatchTableUIHandler<PlanktonBatchRowModel, PlanktonBatchUIModel> { +public class PlanktonBatchUIHandler extends AbstractTuttiBatchTableUIHandler<PlanktonBatchRowModel, PlanktonBatchUIModel, PlanktonBatchUI> { /** Logger. */ private static final Log log = LogFactory.getLog(PlanktonBatchUIHandler.class); - /** - * UI. - * - * @since 0.2 - */ - private final PlanktonBatchUI ui; - public PlanktonBatchUIHandler(TuttiUI<?, ?> parentUi, PlanktonBatchUI ui) { - super(parentUi, + super(parentUi, ui, PlanktonBatchRowModel.PROPERTY_SPECIES_TO_CONFIRM, PlanktonBatchRowModel.PROPERTY_SPECIES, PlanktonBatchRowModel.PROPERTY_WEIGHT, PlanktonBatchRowModel.PROPERTY_COMMENT); - this.ui = ui; } //------------------------------------------------------------------------// @@ -178,11 +170,6 @@ //------------------------------------------------------------------------// @Override - public PlanktonBatchUIModel getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<PlanktonBatchUIModel> getValidator() { return ui.getValidator(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -47,7 +47,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class RemoveSpeciesBatchAction extends AbstractTuttiAction<SpeciesBatchUIModel, SpeciesBatchUIHandler> { +public class RemoveSpeciesBatchAction extends AbstractTuttiAction<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -47,7 +47,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class RemoveSpeciesSubBatchAction extends AbstractTuttiAction<SpeciesBatchUIModel, SpeciesBatchUIHandler> { +public class RemoveSpeciesSubBatchAction extends AbstractTuttiAction<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { private static final long serialVersionUID = 1L; 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-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RenameSpeciesBatchAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -45,7 +45,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class RenameSpeciesBatchAction extends AbstractTuttiAction<SpeciesBatchUIModel, SpeciesBatchUIHandler> { +public class RenameSpeciesBatchAction extends AbstractTuttiAction<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { private static final long serialVersionUID = 1L; Modified: 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/SelectSpeciesUIHandler.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -37,15 +37,12 @@ * @author kmorin <kmorin(a)codelutin.com> * @since 1.0 */ -public class SelectSpeciesUIHandler extends AbstractTuttiUIHandler<SelectSpeciesUIModel> { +public class SelectSpeciesUIHandler extends AbstractTuttiUIHandler<SelectSpeciesUIModel, SelectSpeciesUI> { 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; + super(parentUI.getHandler().getContext(), ui); } @Override @@ -71,11 +68,6 @@ } @Override - public SelectSpeciesUIModel getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<SelectSpeciesUIModel> getValidator() { return null; } 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-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -94,7 +94,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.1 */ -public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<SpeciesBatchRowModel, SpeciesBatchUIModel> { +public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<SpeciesBatchRowModel, SpeciesBatchUIModel, SpeciesBatchUI> { /** Logger. */ private static final Log log = @@ -120,18 +120,11 @@ SpeciesBatchRowModel.PROPERTY_MATURITY_CATEGORY_WEIGHT, SpeciesBatchRowModel.PROPERTY_AGE_CATEGORY_WEIGHT); - /** - * UI. - * - * @since 0.2 - */ - private final SpeciesBatchUI ui; - private final EnumMap<TableViewMode, RowFilter<SpeciesBatchTableModel, Integer>> tableFilters; public SpeciesBatchUIHandler(TuttiUI<?, ?> parentUi, SpeciesBatchUI ui) { - super(parentUi, + super(parentUi, ui, SpeciesBatchRowModel.PROPERTY_SPECIES_TO_CONFIRM, SpeciesBatchRowModel.PROPERTY_SPECIES, SpeciesBatchRowModel.PROPERTY_SORTED_UNSORTED_CATEGORY, @@ -149,7 +142,6 @@ SpeciesBatchRowModel.PROPERTY_COMMENT, SpeciesBatchRowModel.PROPERTY_ATTACHMENTS, SpeciesBatchRowModel.PROPERTY_FREQUENCY); - this.ui = ui; tableFilters = new EnumMap<TableViewMode, RowFilter<SpeciesBatchTableModel, Integer>>(TableViewMode.class); tableFilters.put(TableViewMode.ALL, new RowFilter<SpeciesBatchTableModel, Integer>() { @@ -381,11 +373,6 @@ //------------------------------------------------------------------------// @Override - public SpeciesBatchUIModel getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<SpeciesBatchUIModel> getValidator() { return ui.getValidator(); } 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-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -64,19 +64,12 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.2 */ -public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<SpeciesFrequencyRowModel, SpeciesFrequencyUIModel> implements Cancelable { +public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<SpeciesFrequencyRowModel, SpeciesFrequencyUIModel, SpeciesFrequencyUI> implements Cancelable { /** Logger. */ private static final Log log = LogFactory.getLog(SpeciesFrequencyUIHandler.class); - /** - * UI. - * - * @since 0.2 - */ - private final SpeciesFrequencyUI ui; - private FrequencyCellEditor frequencyEditor; private TuttiProtocol protocol; @@ -87,11 +80,10 @@ public SpeciesFrequencyUIHandler(TuttiUIContext context, SpeciesFrequencyUI ui) { - super(context, + super(context, ui, SpeciesFrequencyRowModel.PROPERTY_LENGTH_STEP, SpeciesFrequencyRowModel.PROPERTY_NUMBER, SpeciesFrequencyRowModel.PROPERTY_WEIGHT); - this.ui = ui; } //------------------------------------------------------------------------// @@ -144,11 +136,6 @@ //------------------------------------------------------------------------// @Override - public SpeciesFrequencyUIModel getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<SpeciesFrequencyUIModel> getValidator() { return ui.getValidator(); } 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-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/AddSpeciesAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -44,7 +44,7 @@ * @author kmorin <kmorin(a)codelutin.com> * @since 1.0 */ -public class AddSpeciesAction extends AbstractTuttiAction<CreateSpeciesBatchUIModel, CreateSpeciesBatchUIHandler> { +public class AddSpeciesAction extends AbstractTuttiAction<CreateSpeciesBatchUIModel, CreateSpeciesBatchUI, CreateSpeciesBatchUIHandler> { private static final long serialVersionUID = 1L; 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-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -56,27 +56,19 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.3 */ -public class CreateSpeciesBatchUIHandler extends AbstractTuttiUIHandler<CreateSpeciesBatchUIModel> implements Cancelable { +public class CreateSpeciesBatchUIHandler extends AbstractTuttiUIHandler<CreateSpeciesBatchUIModel, CreateSpeciesBatchUI> implements Cancelable { /** Logger. */ private static final Log log = LogFactory.getLog(CreateSpeciesBatchUIHandler.class); - /** - * UI. - * - * @since 0.3 - */ - private final CreateSpeciesBatchUI ui; - private final TuttiPersistence persistenceService; private final CaracteristicQualitativeValue sortedValue; public CreateSpeciesBatchUIHandler(TuttiUI parentUi, CreateSpeciesBatchUI ui) { - super(parentUi.getHandler().getContext()); - this.ui = ui; + super(parentUi.getHandler().getContext(), ui); persistenceService = context.getService(PersistenceService.class); Caracteristic caracteristic = @@ -187,11 +179,6 @@ } @Override - public CreateSpeciesBatchUIModel getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<CreateSpeciesBatchUIModel> getValidator() { return ui.getValidator(); } 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-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -61,7 +61,7 @@ * @since 0.3 */ public class SplitSpeciesBatchUIHandler - extends AbstractTuttiTableUIHandler<SplitSpeciesBatchRowModel, SplitSpeciesBatchUIModel> implements Cancelable { + extends AbstractTuttiTableUIHandler<SplitSpeciesBatchRowModel, SplitSpeciesBatchUIModel, SplitSpeciesBatchUI> implements Cancelable { /** Logger. */ private static final Log log = @@ -74,20 +74,12 @@ */ private final SpeciesBatchUI parentUi; - /** - * UI. - * - * @since 0.3 - */ - private final SplitSpeciesBatchUI ui; - public SplitSpeciesBatchUIHandler(EditCatchesUI parentUi, SplitSpeciesBatchUI ui) { - super(parentUi.getHandler().getContext(), + super(parentUi.getHandler().getContext(), ui, SplitSpeciesBatchRowModel.PROPERTY_CATEGORY_VALUE, SplitSpeciesBatchRowModel.PROPERTY_WEIGHT); this.parentUi = parentUi.getSpeciesTabContent(); - this.ui = ui; } //------------------------------------------------------------------------// @@ -146,11 +138,6 @@ //------------------------------------------------------------------------// @Override - public SplitSpeciesBatchUIModel getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<SplitSpeciesBatchUIModel> getValidator() { return ui.getValidator(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/CaracteristicTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/CaracteristicTabUIHandler.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/CaracteristicTabUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -52,13 +52,14 @@ public abstract class CaracteristicTabUIHandler <RM extends CaracteristicRowModel<RM>, M extends CaracteristicTabUIModel<RM, M>, - TM extends AbstractTuttiTableModel<RM>> - extends AbstractTuttiTableUIHandler<RM, M> { + TM extends AbstractTuttiTableModel<RM>, + UI extends TuttiUI<M, ?>> + extends AbstractTuttiTableUIHandler<RM, M, UI> { private static final Log log = LogFactory.getLog(CaracteristicTabUIHandler.class); - public CaracteristicTabUIHandler(EditFishingOperationUI parentUi, String... properties) { - super(parentUi.getHandler().getContext(), properties); + public CaracteristicTabUIHandler(EditFishingOperationUI parentUi, UI ui, String... properties) { + super(parentUi.getHandler().getContext(), ui, properties); } //------------------------------------------------------------------------// @@ -105,11 +106,6 @@ //------------------------------------------------------------------------// @Override - public M getModel() { - return (M) getUI().getModel(); - } - - @Override public SwingValidator<M> getValidator() { return null; } @@ -161,8 +157,6 @@ protected abstract M createModel(); - protected abstract TuttiUI getUI(); - protected abstract BeanComboBox<Caracteristic> getKeyCombo(); protected abstract CaracteristicMap getCaracteristics(FishingOperation operation); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIHandler.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -29,7 +29,6 @@ import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.service.DecoratorService; -import fr.ifremer.tutti.ui.swing.TuttiUI; import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUI; import fr.ifremer.tutti.ui.swing.content.operation.fishing.CaracteristicTabUIHandler; import fr.ifremer.tutti.ui.swing.util.editor.CaracteristicValueEditor; @@ -46,22 +45,14 @@ * @author kmorin * @since 0.3 */ -public class EnvironmentTabUIHandler extends CaracteristicTabUIHandler<EnvironmentRowModel, EnvironmentTabUIModel, EnvironmentTableModel> { +public class EnvironmentTabUIHandler extends CaracteristicTabUIHandler<EnvironmentRowModel, EnvironmentTabUIModel, EnvironmentTableModel, EnvironmentTabUI> { private final static Log log = LogFactory.getLog(EnvironmentTabUIHandler.class); - /** - * UI. - * - * @since 0.3 - */ - protected final EnvironmentTabUI ui; - public EnvironmentTabUIHandler(EditFishingOperationUI parentUi, EnvironmentTabUI ui) { - super(parentUi, EnvironmentRowModel.PROPERTY_VALUE); - this.ui = ui; + super(parentUi, ui, EnvironmentRowModel.PROPERTY_VALUE); } //------------------------------------------------------------------------// @@ -69,11 +60,6 @@ //------------------------------------------------------------------------// @Override - protected TuttiUI getUI() { - return ui; - } - - @Override protected BeanComboBox<Caracteristic> getKeyCombo() { return ui.getNewRowKey(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIHandler.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -30,7 +30,6 @@ import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.service.DecoratorService; -import fr.ifremer.tutti.ui.swing.TuttiUI; import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUI; import fr.ifremer.tutti.ui.swing.content.operation.fishing.CaracteristicTabUIHandler; import fr.ifremer.tutti.ui.swing.util.editor.CaracteristicValueEditor; @@ -47,22 +46,14 @@ * @author kmorin * @since 0.3 */ -public class GearShootingTabUIHandler extends CaracteristicTabUIHandler<GearShootingRowModel, GearShootingTabUIModel, GearShootingTableModel> { +public class GearShootingTabUIHandler extends CaracteristicTabUIHandler<GearShootingRowModel, GearShootingTabUIModel, GearShootingTableModel, GearShootingTabUI> { private final static Log log = LogFactory.getLog(GearShootingTabUIHandler.class); - /** - * UI. - * - * @since 0.3 - */ - protected final GearShootingTabUI ui; - public GearShootingTabUIHandler(EditFishingOperationUI parentUi, GearShootingTabUI ui) { - super(parentUi, GearShootingRowModel.PROPERTY_VALUE); - this.ui = ui; + super(parentUi, ui, GearShootingRowModel.PROPERTY_VALUE); } //------------------------------------------------------------------------// @@ -70,11 +61,6 @@ //------------------------------------------------------------------------// @Override - protected TuttiUI getUI() { - return ui; - } - - @Override protected BeanComboBox<Caracteristic> getKeyCombo() { return ui.getNewRowKey(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIHandler.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -30,7 +30,6 @@ import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.service.DecoratorService; -import fr.ifremer.tutti.ui.swing.TuttiUI; import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUI; import fr.ifremer.tutti.ui.swing.content.operation.fishing.CaracteristicTabUIHandler; import fr.ifremer.tutti.ui.swing.util.editor.CaracteristicValueEditor; @@ -47,29 +46,21 @@ * @author kmorin * @since 0.3 */ -public class HydrologyTabUIHandler extends CaracteristicTabUIHandler<HydrologyRowModel, HydrologyTabUIModel, HydrologyTableModel> { +public class HydrologyTabUIHandler extends CaracteristicTabUIHandler<HydrologyRowModel, HydrologyTabUIModel, HydrologyTableModel, HydrologyTabUI> { private final static Log log = LogFactory.getLog(HydrologyTabUIHandler.class); - /** - * UI. - * - * @since 0.3 - */ - protected final HydrologyTabUI ui; - // protected Map<Caracteristic, Map<Type, Caracteristic>> availableGlobalCaracteristics; public HydrologyTabUIHandler(EditFishingOperationUI parentUi, HydrologyTabUI ui) { - super(parentUi, + super(parentUi, ui, HydrologyRowModel.PROPERTY_VALUE // HydrologyRowModel.PROPERTY_GEAR_SHOOTING_START_VALUE, // HydrologyRowModel.PROPERTY_AVERAGE_VALUE, // HydrologyRowModel.PROPERTY_GEAR_SHOOTING_END_VALUE ); - this.ui = ui; } @@ -78,11 +69,6 @@ //------------------------------------------------------------------------// @Override - protected TuttiUI getUI() { - return ui; - } - - @Override protected BeanComboBox<Caracteristic> getKeyCombo() { return ui.getNewRowKey(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/CancelEditProgramAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/CancelEditProgramAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/CancelEditProgramAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -37,7 +37,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class CancelEditProgramAction extends AbstractTuttiAction<EditProgramUIModel, EditProgramUIHandler> { +public class CancelEditProgramAction extends AbstractTuttiAction<EditProgramUIModel, EditProgramUI, EditProgramUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -42,20 +42,13 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.1 */ -public class EditProgramUIHandler extends AbstractTuttiUIHandler<EditProgramUIModel> { +public class EditProgramUIHandler extends AbstractTuttiUIHandler<EditProgramUIModel, EditProgramUI> { /** Logger. */ private static final Log log = LogFactory.getLog(EditProgramUIHandler.class); /** - * UI. - * - * @since 0.1 - */ - private final EditProgramUI ui; - - /** * Persistence service. * * @since 0.1 @@ -63,8 +56,7 @@ private final PersistenceService persistenceService; public EditProgramUIHandler(TuttiUI parentUi, EditProgramUI ui) { - super(parentUi.getHandler().getContext()); - this.ui = ui; + super(parentUi.getHandler().getContext(), ui); persistenceService = context.getService(PersistenceService.class); } @@ -137,11 +129,6 @@ } @Override - public EditProgramUIModel getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<EditProgramUIModel> getValidator() { return ui.getValidator(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/SaveProgramAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/SaveProgramAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/SaveProgramAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -42,7 +42,7 @@ * @author kmorin <kmorin(a)codelutin.com> * @since 1.0 */ -public class SaveProgramAction extends AbstractTuttiAction<EditProgramUIModel, EditProgramUIHandler> { +public class SaveProgramAction extends AbstractTuttiAction<EditProgramUIModel, EditProgramUI, EditProgramUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CancelEditProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CancelEditProtocolAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CancelEditProtocolAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -37,7 +37,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class CancelEditProtocolAction extends AbstractTuttiAction<EditProtocolUIModel, EditProtocolUIHandler> { +public class CancelEditProtocolAction extends AbstractTuttiAction<EditProtocolUIModel, EditProtocolUI, EditProtocolUIHandler> { private static final long serialVersionUID = 1L; 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-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -66,30 +66,20 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.3 */ -public class EditProtocolUIHandler extends AbstractTuttiTableUIHandler<EditProtocolSpeciesRowModel, EditProtocolUIModel> { +public class EditProtocolUIHandler extends AbstractTuttiTableUIHandler<EditProtocolSpeciesRowModel, EditProtocolUIModel, EditProtocolUI> { /** Logger. */ private static final Log log = LogFactory.getLog(EditProtocolUIHandler.class); - /** - * UI. - * - * @since 0.3 - */ - private final EditProtocolUI ui; - protected Map<String, Species> allSpecies; protected List<Caracteristic> caracteristics; protected Map<String, Caracteristic> allCaracteristic; -// protected Multimap<String, String> hydroCaracteristics; - public EditProtocolUIHandler(TuttiUI parentUi, EditProtocolUI ui) { - super(parentUi.getHandler().getContext()); - this.ui = ui; + super(parentUi.getHandler().getContext(), ui); } //------------------------------------------------------------------------// @@ -150,11 +140,6 @@ //------------------------------------------------------------------------// @Override - public EditProtocolUIModel getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<EditProtocolUIModel> getValidator() { return ui.getValidator(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportAllCaracteristicAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportAllCaracteristicAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportAllCaracteristicAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -41,7 +41,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class ExportAllCaracteristicAction extends AbstractTuttiAction<EditProtocolUIModel, EditProtocolUIHandler> { +public class ExportAllCaracteristicAction extends AbstractTuttiAction<EditProtocolUIModel, EditProtocolUI, EditProtocolUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolCaracteristicAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolCaracteristicAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolCaracteristicAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -42,7 +42,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class ExportProtocolCaracteristicAction extends AbstractTuttiAction<EditProtocolUIModel, EditProtocolUIHandler> { +public class ExportProtocolCaracteristicAction extends AbstractTuttiAction<EditProtocolUIModel, EditProtocolUI, EditProtocolUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolSpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolSpeciesAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolSpeciesAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -45,7 +45,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class ExportProtocolSpeciesAction extends AbstractTuttiAction<EditProtocolUIModel, EditProtocolUIHandler> { +public class ExportProtocolSpeciesAction extends AbstractTuttiAction<EditProtocolUIModel, EditProtocolUI, EditProtocolUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolCaracteristicAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolCaracteristicAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolCaracteristicAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -42,7 +42,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class ImportProtocolCaracteristicAction extends AbstractTuttiAction<EditProtocolUIModel, EditProtocolUIHandler> { +public class ImportProtocolCaracteristicAction extends AbstractTuttiAction<EditProtocolUIModel, EditProtocolUI, EditProtocolUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolSpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolSpeciesAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolSpeciesAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -43,7 +43,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class ImportProtocolSpeciesAction extends AbstractTuttiAction<EditProtocolUIModel, EditProtocolUIHandler> { +public class ImportProtocolSpeciesAction extends AbstractTuttiAction<EditProtocolUIModel, EditProtocolUI, EditProtocolUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SaveProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SaveProtocolAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SaveProtocolAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -47,7 +47,7 @@ * @author kmorin <kmorin(a)codelutin.com> * @since 1.0 */ -public class SaveProtocolAction extends AbstractTuttiAction<EditProtocolUIModel, EditProtocolUIHandler> { +public class SaveProtocolAction extends AbstractTuttiAction<EditProtocolUIModel, EditProtocolUI, EditProtocolUIHandler> { /** Logger. */ private static final Log log = LogFactory.getLog(SaveProtocolAction.class); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -41,7 +41,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class ExportTemporaryGearExampleAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUIHandler> { +public class ExportTemporaryGearExampleAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -41,10 +41,10 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class ExportTemporaryPersonExampleAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUIHandler> { - +public class ExportTemporaryPersonExampleAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { private static final long serialVersionUID = 1L; + /** Logger. */ private static final Log log = LogFactory.getLog(ExportTemporaryPersonExampleAction.class); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -41,7 +41,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class ExportTemporarySpeciesExampleAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUIHandler> { +public class ExportTemporarySpeciesExampleAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -41,7 +41,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class ExportTemporaryVesselExampleAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUIHandler> { +public class ExportTemporaryVesselExampleAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -41,7 +41,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class ImportTemporaryGearAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUIHandler> { +public class ImportTemporaryGearAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -41,7 +41,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class ImportTemporaryPersonAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUIHandler> { +public class ImportTemporaryPersonAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -41,7 +41,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class ImportTemporarySpeciesAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUIHandler> { +public class ImportTemporarySpeciesAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java 2013-02-06 10:54:11 UTC (rev 349) @@ -41,7 +41,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class ImportTemporaryVesselAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUIHandler> { +public class ImportTemporaryVesselAction extends AbstractTuttiAction<TuttiUIContext, ManageTemporaryReferentialUI, ManageTemporaryReferentialUIHandler> { private static final long serialVersionUID = 1L; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -37,21 +37,19 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.0 */ -public class ManageTemporaryReferentialUIHandler extends AbstractTuttiUIHandler<TuttiUIContext> { +public class ManageTemporaryReferentialUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, ManageTemporaryReferentialUI> { /** Logger. */ private static final Log log = LogFactory.getLog(ManageTemporaryReferentialUIHandler.class); - protected ManageTemporaryReferentialUI ui; - protected JComponent currentBody; protected final PersistenceService persistenceService; - protected ManageTemporaryReferentialUIHandler(TuttiUIContext context, ManageTemporaryReferentialUI ui) { - super(context); - this.ui = ui; + protected ManageTemporaryReferentialUIHandler(TuttiUIContext context, + ManageTemporaryReferentialUI ui) { + super(context, ui); this.persistenceService = context.getService(PersistenceService.class); } @@ -75,11 +73,6 @@ } @Override - public TuttiUIContext getModel() { - return ui.getModel(); - } - - @Override public SwingValidator<TuttiUIContext> getValidator() { return null; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.java 2013-02-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -43,12 +43,12 @@ * @author kmorin <kmorin(a)codelutin.com> * @since 0.3 */ -public abstract class AbstractTuttiTabContainerUIHandler<M> extends AbstractTuttiUIHandler<M> { +public abstract class AbstractTuttiTabContainerUIHandler<M, UI extends TuttiUI<M, ?>> extends AbstractTuttiUIHandler<M, UI> { private final static Log log = LogFactory.getLog(AbstractTuttiTabContainerUIHandler.class); - protected AbstractTuttiTabContainerUIHandler(TuttiUIContext context) { - super(context); + protected AbstractTuttiTabContainerUIHandler(TuttiUIContext context, UI ui) { + super(context, ui); } /** @return the tab panel of the UI */ 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-06 10:43:49 UTC (rev 348) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2013-02-06 10:54:11 UTC (rev 349) @@ -30,6 +30,7 @@ import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.AbstractTuttiUIHandler; +import fr.ifremer.tutti.ui.swing.TuttiUI; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchTableModel; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; @@ -84,7 +85,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.2 */ -public abstract class AbstractTuttiTableUIHandler<R extends AbstractTuttiBeanUIModel, M extends AbstractTuttiTableUIModel<?, R, M>> extends AbstractTuttiUIHandler<M> { +public abstract class AbstractTuttiTableUIHandler<R extends AbstractTuttiBeanUIModel, M extends AbstractTuttiTableUIModel<?, R, M>, UI extends TuttiUI<M, ?>> extends AbstractTuttiUIHandler<M, UI> { /** Logger. */ private static final Log log = @@ -156,8 +157,9 @@ protected final PersistenceService persistenceService; protected AbstractTuttiTableUIHandler(TuttiUIContext context, + UI ui, String... properties) { - super(context); + super(context, ui); this.persistenceService = context.getService(PersistenceService.class); @@ -611,7 +613,6 @@ protected void uninstallTableKeyListener() { - if (keyAdapter != null) { if (log.isInfoEnabled()) {

1 0

r348 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise
by kmorin＠users.forge.codelutin.com Feb. 6, 2013

Feb. 6, 2013

Author: kmorin Date: 2013-02-06 11:43:49 +0100 (Wed, 06 Feb 2013) New Revision: 348 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/348 Log: debug filter on double lists Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 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-06 09:41:11 UTC (rev 347) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-02-06 10:43:49 UTC (rev 348) @@ -25,6 +25,7 @@ */ import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.persistence.entities.referential.Gear; @@ -230,11 +231,11 @@ model.getCountry()); initBeanList(ui.getVesselList(), - getVesselList(VesselTypeEnum.ALL), + getVesselList(model.getVesselType()), model.getVessel()); initBeanList(ui.getGearList(), - getGearList(VesselTypeEnum.ALL), + getGearList(model.getVesselType()), model.getGear()); initBeanList(ui.getHeadOfMissionList(),

1 0

r347 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species
by kmorin＠users.forge.codelutin.com Feb. 6, 2013

Feb. 6, 2013

Author: kmorin Date: 2013-02-06 10:41:11 +0100 (Wed, 06 Feb 2013) New Revision: 347 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/347 Log: refs #1936 [CAPTURE] - Esp?\195?\168ce - pouvoir changer le nom d'une esp?\195?\168ce Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RenameSpeciesBatchAction.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/RenameSpeciesBatchAction.java 2013-02-06 09:07:05 UTC (rev 346) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RenameSpeciesBatchAction.java 2013-02-06 09:41:11 UTC (rev 347) @@ -34,6 +34,7 @@ import org.jdesktop.swingx.JXTable; import java.awt.event.ActionEvent; +import java.util.Collection; import java.util.List; import static org.nuiton.i18n.I18n._; @@ -69,11 +70,21 @@ boolean result = super.prepareAction(event); SpeciesBatchUIHandler handler = getHandler(); + + SpeciesBatchTableModel tableModel = handler.getTableModel(); + JXTable table = handler.getTable(); + SpeciesBatchRowModel row = tableModel.getEntry(table.getSelectedRow()); + SpeciesBatchUIModel model = handler.getModel(); List<Species> speciesList = Lists.newArrayList(model.getAllSpecies()); - speciesList.removeAll(Sets.newHashSet(model.getSpeciesUsed().values())); + speciesList.removeAll( + model.getSpeciesUsed().get( + row.getSortedUnsortedCategoryValue())); - selectedSpecies = getHandler().openAddSpeciesDialog(_("tutti.title.selectSpecies"), speciesList); + selectedSpecies = getHandler().openAddSpeciesDialog( + _("tutti.title.selectSpecies"), + speciesList + ); result &= selectedSpecies != null; return result; @@ -87,8 +98,27 @@ JXTable table = handler.getTable(); SpeciesBatchRowModel row = tableModel.getEntry(table.getSelectedRow()); - PersistenceService persistenceService = getContext().getService(PersistenceService.class); - persistenceService.changeSpeciesBatchSpecies(row.getId(), selectedSpecies); + // TODO 20130206 kmorin uncomment the following lines when the service is available +// PersistenceService persistenceService = getContext().getService(PersistenceService.class); +// persistenceService.changeSpeciesBatchSpecies(row.getId(), selectedSpecies); + + Collection<Species> speciesUSed = handler.getModel().getSpeciesUsed() + .get(row.getSortedUnsortedCategoryValue()); + speciesUSed.remove(row.getSpecies()); + changeChildrenSpecies(row, selectedSpecies); + speciesUSed.add(selectedSpecies); + + selectedSpecies = null; } + protected void changeChildrenSpecies(SpeciesBatchRowModel row, + Species species) { + row.setSpecies(species); + List<SpeciesBatchRowModel> children = row.getBatchChild(); + if (children != null) { + for (SpeciesBatchRowModel child : children) { + changeChildrenSpecies(child, species); + } + } + } }

1 0

r346 - trunk/tutti-ui-swing
by kmorin＠users.forge.codelutin.com Feb. 6, 2013

Feb. 6, 2013

Author: kmorin Date: 2013-02-06 10:07:05 +0100 (Wed, 06 Feb 2013) New Revision: 346 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/346 Log: change filtered recource file extension Modified: trunk/tutti-ui-swing/pom.xml Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-02-06 08:22:01 UTC (rev 345) +++ trunk/tutti-ui-swing/pom.xml 2013-02-06 09:07:05 UTC (rev 346) @@ -85,7 +85,7 @@ <directory>src/main/filtered-resources</directory> <filtering>true</filtering> <includes> - <include>*.properties</include> + <include>*.config</include> </includes> </resource> <resource>

1 0