This is an automated email from the git hooks/post-receive script. New commit to branch feature/6944 in repository observe. See http://git.codelutin.com/observe.git commit e155b2b116c5f76303f19c0e0de25a64e593f30f Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 23 16:09:58 2015 +0200 fix API + update i18n --- .../main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java | 4 ++-- observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties | 2 +- observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties | 2 +- observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java index 68eb5c0..d1d7a66 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java @@ -18,7 +18,7 @@ import fr.ird.observe.db.DataSourceException; import fr.ird.observe.tripMap.TripMapPoint; import fr.ird.observe.tripMap.TripMapPointType; import fr.ird.observe.ui.UIHelper; -import javafx.util.Pair; +import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; @@ -373,7 +373,7 @@ public class TripMapUIHandler { } } - return new Pair<MapContent, List<ObserveMapPaneLegendItem>>(mapContent, legendItems); + return Pair.of(mapContent, legendItems); } protected StyledLayerDescriptor importStyledLayerDescriptor() throws FileNotFoundException { diff --git a/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties b/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties index 6ea0f1b..15d7146 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties @@ -1263,7 +1263,6 @@ observe.longlineGlobalComposition.tab.floatlinesComposition=Floatines observe.longlineGlobalComposition.tab.hooksComposition=Hooks observe.longlineGlobalComposition.tab.mitigationType=Mitigation observe.longlineGlobalComposition.title=Global composition -observe.measurement.delete.message= observe.map.action.exportPng= observe.map.action.exportPng.tip= observe.map.action.zoomIt= @@ -1289,6 +1288,7 @@ observe.map.miles= observe.map.north= observe.map.south= observe.map.west= +observe.measurement.delete.message= observe.menu.actions=Actions observe.menu.application.locale=Application observe.menu.configuration=Configuration diff --git a/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties b/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties index 4311e7f..b64d09a 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties @@ -1265,7 +1265,6 @@ observe.longlineGlobalComposition.tab.floatlinesComposition= observe.longlineGlobalComposition.tab.hooksComposition= observe.longlineGlobalComposition.tab.mitigationType= observe.longlineGlobalComposition.title= -observe.measurement.delete.message= observe.map.action.exportPng= observe.map.action.exportPng.tip= observe.map.action.zoomIt= @@ -1291,6 +1290,7 @@ observe.map.miles= observe.map.north= observe.map.south= observe.map.west= +observe.measurement.delete.message= observe.menu.actions=Acciones observe.menu.application.locale=Aplicación observe.menu.configuration=Configuración diff --git a/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties b/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties index e9fd951..cd6ed89 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties @@ -1263,7 +1263,6 @@ observe.longlineGlobalComposition.tab.floatlinesComposition=Orins observe.longlineGlobalComposition.tab.hooksComposition=Hameçons observe.longlineGlobalComposition.tab.mitigationType=Atténuations observe.longlineGlobalComposition.title=Composition globale de la palangre -observe.measurement.delete.message=Supprimer la caractéristique sélectionnée observe.map.action.exportPng=Exporter observe.map.action.exportPng.tip=Exporter la carte observe.map.action.zoomIt=Centrer @@ -1283,6 +1282,7 @@ observe.map.miles=milles observe.map.north=Nord observe.map.south=Sud observe.map.west=Ouest +observe.measurement.delete.message=Supprimer la caractéristique sélectionnée observe.menu.actions=Actions observe.menu.application.locale=Application observe.menu.configuration=Configuration -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.