This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 594e01c6518d857b06f0f1cc32747de76f7a3dd2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 07:05:59 2016 +0200 Suppression code mort --- .../ird/observe/entities/tripMap/TripMapPoint.java | 71 ---------------------- .../observe/entities/tripMap/TripMapPointType.java | 58 ------------------ .../observe-application-swing_en_GB.properties | 14 ----- .../observe-application-swing_es_ES.properties | 14 ----- .../observe-application-swing_fr_FR.properties | 14 ----- 5 files changed, 171 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/entities/tripMap/TripMapPoint.java b/observe-application-swing/src/main/java/fr/ird/observe/entities/tripMap/TripMapPoint.java deleted file mode 100644 index ffc703a..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/entities/tripMap/TripMapPoint.java +++ /dev/null @@ -1,71 +0,0 @@ -package fr.ird.observe.entities.tripMap; - -/* - * #%L - * ObServe :: Entities - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * 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 java.util.Date; - -/** - * @author Sylvain Bavencoff - bavencoff@codelutin.com - */ -public class TripMapPoint { - - protected Date time; - - protected float latitude; - - protected float longitude; - - protected TripMapPointType type; - - public Date getTime() { - return time; - } - - public void setTime(Date time) { - this.time = time; - } - - public float getLatitude() { - return latitude; - } - - public void setLatitude(float latitude) { - this.latitude = latitude; - } - - public float getLongitude() { - return longitude; - } - - public void setLongitude(float longitude) { - this.longitude = longitude; - } - - public TripMapPointType getType() { - return type; - } - - public void setType(TripMapPointType type) { - this.type = type; - } -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/entities/tripMap/TripMapPointType.java b/observe-application-swing/src/main/java/fr/ird/observe/entities/tripMap/TripMapPointType.java deleted file mode 100644 index 5637f33..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/entities/tripMap/TripMapPointType.java +++ /dev/null @@ -1,58 +0,0 @@ -package fr.ird.observe.entities.tripMap; - -/* - * #%L - * ObServe :: Entities - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * 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 static org.nuiton.i18n.I18n.n; -import static org.nuiton.i18n.I18n.t; - -/** - * @author Sylvain Bavencoff - bavencoff@codelutin.com - */ -public enum TripMapPointType { - - SEINE_DEPARTURE_HARBOUR(n("observe.content.map.seine.harbour.departure")), - SEINE_LANDING_HARBOUR(n("observe.content.map.seine.harbour.landing")), - SEINE_ACTIVITY(n("observe.content.map.seine.activity")), - SEINE_ACTIVITY_IN_HARBOUR(n("observe.content.map.seine.activity.inHarbour")), - SEINE_ACTIVITY_WITH_FREE_SCHOOL_TYPE(n("observe.content.map.seine.activity.schoolType.free")), - SEINE_ACTIVITY_WITH_OBJECT_SCHOOL_TYPE(n("observe.content.map.seine.activity.schoolType.object")), - - LONGLINE_IN_HARBOUR(n("observe.content.map.longLine.seine.harbour")), - LONGLINE_ACTIVITY(n("observe.content.map.longLine.activity")), - LONGLINE_ACTIVITY_WITH_SETTING_START(n("observe.content.map.longLine.activity.setting.start")), - LONGLINE_ACTIVITY_WITH_SETTING_END(n("observe.content.map.longLine.activity.setting.end")), - LONGLINE_ACTIVITY_WITH_HAULING_START(n("observe.content.map.longLine.activity.hauling.start")), - LONGLINE_ACTIVITY_WITH_HAULING_END(n("observe.content.map.longLine.activity.hauling.end")), - LONGLINE_ACTIVITY_WITH_INTERACTION(n("observe.content.map.longLine.activity.interaction")), - LONGLINE_ACTIVITY_WITH_STATION(n("observe.content.map.longLine.activity.station")); - - private final String label; - - TripMapPointType(String label) { - this.label = label; - } - - public String getLabel() { - return t(label); - } -} diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties index 3111fb6..14050d2 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -1431,22 +1431,8 @@ observe.content.map.legend.hauling= observe.content.map.legend.setting= observe.content.map.legend.tripBetweenTwoDays= observe.content.map.legend.tripDay= -observe.content.map.longLine.activity= -observe.content.map.longLine.activity.hauling.end= -observe.content.map.longLine.activity.hauling.start= -observe.content.map.longLine.activity.interaction= -observe.content.map.longLine.activity.setting.end= -observe.content.map.longLine.activity.setting.start= -observe.content.map.longLine.activity.station= -observe.content.map.longLine.seine.harbour= observe.content.map.miles= observe.content.map.north= -observe.content.map.seine.activity= -observe.content.map.seine.activity.inHarbour= -observe.content.map.seine.activity.schoolType.free= -observe.content.map.seine.activity.schoolType.object= -observe.content.map.seine.harbour.departure= -observe.content.map.seine.harbour.landing= observe.content.map.south= observe.content.map.waitLoading=< Please wait while loading the map > observe.content.map.west= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties index d52541b..bb7e187 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -1431,22 +1431,8 @@ observe.content.map.legend.hauling= observe.content.map.legend.setting= observe.content.map.legend.tripBetweenTwoDays= observe.content.map.legend.tripDay= -observe.content.map.longLine.activity= -observe.content.map.longLine.activity.hauling.end= -observe.content.map.longLine.activity.hauling.start= -observe.content.map.longLine.activity.interaction= -observe.content.map.longLine.activity.setting.end= -observe.content.map.longLine.activity.setting.start= -observe.content.map.longLine.activity.station= -observe.content.map.longLine.seine.harbour= observe.content.map.miles= observe.content.map.north= -observe.content.map.seine.activity= -observe.content.map.seine.activity.inHarbour= -observe.content.map.seine.activity.schoolType.free= -observe.content.map.seine.activity.schoolType.object= -observe.content.map.seine.harbour.departure= -observe.content.map.seine.harbour.landing= observe.content.map.south= observe.content.map.waitLoading= observe.content.map.west= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index e3ed532..e880198 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -1431,22 +1431,8 @@ observe.content.map.legend.hauling=Virage observe.content.map.legend.setting=Filage observe.content.map.legend.tripBetweenTwoDays=Trajet entre deux jours observe.content.map.legend.tripDay=Trajet d'une journée -observe.content.map.longLine.activity= -observe.content.map.longLine.activity.hauling.end= -observe.content.map.longLine.activity.hauling.start= -observe.content.map.longLine.activity.interaction= -observe.content.map.longLine.activity.setting.end= -observe.content.map.longLine.activity.setting.start= -observe.content.map.longLine.activity.station= -observe.content.map.longLine.seine.harbour= observe.content.map.miles=milles observe.content.map.north=Nord -observe.content.map.seine.activity= -observe.content.map.seine.activity.inHarbour= -observe.content.map.seine.activity.schoolType.free= -observe.content.map.seine.activity.schoolType.object= -observe.content.map.seine.harbour.departure= -observe.content.map.seine.harbour.landing= observe.content.map.south=Sud observe.content.map.waitLoading=< Veuillez patienter pendant le chargement de la carte > observe.content.map.west=Ouest -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.