Author: tchemit Date: 2012-01-26 11:52:23 +0100 (Thu, 26 Jan 2012) New Revision: 292 Url: http://forge.codelutin.com/repositories/revision/echobase/292 Log: add some usefull methods on Voyage and Transit Added: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/TransitImpl.java Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java trunk/echobase-entities/src/main/xmi/echobase.zargo Added: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/TransitImpl.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/TransitImpl.java (rev 0) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/TransitImpl.java 2012-01-26 10:52:23 UTC (rev 292) @@ -0,0 +1,47 @@ +/* + * #%L + * EchoBase :: Entities + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase.entities.data; + +import com.google.common.base.Preconditions; +import fr.ifremer.echobase.entities.references.Vessel; + +public class TransitImpl extends TransitAbstract { + + private static final long serialVersionUID = 3775200869632533299L; + + @Override + public Transect getTransect(Vessel vessel) { + Preconditions.checkNotNull(vessel); + Transect result = null; + if (!isTransectEmpty()) { + for (Transect t : transect) { + if (vessel.equals(t.getVessel())) { + result = t; + break; + } + } + } + return result; + } +} //TransitImpl Property changes on: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/TransitImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java 2012-01-25 10:53:18 UTC (rev 291) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java 2012-01-26 10:52:23 UTC (rev 292) @@ -23,7 +23,7 @@ */ package fr.ifremer.echobase.entities.data; -import org.apache.commons.collections.CollectionUtils; +import com.google.common.base.Preconditions; import java.util.Date; @@ -40,8 +40,10 @@ @Override public Transit getTransit(Date startTime, Date endDate) { + Preconditions.checkNotNull(startTime); + Preconditions.checkNotNull(endDate); Transit result = null; - if (CollectionUtils.isNotEmpty(getTransit())) { + if (!isTransitEmpty()) { for (Transit t : getTransit()) { Date transitStartTime = t.getStartTime(); Date transitEndTime = t.getEndTime(); Modified: trunk/echobase-entities/src/main/xmi/echobase.zargo =================================================================== (Binary files differ)