Author: tchemit Date: 2012-11-23 23:17:44 +0100 (Fri, 23 Nov 2012) New Revision: 13 Url: http://forge.codelutin.com/repositories/revision/tutti/13 Log: add new referentials Added: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/BeaufortScaleBean.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/SeaStateBean.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/StrataBean.java Modified: trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevFixtures.java trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TraitBean.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2012-11-22 17:34:53 UTC (rev 12) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2012-11-23 22:17:44 UTC (rev 13) @@ -24,9 +24,12 @@ * #L% */ +import fr.ifremer.tutti.persistence.entities.BeaufortScaleBean; import fr.ifremer.tutti.persistence.entities.CampaignBean; import fr.ifremer.tutti.persistence.entities.CountryBean; import fr.ifremer.tutti.persistence.entities.GearBean; +import fr.ifremer.tutti.persistence.entities.SeaStateBean; +import fr.ifremer.tutti.persistence.entities.StrataBean; import fr.ifremer.tutti.persistence.entities.SurveyBean; import fr.ifremer.tutti.persistence.entities.TraitBean; import fr.ifremer.tutti.persistence.entities.UserBean; @@ -50,8 +53,14 @@ void open(ApplicationConfig config) throws IOException; - void close() throws IOException ; + void close() throws IOException; + List<SeaStateBean> getAllSeaStates(); + + List<StrataBean> getAllStratas(); + + List<BeaufortScaleBean> getAllBeaufortScales(); + List<SurveyBean> getAllSurveys(); List<ZoneBean> getAllZones(); Added: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/BeaufortScaleBean.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/BeaufortScaleBean.java (rev 0) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/BeaufortScaleBean.java 2012-11-23 22:17:44 UTC (rev 13) @@ -0,0 +1,49 @@ +package fr.ifremer.tutti.persistence.entities; + +/* + * #%L + * Tutti :: Persistence API + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer, Code Lutin + * %% + * 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% + */ + +/** + * Represents the beaufort scale. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.1 + */ +public class BeaufortScaleBean extends AbstractTuttiEntity { + + private static final long serialVersionUID = 1L; + + protected String name; + + public String getName() { + return name; + } + + public void setName(String name) { + Object oldValue = getName(); + this.name = name; + firePropertyChange("name", oldValue, name); + } + +} \ No newline at end of file Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/BeaufortScaleBean.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/SeaStateBean.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/SeaStateBean.java (rev 0) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/SeaStateBean.java 2012-11-23 22:17:44 UTC (rev 13) @@ -0,0 +1,49 @@ +package fr.ifremer.tutti.persistence.entities; + +/* + * #%L + * Tutti :: Persistence API + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer, Code Lutin + * %% + * 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% + */ + +/** + * Represents the sea state. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.1 + */ +public class SeaStateBean extends AbstractTuttiEntity { + + private static final long serialVersionUID = 1L; + + protected String name; + + public String getName() { + return name; + } + + public void setName(String name) { + Object oldValue = getName(); + this.name = name; + firePropertyChange("name", oldValue, name); + } + +} \ No newline at end of file Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/SeaStateBean.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/StrataBean.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/StrataBean.java (rev 0) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/StrataBean.java 2012-11-23 22:17:44 UTC (rev 13) @@ -0,0 +1,49 @@ +package fr.ifremer.tutti.persistence.entities; + +/* + * #%L + * Tutti :: Persistence API + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer, Code Lutin + * %% + * 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% + */ + +/** + * Represents a strata. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.1 + */ +public class StrataBean extends AbstractTuttiEntity { + + private static final long serialVersionUID = 1L; + + protected String name; + + public String getName() { + return name; + } + + public void setName(String name) { + Object oldValue = getName(); + this.name = name; + firePropertyChange("name", oldValue, name); + } + +} Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/StrataBean.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TraitBean.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TraitBean.java 2012-11-22 17:34:53 UTC (rev 12) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TraitBean.java 2012-11-23 22:17:44 UTC (rev 13) @@ -45,49 +45,49 @@ protected Date date; - protected Object associationStrate; + protected StrataBean strate; - protected Float enPecheLatitude; + protected Float gearShootingStartLatitude; - protected Float enPecheLongitude; + protected Float gearShootingStartLongitude; - protected Date enPecheTime; + protected Date gearShootingStartTime; - protected Float enPecheProfondeur; + protected Float gearShootingStartDepth; - protected Float sortieDeLEauLatitude; + protected Float gearShootingEndLatitude; - protected Float sortieDeLEauLongitude; + protected Float gearShootingEndLongitude; - protected Date sortieDeLEauTime; + protected Date gearShootingEndTime; - protected Float sortieDeLEauProfondeur; + protected Float gearShootingEndDepth; - protected Integer forceVent; + protected BeaufortScaleBean beaufortScale; - protected Integer directionVent; + protected Integer windDirection; - protected Object etatMer; + protected SeaStateBean seaState; protected Float ouvertureHorizontale; protected Float ouvertureVerticale; - protected Boolean geometrieMesuree; + protected boolean geometrieMesuree; protected Float longueurFunes; protected Float longueurBras; - protected Boolean systemeFermetureCul; + protected boolean systemeFermetureCul; - protected Boolean traitRectiligne; + protected boolean traitRectiligne; protected Float distanceChalutee; protected Float duree; - protected Boolean traitValid; + protected boolean traitValid; protected String localite; @@ -95,6 +95,27 @@ protected List<UserBean> saisisseur; + protected Float gearShootingStartSurfaceTemperature; + + protected Float gearShootingEndSurfaceTemperature; + + protected Float gearShootingStartBottomTemperature; + + protected Float gearShootingEndBottomTemperature; + + protected Float averageBottomTemperature; + + protected Float gearShootingStartSurfaceSalinity; + + protected Float gearShootingEndSurfaceSalinity; + + protected Float gearShootingStartBottomSalinity; + + protected Float gearShootingEndBottomSalinity; + + protected Float averageBottomSalinity; + + public CampaignBean getCampaign() { return campaign; } @@ -127,102 +148,70 @@ this.date = date; } - public Object getAssociationStrate() { - return associationStrate; + public Float getGearShootingStartLatitude() { + return gearShootingStartLatitude; } - public void setAssociationStrate(Object associationStrate) { - this.associationStrate = associationStrate; + public void setGearShootingStartLatitude(Float gearShootingStartLatitude) { + this.gearShootingStartLatitude = gearShootingStartLatitude; } - public Float getEnPecheLatitude() { - return enPecheLatitude; + public Float getGearShootingStartLongitude() { + return gearShootingStartLongitude; } - public void setEnPecheLatitude(Float enPecheLatitude) { - this.enPecheLatitude = enPecheLatitude; + public void setGearShootingStartLongitude(Float gearShootingStartLongitude) { + this.gearShootingStartLongitude = gearShootingStartLongitude; } - public Float getEnPecheLongitude() { - return enPecheLongitude; + public Date getGearShootingStartTime() { + return gearShootingStartTime; } - public void setEnPecheLongitude(Float enPecheLongitude) { - this.enPecheLongitude = enPecheLongitude; + public void setGearShootingStartTime(Date gearShootingStartTime) { + this.gearShootingStartTime = gearShootingStartTime; } - public Date getEnPecheTime() { - return enPecheTime; + public Float getGearShootingStartDepth() { + return gearShootingStartDepth; } - public void setEnPecheTime(Date enPecheTime) { - this.enPecheTime = enPecheTime; + public void setGearShootingStartDepth(Float gearShootingStartDepth) { + this.gearShootingStartDepth = gearShootingStartDepth; } - public Float getEnPecheProfondeur() { - return enPecheProfondeur; + public Float getGearShootingEndLatitude() { + return gearShootingEndLatitude; } - public void setEnPecheProfondeur(Float enPecheProfondeur) { - this.enPecheProfondeur = enPecheProfondeur; + public void setGearShootingEndLatitude(Float gearShootingEndLatitude) { + this.gearShootingEndLatitude = gearShootingEndLatitude; } - public Float getSortieDeLEauLatitude() { - return sortieDeLEauLatitude; + public Float getGearShootingEndLongitude() { + return gearShootingEndLongitude; } - public void setSortieDeLEauLatitude(Float sortieDeLEauLatitude) { - this.sortieDeLEauLatitude = sortieDeLEauLatitude; + public void setGearShootingEndLongitude(Float gearShootingEndLongitude) { + this.gearShootingEndLongitude = gearShootingEndLongitude; } - public Float getSortieDeLEauLongitude() { - return sortieDeLEauLongitude; + public Date getGearShootingEndTime() { + return gearShootingEndTime; } - public void setSortieDeLEauLongitude(Float sortieDeLEauLongitude) { - this.sortieDeLEauLongitude = sortieDeLEauLongitude; + public void setGearShootingEndTime(Date gearShootingEndTime) { + this.gearShootingEndTime = gearShootingEndTime; } - public Date getSortieDeLEauTime() { - return sortieDeLEauTime; + public Float getGearShootingEndDepth() { + return gearShootingEndDepth; } - public void setSortieDeLEauTime(Date sortieDeLEauTime) { - this.sortieDeLEauTime = sortieDeLEauTime; + public void setGearShootingEndDepth(Float gearShootingEndDepth) { + this.gearShootingEndDepth = gearShootingEndDepth; } - public Float getSortieDeLEauProfondeur() { - return sortieDeLEauProfondeur; - } - - public void setSortieDeLEauProfondeur(Float sortieDeLEauProfondeur) { - this.sortieDeLEauProfondeur = sortieDeLEauProfondeur; - } - - public Integer getForceVent() { - return forceVent; - } - - public void setForceVent(Integer forceVent) { - this.forceVent = forceVent; - } - - public Integer getDirectionVent() { - return directionVent; - } - - public void setDirectionVent(Integer directionVent) { - this.directionVent = directionVent; - } - - public Object getEtatMer() { - return etatMer; - } - - public void setEtatMer(Object etatMer) { - this.etatMer = etatMer; - } - public Float getOuvertureHorizontale() { return ouvertureHorizontale; } @@ -239,11 +228,11 @@ this.ouvertureVerticale = ouvertureVerticale; } - public Boolean getGeometrieMesuree() { + public boolean getGeometrieMesuree() { return geometrieMesuree; } - public void setGeometrieMesuree(Boolean geometrieMesuree) { + public void isGeometrieMesuree(boolean geometrieMesuree) { this.geometrieMesuree = geometrieMesuree; } @@ -263,19 +252,19 @@ this.longueurBras = longueurBras; } - public Boolean getSystemeFermetureCul() { + public boolean getSystemeFermetureCul() { return systemeFermetureCul; } - public void setSystemeFermetureCul(Boolean systemeFermetureCul) { + public void setSystemeFermetureCul(boolean systemeFermetureCul) { this.systemeFermetureCul = systemeFermetureCul; } - public Boolean getTraitRectiligne() { + public boolean isTraitRectiligne() { return traitRectiligne; } - public void setTraitRectiligne(Boolean traitRectiligne) { + public void setTraitRectiligne(boolean traitRectiligne) { this.traitRectiligne = traitRectiligne; } @@ -295,11 +284,11 @@ this.duree = duree; } - public Boolean getTraitValid() { + public boolean isTraitValid() { return traitValid; } - public void setTraitValid(Boolean traitValid) { + public void setTraitValid(boolean traitValid) { this.traitValid = traitValid; } @@ -326,4 +315,116 @@ public void setSaisisseur(List<UserBean> saisisseur) { this.saisisseur = saisisseur; } + + public StrataBean getStrate() { + return strate; + } + + public void setStrate(StrataBean strate) { + this.strate = strate; + } + + public BeaufortScaleBean getBeaufortScale() { + return beaufortScale; + } + + public void setBeaufortScale(BeaufortScaleBean beaufortScale) { + this.beaufortScale = beaufortScale; + } + + public Integer getWindDirection() { + return windDirection; + } + + public void setWindDirection(Integer windDirection) { + this.windDirection = windDirection; + } + + public SeaStateBean getSeaState() { + return seaState; + } + + public void setSeaState(SeaStateBean seaState) { + this.seaState = seaState; + } + + public Float getGearShootingStartSurfaceTemperature() { + return gearShootingStartSurfaceTemperature; + } + + public void setGearShootingStartSurfaceTemperature(Float gearShootingStartSurfaceTemperature) { + this.gearShootingStartSurfaceTemperature = gearShootingStartSurfaceTemperature; + } + + public Float getGearShootingEndSurfaceTemperature() { + return gearShootingEndSurfaceTemperature; + } + + public void setGearShootingEndSurfaceTemperature(Float gearShootingEndSurfaceTemperature) { + this.gearShootingEndSurfaceTemperature = gearShootingEndSurfaceTemperature; + } + + public Float getGearShootingStartBottomTemperature() { + return gearShootingStartBottomTemperature; + } + + public void setGearShootingStartBottomTemperature(Float gearShootingStartBottomTemperature) { + this.gearShootingStartBottomTemperature = gearShootingStartBottomTemperature; + } + + public Float getGearShootingEndBottomTemperature() { + return gearShootingEndBottomTemperature; + } + + public void setGearShootingEndBottomTemperature(Float gearShootingEndBottomTemperature) { + this.gearShootingEndBottomTemperature = gearShootingEndBottomTemperature; + } + + public Float getAverageBottomTemperature() { + return averageBottomTemperature; + } + + public void setAverageBottomTemperature(Float averageBottomTemperature) { + this.averageBottomTemperature = averageBottomTemperature; + } + + public Float getGearShootingStartSurfaceSalinity() { + return gearShootingStartSurfaceSalinity; + } + + public void setGearShootingStartSurfaceSalinity(Float gearShootingStartSurfaceSalinity) { + this.gearShootingStartSurfaceSalinity = gearShootingStartSurfaceSalinity; + } + + public Float getGearShootingEndSurfaceSalinity() { + return gearShootingEndSurfaceSalinity; + } + + public void setGearShootingEndSurfaceSalinity(Float gearShootingEndSurfaceSalinity) { + this.gearShootingEndSurfaceSalinity = gearShootingEndSurfaceSalinity; + } + + public Float getGearShootingStartBottomSalinity() { + return gearShootingStartBottomSalinity; + } + + public void setGearShootingStartBottomSalinity(Float gearShootingStartBottomSalinity) { + this.gearShootingStartBottomSalinity = gearShootingStartBottomSalinity; + } + + public Float getGearShootingEndBottomSalinity() { + return gearShootingEndBottomSalinity; + } + + public void setGearShootingEndBottomSalinity(Float gearShootingEndBottomSalinity) { + this.gearShootingEndBottomSalinity = gearShootingEndBottomSalinity; + } + + public Float getAverageBottomSalinity() { + return averageBottomSalinity; + } + + public void setAverageBottomSalinity(Float averageBottomSalinity) { + this.averageBottomSalinity = averageBottomSalinity; + } } Modified: trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevFixtures.java =================================================================== --- trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevFixtures.java 2012-11-22 17:34:53 UTC (rev 12) +++ trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevFixtures.java 2012-11-23 22:17:44 UTC (rev 13) @@ -25,9 +25,12 @@ */ import com.google.common.collect.Lists; +import fr.ifremer.tutti.persistence.entities.BeaufortScaleBean; import fr.ifremer.tutti.persistence.entities.CampaignBean; import fr.ifremer.tutti.persistence.entities.CountryBean; import fr.ifremer.tutti.persistence.entities.GearBean; +import fr.ifremer.tutti.persistence.entities.SeaStateBean; +import fr.ifremer.tutti.persistence.entities.StrataBean; import fr.ifremer.tutti.persistence.entities.SurveyBean; import fr.ifremer.tutti.persistence.entities.TraitBean; import fr.ifremer.tutti.persistence.entities.UserBean; @@ -61,6 +64,13 @@ protected final List<UserBean> user = Lists.newArrayList(); + + protected final List<StrataBean> strata = Lists.newArrayList(); + + protected final List<SeaStateBean> seaState = Lists.newArrayList(); + + protected final List<BeaufortScaleBean> beaufortScale = Lists.newArrayList(); + public TuttiPersistenceDevFixtures() { // inject default datas @@ -171,6 +181,60 @@ ca.setHeadOfMission(Lists.<UserBean>newArrayList(user.get(0), user.get(1))); ca.setHeadOfSortRoom(Lists.<UserBean>newArrayList(user.get(2))); campaign.add(ca); + + BeaufortScaleBean bs; + + bs = new BeaufortScaleBean(); + bs.setId(UUID.randomUUID().toString()); + bs.setName("Calme"); + beaufortScale.add(bs); + + bs = new BeaufortScaleBean(); + bs.setId(UUID.randomUUID().toString()); + bs.setName("Très légère brise"); + beaufortScale.add(bs); + + bs = new BeaufortScaleBean(); + bs.setId(UUID.randomUUID().toString()); + bs.setName("Petite brise"); + beaufortScale.add(bs); + + bs = new BeaufortScaleBean(); + bs.setId(UUID.randomUUID().toString()); + bs.setName("Jolie brise"); + beaufortScale.add(bs); + + bs = new BeaufortScaleBean(); + bs.setId(UUID.randomUUID().toString()); + bs.setName("Vent frais"); + beaufortScale.add(bs); + + bs = new BeaufortScaleBean(); + bs.setId(UUID.randomUUID().toString()); + bs.setName("Grand frais"); + beaufortScale.add(bs); + + bs = new BeaufortScaleBean(); + bs.setId(UUID.randomUUID().toString()); + bs.setName("Coup de vent"); + beaufortScale.add(bs); + + bs = new BeaufortScaleBean(); + bs.setId(UUID.randomUUID().toString()); + bs.setName("Fort coup de vent"); + beaufortScale.add(bs); + + SeaStateBean st; + + st = new SeaStateBean(); + st.setId(UUID.randomUUID().toString()); + st.setName("Mer calme"); + seaState.add(st); + + st = new SeaStateBean(); + st.setId(UUID.randomUUID().toString()); + st.setName("Mer agitée"); + seaState.add(st); } public List<CampaignBean> campaign() { @@ -204,4 +268,16 @@ public List<UserBean> user() { return user; } + + public List<StrataBean> strata() { + return strata; + } + + public List<SeaStateBean> seaState() { + return seaState; + } + + public List<BeaufortScaleBean> beaufortScale() { + return beaufortScale; + } } Modified: trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java =================================================================== --- trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java 2012-11-22 17:34:53 UTC (rev 12) +++ trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java 2012-11-23 22:17:44 UTC (rev 13) @@ -30,9 +30,12 @@ import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.config.TuttiPersistenceDevConfig; import fr.ifremer.tutti.persistence.entities.AbstractTuttiEntity; +import fr.ifremer.tutti.persistence.entities.BeaufortScaleBean; import fr.ifremer.tutti.persistence.entities.CampaignBean; import fr.ifremer.tutti.persistence.entities.CountryBean; import fr.ifremer.tutti.persistence.entities.GearBean; +import fr.ifremer.tutti.persistence.entities.SeaStateBean; +import fr.ifremer.tutti.persistence.entities.StrataBean; import fr.ifremer.tutti.persistence.entities.SurveyBean; import fr.ifremer.tutti.persistence.entities.TraitBean; import fr.ifremer.tutti.persistence.entities.TuttiBeans; @@ -83,6 +86,12 @@ protected final List<UserBean> user = Lists.newArrayList(); + protected final List<StrataBean> strata = Lists.newArrayList(); + + protected final List<SeaStateBean> seaState = Lists.newArrayList(); + + protected final List<BeaufortScaleBean> beaufortScale = Lists.newArrayList(); + @Override public String getImplementationName() { return "Persistence Dev implementation"; @@ -108,6 +117,9 @@ survey.clear(); campaign.clear(); trait.clear(); + strata.clear(); + seaState.clear(); + beaufortScale.clear(); TuttiPersistenceDevFixtures fixtures = new TuttiPersistenceDevFixtures(); @@ -120,6 +132,9 @@ survey.addAll(loadEntities(SurveyBean.class, fixtures.survey())); campaign.addAll(loadEntities(CampaignBean.class, fixtures.campaign())); trait.addAll(loadEntities(TraitBean.class, fixtures.trait())); + strata.addAll(loadEntities(StrataBean.class, fixtures.strata())); + seaState.addAll(loadEntities(SeaStateBean.class, fixtures.seaState())); + beaufortScale.addAll(loadEntities(BeaufortScaleBean.class, fixtures.beaufortScale())); } @Override @@ -133,6 +148,9 @@ persistToFile(SurveyBean.class, survey); persistToFile(CampaignBean.class, campaign); persistToFile(TraitBean.class, trait); + persistToFile(StrataBean.class, strata); + persistToFile(SeaStateBean.class, seaState); + persistToFile(BeaufortScaleBean.class, beaufortScale); } @Override @@ -173,6 +191,24 @@ } @Override + public List<SeaStateBean> getAllSeaStates() { + List<SeaStateBean> result = Lists.newArrayList(seaState); + return result; + } + + @Override + public List<StrataBean> getAllStratas() { + List<StrataBean> result = Lists.newArrayList(strata); + return result; + } + + @Override + public List<BeaufortScaleBean> getAllBeaufortScales() { + List<BeaufortScaleBean> result = Lists.newArrayList(beaufortScale); + return result; + } + + @Override public List<CampaignBean> getAllCampaigns(final String surveyId) { List<CampaignBean> result = Lists.newArrayList(Iterables.filter(campaign, new Predicate<CampaignBean>() { @Override Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2012-11-22 17:34:53 UTC (rev 12) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2012-11-23 22:17:44 UTC (rev 13) @@ -24,9 +24,12 @@ * #L% */ +import fr.ifremer.tutti.persistence.entities.BeaufortScaleBean; import fr.ifremer.tutti.persistence.entities.CampaignBean; import fr.ifremer.tutti.persistence.entities.CountryBean; import fr.ifremer.tutti.persistence.entities.GearBean; +import fr.ifremer.tutti.persistence.entities.SeaStateBean; +import fr.ifremer.tutti.persistence.entities.StrataBean; import fr.ifremer.tutti.persistence.entities.SurveyBean; import fr.ifremer.tutti.persistence.entities.TraitBean; import fr.ifremer.tutti.persistence.entities.UserBean; @@ -72,12 +75,15 @@ registerMultiJXPathDecorator(SurveyBean.class, "${id}$s#${name}$s", "#", " - "); registerMultiJXPathDecorator(CampaignBean.class, "${id}$s#${name}$s", "#", " - "); - registerMultiJXPathDecorator(TraitBean.class, "${id}$s#${name}$s", "#", " - "); + registerMultiJXPathDecorator(TraitBean.class, "${id}$s#${stationNumber}$s", "#", " - "); registerMultiJXPathDecorator(ZoneBean.class, "${id}$s#${name}$s", "#", " - "); registerMultiJXPathDecorator(VesselBean.class, "${id}$s#${name}$s", "#", " - "); registerMultiJXPathDecorator(CountryBean.class, "${id}$s#${name}$s", "#", " - "); registerMultiJXPathDecorator(GearBean.class, "${id}$s#${name}$s", "#", " - "); registerMultiJXPathDecorator(UserBean.class, "${id}$s#${name}$s", "#", " - "); + registerMultiJXPathDecorator(BeaufortScaleBean.class, "${id}$s#${name}$s", "#", " - "); + registerMultiJXPathDecorator(SeaStateBean.class, "${id}$s#${name}$s", "#", " - "); + registerMultiJXPathDecorator(StrataBean.class, "${id}$s#${name}$s", "#", " - "); } }; 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 2012-11-22 17:34:53 UTC (rev 12) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2012-11-23 22:17:44 UTC (rev 13) @@ -26,9 +26,12 @@ import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.TuttiPersistence; +import fr.ifremer.tutti.persistence.entities.BeaufortScaleBean; import fr.ifremer.tutti.persistence.entities.CampaignBean; import fr.ifremer.tutti.persistence.entities.CountryBean; import fr.ifremer.tutti.persistence.entities.GearBean; +import fr.ifremer.tutti.persistence.entities.SeaStateBean; +import fr.ifremer.tutti.persistence.entities.StrataBean; import fr.ifremer.tutti.persistence.entities.SurveyBean; import fr.ifremer.tutti.persistence.entities.TraitBean; import fr.ifremer.tutti.persistence.entities.UserBean; @@ -149,6 +152,24 @@ } @Override + public List<SeaStateBean> getAllSeaStates() { + checkDriverExists(); + return driver.getAllSeaStates(); + } + + @Override + public List<StrataBean> getAllStratas() { + checkDriverExists(); + return driver.getAllStratas(); + } + + @Override + public List<BeaufortScaleBean> getAllBeaufortScales() { + checkDriverExists(); + return driver.getAllBeaufortScales(); + } + + @Override public List<CampaignBean> getAllCampaigns(String surveyId) { checkDriverExists(); return driver.getAllCampaigns(surveyId);