Author: chatellier Date: 2010-10-26 14:08:45 +0000 (Tue, 26 Oct 2010) New Revision: 104 Log: Move data beans to their own data package Added: trunk/coser-business/src/main/java/fr/ifremer/coser/data/ trunk/coser-business/src/main/java/fr/ifremer/coser/data/AbstractDataEntity.java trunk/coser-business/src/main/java/fr/ifremer/coser/data/Catch.java trunk/coser-business/src/main/java/fr/ifremer/coser/data/Haul.java trunk/coser-business/src/main/java/fr/ifremer/coser/data/Length.java trunk/coser-business/src/main/java/fr/ifremer/coser/data/Strata.java trunk/coser-business/src/main/java/fr/ifremer/coser/data/package-info.java Removed: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/AbstractDataEntity.java trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Catch.java trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Haul.java trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Length.java trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Strata.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/DeleteLineCommand.java trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java trunk/coser-business/src/main/java/fr/ifremer/coser/command/ModifyFieldCommand.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/ValidationServiceTest.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java Deleted: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/AbstractDataEntity.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/AbstractDataEntity.java 2010-10-26 13:59:58 UTC (rev 103) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/AbstractDataEntity.java 2010-10-26 14:08:45 UTC (rev 104) @@ -1,66 +0,0 @@ -/* - * #%L - * - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package fr.ifremer.coser.bean; - -import static org.nuiton.i18n.I18n.n_; - -/** - * Abstract entity to add all common data array code. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public abstract class AbstractDataEntity extends AbstractEntity { - - /** serialVersionUID. */ - private static final long serialVersionUID = 4188448448464323807L; - - public static final int INDEX_LINE = 0; - public static final String PROPERTY_LINE = n_("coser.business.line"); - - protected String[] data; - - public String[] getData() { - return data; - } - - public void setData(String[] data) { - this.data = data; - } - - public void setLine(String value) { - String oldValue = data[INDEX_LINE]; - data[INDEX_LINE] = value; - getPropertyChangeSupport().firePropertyChange(PROPERTY_LINE, oldValue, value); - } - - public String getLine() { - return data[INDEX_LINE]; - } -} Deleted: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Catch.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Catch.java 2010-10-26 13:59:58 UTC (rev 103) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Catch.java 2010-10-26 14:08:45 UTC (rev 104) @@ -1,120 +0,0 @@ -/* - * #%L - * - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 Codelutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package fr.ifremer.coser.bean; - - -/** - * Catch entity delegating to ordered array. - * - * "Campagne","Annee","Trait","Espece","Nombre","Poids" - * "Survey","Year","Haul","Species","Number","Weight" - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class Catch extends AbstractDataEntity { - - /** serialVersionUID. */ - private static final long serialVersionUID = -3868116128268974801L; - - public static final String[] FR_HEADERS = { - "Campagne","Annee","Trait","Espece","Nombre","Poids" - }; - - public static final String[] EN_HEADERS = { - "Survey","Year","Haul","Species","Number","Weight" - }; - - public static final int INDEX_SURVEY = 1; - public static final int INDEX_YEAR = 2; - public static final int INDEX_HAUL = 3; - public static final int INDEX_SPECIES = 4; - public static final int INDEX_NUMBER = 5; - public static final int INDEX_WEIGHT = 6; - - public void setSurvey(String value) { - String oldValue = data[INDEX_SURVEY]; - data[INDEX_SURVEY] = value; - getPropertyChangeSupport().firePropertyChange("survey", oldValue, value); - } - - public String getSurvey() { - return data[INDEX_SURVEY]; - } - - public void setYear(String value) { - String oldValue = data[INDEX_YEAR]; - data[INDEX_YEAR] = value; - getPropertyChangeSupport().firePropertyChange("year", oldValue, value); - } - - public String getYear() { - return data[INDEX_YEAR]; - } - - public void setHaul(String value) { - String oldValue = data[INDEX_HAUL]; - data[INDEX_HAUL] = value; - getPropertyChangeSupport().firePropertyChange("haul", oldValue, value); - } - - public String getHaul() { - return data[INDEX_HAUL]; - } - - public void setSpecies(String value) { - String oldValue = data[INDEX_SPECIES]; - data[INDEX_SPECIES] = value; - getPropertyChangeSupport().firePropertyChange("species", oldValue, value); - } - - public String getSpecies() { - return data[INDEX_SPECIES]; - } - - public void setNumber(String value) { - String oldValue = data[INDEX_NUMBER]; - data[INDEX_NUMBER] = String.valueOf(value); - getPropertyChangeSupport().firePropertyChange("number", oldValue, value); - } - - public String getNumber() { - return data[INDEX_NUMBER]; - } - - public void setWeight(String value) { - String oldValue = data[INDEX_WEIGHT]; - data[INDEX_WEIGHT] = value; - getPropertyChangeSupport().firePropertyChange("weight", oldValue, value); - } - - public String getWeight() { - return data[INDEX_WEIGHT]; - } -} Deleted: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Haul.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Haul.java 2010-10-26 13:59:58 UTC (rev 103) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Haul.java 2010-10-26 14:08:45 UTC (rev 104) @@ -1,153 +0,0 @@ -/* - * #%L - * - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 Codelutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package fr.ifremer.coser.bean; - - -/** - * Haul entity delegating to ordered array. - * - * "Campagne","Annee","Trait","Mois","Strate","SurfaceBalayee","Lat","Long","ProfMoy" - * "Survey","Year","Haul","Month","Stratum","SweptSurface","Lat","Long","Depth" - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class Haul extends AbstractDataEntity { - - /** serialVersionUID. */ - private static final long serialVersionUID = 3931599935237369209L; - - public static final String[] FR_HEADERS = { - "Campagne","Annee","Trait","Mois","Strate","SurfaceBalayee","Lat","Long","ProfMoy" - }; - - public static final String[] EN_HEADERS = { - "Survey","Year","Haul","Month","Stratum","SweptSurface","Lat","Long","Depth" - }; - - public static final int INDEX_SURVEY = 1; - public static final int INDEX_YEAR = 2; - public static final int INDEX_HAUL = 3; - public static final int INDEX_MONTH = 4; - public static final int INDEX_STRATUM = 5; - public static final int INDEX_SWEPT_SURFACE = 6; - public static final int INDEX_LAT = 7; - public static final int INDEX_LONG = 8; - public static final int INDEX_DEPTH = 9; - - public void setSurvey(String value) { - String oldValue = data[INDEX_SURVEY]; - data[INDEX_SURVEY] = value; - getPropertyChangeSupport().firePropertyChange("survey", oldValue, value); - } - - public String getSurvey() { - return data[INDEX_SURVEY]; - } - - public void setYear(String value) { - String oldValue = data[INDEX_YEAR]; - data[INDEX_YEAR] = value; - getPropertyChangeSupport().firePropertyChange("year", oldValue, value); - } - - public String getYear() { - return data[INDEX_YEAR]; - } - - public void setHaul(String value) { - String oldValue = data[INDEX_HAUL]; - data[INDEX_HAUL] = value; - getPropertyChangeSupport().firePropertyChange("haul", oldValue, value); - } - - public String getHaul() { - return data[INDEX_HAUL]; - } - - public void setMonth(String value) { - String oldValue = data[INDEX_MONTH]; - data[INDEX_MONTH] = value; - getPropertyChangeSupport().firePropertyChange("month", oldValue, value); - } - - public String getMonth() { - return data[INDEX_MONTH]; - } - - public void setStratum(String value) { - String oldValue = data[INDEX_STRATUM]; - data[INDEX_STRATUM] = value; - getPropertyChangeSupport().firePropertyChange("stratum", oldValue, value); - } - - public String getStratum() { - return data[INDEX_STRATUM]; - } - - public void setSweptSurface(String value) { - String oldValue = data[INDEX_SWEPT_SURFACE]; - data[INDEX_SWEPT_SURFACE] = value; - getPropertyChangeSupport().firePropertyChange("sweptSurface", oldValue, value); - } - - public String getSweptSurface() { - return data[INDEX_SWEPT_SURFACE]; - } - - public void setLat(String value) { - String oldValue = data[INDEX_LAT]; - data[INDEX_LAT] = value; - getPropertyChangeSupport().firePropertyChange("lat", oldValue, value); - } - - public String getLat() { - return data[INDEX_LAT]; - } - - public void setLong(String value) { - String oldValue = data[INDEX_LONG]; - data[INDEX_LONG] = value; - getPropertyChangeSupport().firePropertyChange("long", oldValue, value); - } - - public String getLong() { - return data[INDEX_LONG]; - } - - public void setDepth(String value) { - String oldValue = data[INDEX_DEPTH]; - data[INDEX_DEPTH] = value; - getPropertyChangeSupport().firePropertyChange("depth", oldValue, value); - } - - public String getDepth() { - return data[INDEX_DEPTH]; - } -} Deleted: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Length.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Length.java 2010-10-26 13:59:58 UTC (rev 103) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Length.java 2010-10-26 14:08:45 UTC (rev 104) @@ -1,173 +0,0 @@ -/* - * #%L - * - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 Codelutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package fr.ifremer.coser.bean; - -/** - * Length entity delegating to ordered array. - * - * "Campagne","Annee","Trait","Espece","Sexe","Maturite","Longueur","Nombre","Poids","Age" - * "Survey","Year","Haul","Species","Sex","Maturity","Length","Number","Weight","Age" - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class Length extends AbstractDataEntity { - - /** serialVersionUID. */ - private static final long serialVersionUID = 1283486477462355761L; - - public static final String[] FR_HEADERS = { - "Campagne","Annee","Trait","Espece","Sexe","Maturite","Longueur","Nombre","Poids","Age" - }; - - public static final String[] EN_HEADERS = { - "Survey","Year","Haul","Species","Sex","Maturity","Length","Number","Weight","Age" - }; - - public static final int INDEX_SURVEY = 1; - public static final int INDEX_YEAR = 2; - public static final int INDEX_HAUL = 3; - public static final int INDEX_SPECIES = 4; - public static final int INDEX_SEX = 5; - public static final int INDEX_MATURITY = 6; - public static final int INDEX_LENGTH = 7; - public static final int INDEX_NUMBER = 8; - public static final int INDEX_WEIGHT = 9; - public static final int INDEX_AGE = 10; - - public void setSurvey(String value) { - String oldValue = data[INDEX_SURVEY]; - data[INDEX_SURVEY] = value; - getPropertyChangeSupport().firePropertyChange("survey", oldValue, value); - } - - public String getSurvey() { - return data[INDEX_SURVEY]; - } - - public void setYear(String value) { - String oldValue = data[INDEX_YEAR]; - data[INDEX_YEAR] = value; - getPropertyChangeSupport().firePropertyChange("year", oldValue, value); - } - - public String getYear() { - return data[INDEX_YEAR]; - } - - public void setHaul(String value) { - String oldValue = data[INDEX_HAUL]; - data[INDEX_HAUL] = value; - getPropertyChangeSupport().firePropertyChange("haul", oldValue, value); - } - - public String getHaul() { - return data[INDEX_HAUL]; - } - - public void setSpecies(String value) { - String oldValue = data[INDEX_SPECIES]; - data[INDEX_SPECIES] = value; - getPropertyChangeSupport().firePropertyChange("species", oldValue, value); - } - - public String getSpecies() { - return data[INDEX_SPECIES]; - } - - public void setSex(String value) { - String oldValue = data[INDEX_SEX]; - data[INDEX_SEX] = value; - getPropertyChangeSupport().firePropertyChange("sex", oldValue, value); - } - - public String getSex() { - return data[INDEX_SEX]; - } - - public void setMaturity(String value) { - String oldValue = data[INDEX_MATURITY]; - data[INDEX_MATURITY] = value; - getPropertyChangeSupport().firePropertyChange("maturity", oldValue, value); - } - - public String getMaturity() { - return data[INDEX_MATURITY]; - } - - public void setLength(String value) { - String oldValue = data[INDEX_LENGTH]; - data[INDEX_LENGTH] = value; - getPropertyChangeSupport().firePropertyChange("length", oldValue, value); - } - - public String getLength() { - return data[INDEX_LENGTH]; - } - - public void setNumber(String value) { - String oldValue = data[INDEX_NUMBER]; - data[INDEX_NUMBER] = value; - getPropertyChangeSupport().firePropertyChange("number", oldValue, value); - } - - public String getNumber() { - return data[INDEX_NUMBER]; - } - - public void setWeight(String value) { - String oldValue = data[INDEX_WEIGHT]; - data[INDEX_WEIGHT] = value; - getPropertyChangeSupport().firePropertyChange("weight", oldValue, value); - } - - public String getWeight() { - return data[INDEX_WEIGHT]; - } - - /** - * Age field. - * - * @param value new value to set - */ - public void setAge(String value) { - String oldValue = data[INDEX_AGE]; - data[INDEX_AGE] = value; - getPropertyChangeSupport().firePropertyChange("age", oldValue, value); - } - - /** - * Age field. - * - * @return age - */ - public String getAge() { - return data[INDEX_AGE]; - } -} Deleted: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Strata.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Strata.java 2010-10-26 13:59:58 UTC (rev 103) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Strata.java 2010-10-26 14:08:45 UTC (rev 104) @@ -1,88 +0,0 @@ -/* - * #%L - * - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 Codelutin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package fr.ifremer.coser.bean; - - -/** - * Strata entity delegating to ordered array. - * - * "Campagne","Strate","Surface" - * "Survey","Stratum","Surface" - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class Strata extends AbstractDataEntity { - - /** serialVersionUID. */ - private static final long serialVersionUID = 3176546952537796549L; - - public static final String[] FR_HEADERS = { - "Campagne","Strate","Surface" - }; - - public static final String[] EN_HEADERS = { - "Survey","Stratum","Surface" - }; - - public static final int INDEX_SURVEY = 1; - public static final int INDEX_STRATUM = 2; - public static final int INDEX_SURFACE = 3; - - public void setSurvey(String value) { - String oldValue = data[INDEX_SURVEY]; - data[INDEX_SURVEY] = value; - getPropertyChangeSupport().firePropertyChange("survey", oldValue, value); - } - - public String getSurvey() { - return data[INDEX_SURVEY]; - } - - public void setStratum(String value) { - String oldValue = data[INDEX_STRATUM]; - data[INDEX_STRATUM] = value; - getPropertyChangeSupport().firePropertyChange("stratum", oldValue, value); - } - - public String getStratum() { - return data[INDEX_STRATUM]; - } - - public void setSurface(String value) { - String oldValue = data[INDEX_SURFACE]; - data[INDEX_SURFACE] = value; - getPropertyChangeSupport().firePropertyChange("surface", oldValue, value); - } - - public String getSurface() { - return data[INDEX_SURFACE]; - } - -} Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/DeleteLineCommand.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/command/DeleteLineCommand.java 2010-10-26 13:59:58 UTC (rev 103) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/DeleteLineCommand.java 2010-10-26 14:08:45 UTC (rev 104) @@ -34,8 +34,8 @@ import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.CoserConstants.Category; -import fr.ifremer.coser.bean.AbstractDataEntity; import fr.ifremer.coser.bean.Project; +import fr.ifremer.coser.data.AbstractDataEntity; import fr.ifremer.coser.storage.DataStorage; /** Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java 2010-10-26 13:59:58 UTC (rev 103) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java 2010-10-26 14:08:45 UTC (rev 104) @@ -32,8 +32,8 @@ import org.apache.commons.logging.LogFactory; import fr.ifremer.coser.CoserBusinessException; -import fr.ifremer.coser.bean.Catch; import fr.ifremer.coser.bean.Project; +import fr.ifremer.coser.data.Catch; /** * Merge species command. Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/ModifyFieldCommand.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/command/ModifyFieldCommand.java 2010-10-26 13:59:58 UTC (rev 103) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/ModifyFieldCommand.java 2010-10-26 14:08:45 UTC (rev 104) @@ -27,11 +27,11 @@ import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.CoserConstants.Category; -import fr.ifremer.coser.bean.Catch; -import fr.ifremer.coser.bean.Haul; -import fr.ifremer.coser.bean.Length; import fr.ifremer.coser.bean.Project; -import fr.ifremer.coser.bean.Strata; +import fr.ifremer.coser.data.Catch; +import fr.ifremer.coser.data.Haul; +import fr.ifremer.coser.data.Length; +import fr.ifremer.coser.data.Strata; /** * Command pattern object. Copied: trunk/coser-business/src/main/java/fr/ifremer/coser/data/AbstractDataEntity.java (from rev 97, trunk/coser-business/src/main/java/fr/ifremer/coser/bean/AbstractDataEntity.java) =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/data/AbstractDataEntity.java (rev 0) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/data/AbstractDataEntity.java 2010-10-26 14:08:45 UTC (rev 104) @@ -0,0 +1,67 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package fr.ifremer.coser.data; + +import static org.nuiton.i18n.I18n.n_; +import fr.ifremer.coser.bean.AbstractEntity; + +/** + * Abstract entity to add all common data array code. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public abstract class AbstractDataEntity extends AbstractEntity { + + /** serialVersionUID. */ + private static final long serialVersionUID = 4188448448464323807L; + + public static final int INDEX_LINE = 0; + public static final String PROPERTY_LINE = n_("coser.business.line"); + + protected String[] data; + + public String[] getData() { + return data; + } + + public void setData(String[] data) { + this.data = data; + } + + public void setLine(String value) { + String oldValue = data[INDEX_LINE]; + data[INDEX_LINE] = value; + getPropertyChangeSupport().firePropertyChange(PROPERTY_LINE, oldValue, value); + } + + public String getLine() { + return data[INDEX_LINE]; + } +} Copied: trunk/coser-business/src/main/java/fr/ifremer/coser/data/Catch.java (from rev 97, trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Catch.java) =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/data/Catch.java (rev 0) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/data/Catch.java 2010-10-26 14:08:45 UTC (rev 104) @@ -0,0 +1,119 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package fr.ifremer.coser.data; + +/** + * Catch entity delegating to ordered array. + * + * "Campagne","Annee","Trait","Espece","Nombre","Poids" + * "Survey","Year","Haul","Species","Number","Weight" + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class Catch extends AbstractDataEntity { + + /** serialVersionUID. */ + private static final long serialVersionUID = -3868116128268974801L; + + public static final String[] FR_HEADERS = { + "Campagne","Annee","Trait","Espece","Nombre","Poids" + }; + + public static final String[] EN_HEADERS = { + "Survey","Year","Haul","Species","Number","Weight" + }; + + public static final int INDEX_SURVEY = 1; + public static final int INDEX_YEAR = 2; + public static final int INDEX_HAUL = 3; + public static final int INDEX_SPECIES = 4; + public static final int INDEX_NUMBER = 5; + public static final int INDEX_WEIGHT = 6; + + public void setSurvey(String value) { + String oldValue = data[INDEX_SURVEY]; + data[INDEX_SURVEY] = value; + getPropertyChangeSupport().firePropertyChange("survey", oldValue, value); + } + + public String getSurvey() { + return data[INDEX_SURVEY]; + } + + public void setYear(String value) { + String oldValue = data[INDEX_YEAR]; + data[INDEX_YEAR] = value; + getPropertyChangeSupport().firePropertyChange("year", oldValue, value); + } + + public String getYear() { + return data[INDEX_YEAR]; + } + + public void setHaul(String value) { + String oldValue = data[INDEX_HAUL]; + data[INDEX_HAUL] = value; + getPropertyChangeSupport().firePropertyChange("haul", oldValue, value); + } + + public String getHaul() { + return data[INDEX_HAUL]; + } + + public void setSpecies(String value) { + String oldValue = data[INDEX_SPECIES]; + data[INDEX_SPECIES] = value; + getPropertyChangeSupport().firePropertyChange("species", oldValue, value); + } + + public String getSpecies() { + return data[INDEX_SPECIES]; + } + + public void setNumber(String value) { + String oldValue = data[INDEX_NUMBER]; + data[INDEX_NUMBER] = String.valueOf(value); + getPropertyChangeSupport().firePropertyChange("number", oldValue, value); + } + + public String getNumber() { + return data[INDEX_NUMBER]; + } + + public void setWeight(String value) { + String oldValue = data[INDEX_WEIGHT]; + data[INDEX_WEIGHT] = value; + getPropertyChangeSupport().firePropertyChange("weight", oldValue, value); + } + + public String getWeight() { + return data[INDEX_WEIGHT]; + } +} Copied: trunk/coser-business/src/main/java/fr/ifremer/coser/data/Haul.java (from rev 97, trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Haul.java) =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/data/Haul.java (rev 0) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/data/Haul.java 2010-10-26 14:08:45 UTC (rev 104) @@ -0,0 +1,152 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package fr.ifremer.coser.data; + +/** + * Haul entity delegating to ordered array. + * + * "Campagne","Annee","Trait","Mois","Strate","SurfaceBalayee","Lat","Long","ProfMoy" + * "Survey","Year","Haul","Month","Stratum","SweptSurface","Lat","Long","Depth" + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class Haul extends AbstractDataEntity { + + /** serialVersionUID. */ + private static final long serialVersionUID = 3931599935237369209L; + + public static final String[] FR_HEADERS = { + "Campagne","Annee","Trait","Mois","Strate","SurfaceBalayee","Lat","Long","ProfMoy" + }; + + public static final String[] EN_HEADERS = { + "Survey","Year","Haul","Month","Stratum","SweptSurface","Lat","Long","Depth" + }; + + public static final int INDEX_SURVEY = 1; + public static final int INDEX_YEAR = 2; + public static final int INDEX_HAUL = 3; + public static final int INDEX_MONTH = 4; + public static final int INDEX_STRATUM = 5; + public static final int INDEX_SWEPT_SURFACE = 6; + public static final int INDEX_LAT = 7; + public static final int INDEX_LONG = 8; + public static final int INDEX_DEPTH = 9; + + public void setSurvey(String value) { + String oldValue = data[INDEX_SURVEY]; + data[INDEX_SURVEY] = value; + getPropertyChangeSupport().firePropertyChange("survey", oldValue, value); + } + + public String getSurvey() { + return data[INDEX_SURVEY]; + } + + public void setYear(String value) { + String oldValue = data[INDEX_YEAR]; + data[INDEX_YEAR] = value; + getPropertyChangeSupport().firePropertyChange("year", oldValue, value); + } + + public String getYear() { + return data[INDEX_YEAR]; + } + + public void setHaul(String value) { + String oldValue = data[INDEX_HAUL]; + data[INDEX_HAUL] = value; + getPropertyChangeSupport().firePropertyChange("haul", oldValue, value); + } + + public String getHaul() { + return data[INDEX_HAUL]; + } + + public void setMonth(String value) { + String oldValue = data[INDEX_MONTH]; + data[INDEX_MONTH] = value; + getPropertyChangeSupport().firePropertyChange("month", oldValue, value); + } + + public String getMonth() { + return data[INDEX_MONTH]; + } + + public void setStratum(String value) { + String oldValue = data[INDEX_STRATUM]; + data[INDEX_STRATUM] = value; + getPropertyChangeSupport().firePropertyChange("stratum", oldValue, value); + } + + public String getStratum() { + return data[INDEX_STRATUM]; + } + + public void setSweptSurface(String value) { + String oldValue = data[INDEX_SWEPT_SURFACE]; + data[INDEX_SWEPT_SURFACE] = value; + getPropertyChangeSupport().firePropertyChange("sweptSurface", oldValue, value); + } + + public String getSweptSurface() { + return data[INDEX_SWEPT_SURFACE]; + } + + public void setLat(String value) { + String oldValue = data[INDEX_LAT]; + data[INDEX_LAT] = value; + getPropertyChangeSupport().firePropertyChange("lat", oldValue, value); + } + + public String getLat() { + return data[INDEX_LAT]; + } + + public void setLong(String value) { + String oldValue = data[INDEX_LONG]; + data[INDEX_LONG] = value; + getPropertyChangeSupport().firePropertyChange("long", oldValue, value); + } + + public String getLong() { + return data[INDEX_LONG]; + } + + public void setDepth(String value) { + String oldValue = data[INDEX_DEPTH]; + data[INDEX_DEPTH] = value; + getPropertyChangeSupport().firePropertyChange("depth", oldValue, value); + } + + public String getDepth() { + return data[INDEX_DEPTH]; + } +} Copied: trunk/coser-business/src/main/java/fr/ifremer/coser/data/Length.java (from rev 97, trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Length.java) =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/data/Length.java (rev 0) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/data/Length.java 2010-10-26 14:08:45 UTC (rev 104) @@ -0,0 +1,173 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package fr.ifremer.coser.data; + +/** + * Length entity delegating to ordered array. + * + * "Campagne","Annee","Trait","Espece","Sexe","Maturite","Longueur","Nombre","Poids","Age" + * "Survey","Year","Haul","Species","Sex","Maturity","Length","Number","Weight","Age" + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class Length extends AbstractDataEntity { + + /** serialVersionUID. */ + private static final long serialVersionUID = 1283486477462355761L; + + public static final String[] FR_HEADERS = { + "Campagne","Annee","Trait","Espece","Sexe","Maturite","Longueur","Nombre","Poids","Age" + }; + + public static final String[] EN_HEADERS = { + "Survey","Year","Haul","Species","Sex","Maturity","Length","Number","Weight","Age" + }; + + public static final int INDEX_SURVEY = 1; + public static final int INDEX_YEAR = 2; + public static final int INDEX_HAUL = 3; + public static final int INDEX_SPECIES = 4; + public static final int INDEX_SEX = 5; + public static final int INDEX_MATURITY = 6; + public static final int INDEX_LENGTH = 7; + public static final int INDEX_NUMBER = 8; + public static final int INDEX_WEIGHT = 9; + public static final int INDEX_AGE = 10; + + public void setSurvey(String value) { + String oldValue = data[INDEX_SURVEY]; + data[INDEX_SURVEY] = value; + getPropertyChangeSupport().firePropertyChange("survey", oldValue, value); + } + + public String getSurvey() { + return data[INDEX_SURVEY]; + } + + public void setYear(String value) { + String oldValue = data[INDEX_YEAR]; + data[INDEX_YEAR] = value; + getPropertyChangeSupport().firePropertyChange("year", oldValue, value); + } + + public String getYear() { + return data[INDEX_YEAR]; + } + + public void setHaul(String value) { + String oldValue = data[INDEX_HAUL]; + data[INDEX_HAUL] = value; + getPropertyChangeSupport().firePropertyChange("haul", oldValue, value); + } + + public String getHaul() { + return data[INDEX_HAUL]; + } + + public void setSpecies(String value) { + String oldValue = data[INDEX_SPECIES]; + data[INDEX_SPECIES] = value; + getPropertyChangeSupport().firePropertyChange("species", oldValue, value); + } + + public String getSpecies() { + return data[INDEX_SPECIES]; + } + + public void setSex(String value) { + String oldValue = data[INDEX_SEX]; + data[INDEX_SEX] = value; + getPropertyChangeSupport().firePropertyChange("sex", oldValue, value); + } + + public String getSex() { + return data[INDEX_SEX]; + } + + public void setMaturity(String value) { + String oldValue = data[INDEX_MATURITY]; + data[INDEX_MATURITY] = value; + getPropertyChangeSupport().firePropertyChange("maturity", oldValue, value); + } + + public String getMaturity() { + return data[INDEX_MATURITY]; + } + + public void setLength(String value) { + String oldValue = data[INDEX_LENGTH]; + data[INDEX_LENGTH] = value; + getPropertyChangeSupport().firePropertyChange("length", oldValue, value); + } + + public String getLength() { + return data[INDEX_LENGTH]; + } + + public void setNumber(String value) { + String oldValue = data[INDEX_NUMBER]; + data[INDEX_NUMBER] = value; + getPropertyChangeSupport().firePropertyChange("number", oldValue, value); + } + + public String getNumber() { + return data[INDEX_NUMBER]; + } + + public void setWeight(String value) { + String oldValue = data[INDEX_WEIGHT]; + data[INDEX_WEIGHT] = value; + getPropertyChangeSupport().firePropertyChange("weight", oldValue, value); + } + + public String getWeight() { + return data[INDEX_WEIGHT]; + } + + /** + * Age field. + * + * @param value new value to set + */ + public void setAge(String value) { + String oldValue = data[INDEX_AGE]; + data[INDEX_AGE] = value; + getPropertyChangeSupport().firePropertyChange("age", oldValue, value); + } + + /** + * Age field. + * + * @return age + */ + public String getAge() { + return data[INDEX_AGE]; + } +} Copied: trunk/coser-business/src/main/java/fr/ifremer/coser/data/Strata.java (from rev 97, trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Strata.java) =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/data/Strata.java (rev 0) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/data/Strata.java 2010-10-26 14:08:45 UTC (rev 104) @@ -0,0 +1,87 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package fr.ifremer.coser.data; + +/** + * Strata entity delegating to ordered array. + * + * "Campagne","Strate","Surface" + * "Survey","Stratum","Surface" + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class Strata extends AbstractDataEntity { + + /** serialVersionUID. */ + private static final long serialVersionUID = 3176546952537796549L; + + public static final String[] FR_HEADERS = { + "Campagne","Strate","Surface" + }; + + public static final String[] EN_HEADERS = { + "Survey","Stratum","Surface" + }; + + public static final int INDEX_SURVEY = 1; + public static final int INDEX_STRATUM = 2; + public static final int INDEX_SURFACE = 3; + + public void setSurvey(String value) { + String oldValue = data[INDEX_SURVEY]; + data[INDEX_SURVEY] = value; + getPropertyChangeSupport().firePropertyChange("survey", oldValue, value); + } + + public String getSurvey() { + return data[INDEX_SURVEY]; + } + + public void setStratum(String value) { + String oldValue = data[INDEX_STRATUM]; + data[INDEX_STRATUM] = value; + getPropertyChangeSupport().firePropertyChange("stratum", oldValue, value); + } + + public String getStratum() { + return data[INDEX_STRATUM]; + } + + public void setSurface(String value) { + String oldValue = data[INDEX_SURFACE]; + data[INDEX_SURFACE] = value; + getPropertyChangeSupport().firePropertyChange("surface", oldValue, value); + } + + public String getSurface() { + return data[INDEX_SURFACE]; + } + +} Added: trunk/coser-business/src/main/java/fr/ifremer/coser/data/package-info.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/data/package-info.java (rev 0) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/data/package-info.java 2010-10-26 14:08:45 UTC (rev 104) @@ -0,0 +1,28 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +/** + * Data entities classes. + */ +package fr.ifremer.coser.data; Property changes on: trunk/coser-business/src/main/java/fr/ifremer/coser/data/package-info.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java 2010-10-26 13:59:58 UTC (rev 103) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ImportService.java 2010-10-26 14:08:45 UTC (rev 104) @@ -51,12 +51,12 @@ import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.CoserConstants; import fr.ifremer.coser.CoserConstants.Category; -import fr.ifremer.coser.bean.AbstractDataEntity; -import fr.ifremer.coser.bean.Catch; -import fr.ifremer.coser.bean.Haul; -import fr.ifremer.coser.bean.Length; import fr.ifremer.coser.bean.Project; -import fr.ifremer.coser.bean.Strata; +import fr.ifremer.coser.data.AbstractDataEntity; +import fr.ifremer.coser.data.Catch; +import fr.ifremer.coser.data.Haul; +import fr.ifremer.coser.data.Length; +import fr.ifremer.coser.data.Strata; import fr.ifremer.coser.storage.DataStorage; import fr.ifremer.coser.storage.MemoryListStorage; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-10-26 13:59:58 UTC (rev 103) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-10-26 14:08:45 UTC (rev 104) @@ -46,13 +46,13 @@ import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.CoserConstants; import fr.ifremer.coser.CoserConstants.Category; -import fr.ifremer.coser.bean.Catch; -import fr.ifremer.coser.bean.Haul; import fr.ifremer.coser.bean.Project; import fr.ifremer.coser.bean.Specy; import fr.ifremer.coser.command.Command; import fr.ifremer.coser.command.DeleteLineCommand; import fr.ifremer.coser.command.MergeSpeciesCommand; +import fr.ifremer.coser.data.Catch; +import fr.ifremer.coser.data.Haul; import fr.ifremer.coser.storage.DataStorage; /** Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java 2010-10-26 13:59:58 UTC (rev 103) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java 2010-10-26 14:08:45 UTC (rev 104) @@ -49,13 +49,13 @@ import fr.ifremer.coser.CoserBusinessConfig; import fr.ifremer.coser.CoserConstants.Category; import fr.ifremer.coser.CoserConstants.ValidationLevel; -import fr.ifremer.coser.bean.Catch; -import fr.ifremer.coser.bean.Haul; -import fr.ifremer.coser.bean.Length; import fr.ifremer.coser.bean.Project; -import fr.ifremer.coser.bean.Strata; import fr.ifremer.coser.control.ProgressMonitor; import fr.ifremer.coser.control.ValidationError; +import fr.ifremer.coser.data.Catch; +import fr.ifremer.coser.data.Haul; +import fr.ifremer.coser.data.Length; +import fr.ifremer.coser.data.Strata; import fr.ifremer.coser.storage.DataStorage; /** Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ValidationServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/ValidationServiceTest.java 2010-10-26 13:59:58 UTC (rev 103) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ValidationServiceTest.java 2010-10-26 14:08:45 UTC (rev 104) @@ -32,8 +32,8 @@ import org.junit.Assert; import org.junit.Test; -import fr.ifremer.coser.bean.Catch; import fr.ifremer.coser.control.ValidationError; +import fr.ifremer.coser.data.Catch; /** * Test abour validation. Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-10-26 13:59:58 UTC (rev 103) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-10-26 14:08:45 UTC (rev 104) @@ -56,8 +56,8 @@ import fr.ifremer.coser.CoserConfig; import fr.ifremer.coser.CoserConstants.Category; import fr.ifremer.coser.CoserException; -import fr.ifremer.coser.bean.Catch; import fr.ifremer.coser.bean.Project; +import fr.ifremer.coser.data.Catch; import fr.ifremer.coser.services.ProjectService; import fr.ifremer.coser.ui.control.ControlHandler; import fr.ifremer.coser.ui.control.ControlView; Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2010-10-26 13:59:58 UTC (rev 103) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2010-10-26 14:08:45 UTC (rev 104) @@ -61,13 +61,13 @@ import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.CoserConstants.Category; import fr.ifremer.coser.CoserException; -import fr.ifremer.coser.bean.AbstractDataEntity; -import fr.ifremer.coser.bean.Catch; -import fr.ifremer.coser.bean.Haul; -import fr.ifremer.coser.bean.Length; import fr.ifremer.coser.bean.Project; -import fr.ifremer.coser.bean.Strata; import fr.ifremer.coser.control.ValidationError; +import fr.ifremer.coser.data.AbstractDataEntity; +import fr.ifremer.coser.data.Catch; +import fr.ifremer.coser.data.Haul; +import fr.ifremer.coser.data.Length; +import fr.ifremer.coser.data.Strata; import fr.ifremer.coser.services.ProjectService; import fr.ifremer.coser.services.ValidationService;