[josm-plugins] 01/06: Imported Upstream version 0.0.svn32208+ds

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository josm-plugins.

commit bff60cad3e5142c9b998f15074dfe9380aadd085
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon May 30 23:37:47 2016 +0200

    Imported Upstream version 0.0.svn32208+ds
---
 build-common.xml                                               |  4 ++++
 editgpx/.settings/org.sonarlint.eclipse.core.prefs             |  5 +++++
 measurement/.project                                           |  5 +++++
 .../josm/plugins/measurement/MeasurementDialog.java            |  5 ++++-
 svn-info.xml                                                   | 10 +++++-----
 5 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/build-common.xml b/build-common.xml
index 50dca38..4ca862d 100644
--- a/build-common.xml
+++ b/build-common.xml
@@ -15,6 +15,7 @@
     <property name="josm"                   location="../../core/dist/josm-custom.jar"/>
     <property name="josm.test.build.dir"    location="../../core/test/build"/>
     <property name="groovy.jar"             location="../00_core_tools/groovy-all-2.4.6.jar"/>
+    <property name="annotations.jar"        location="../00_core_tools/findbugs/annotations.jar"/>
     <property name="plugin.build.dir"       location="build"/>
     <property name="plugin.test.dir"        location="test"/>
     <property name="plugin.src.dir"         location="src"/>
@@ -149,6 +150,8 @@
                     <name name="META-INF/DEPENDENCIES"/>
                     <name name="META-INF/LICENSE"/>
                     <name name="META-INF/NOTICE"/>
+                    <name name="META-INF/*.RSA"/>
+                    <name name="META-INF/*.SF"/>
                 </or></not>
                 <archives>
                     <zips>
@@ -417,6 +420,7 @@
         <pathelement path="${josm}"/>
         <pathelement path="${plugin.jar}"/>
         <pathelement path="${groovy.jar}"/>
+        <pathelement path="${annotations.jar}"/>
     </path>
     <macrodef name="init-test-preferences">
         <sequential>
diff --git a/editgpx/.settings/org.sonarlint.eclipse.core.prefs b/editgpx/.settings/org.sonarlint.eclipse.core.prefs
new file mode 100644
index 0000000..0ee35cf
--- /dev/null
+++ b/editgpx/.settings/org.sonarlint.eclipse.core.prefs
@@ -0,0 +1,5 @@
+autoEnabled=true
+eclipse.preferences.version=1
+extraProperties=
+moduleKey=josm-plugins
+serverId=josm
diff --git a/measurement/.project b/measurement/.project
index 51abf61..390d4c9 100644
--- a/measurement/.project
+++ b/measurement/.project
@@ -10,6 +10,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.sonarlint.eclipse.core.sonarlintBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
diff --git a/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java b/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java
index 58af60d..368df1d 100644
--- a/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java
+++ b/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java
@@ -294,6 +294,9 @@ public class MeasurementDialog extends ToggleDialog implements SelectionChangedL
     @Override
     public void systemOfMeasurementChanged(String oldSoM, String newSoM) {
         // Refresh selection to take into account new system of measurement
-        selectionChanged(Main.main.getCurrentDataSet().getSelected());
+        DataSet currentDs = Main.main.getCurrentDataSet();
+        if (currentDs != null) {
+            selectionChanged(currentDs.getSelected());
+        }
     }
 }
diff --git a/svn-info.xml b/svn-info.xml
index 0286b4f..629c9f7 100644
--- a/svn-info.xml
+++ b/svn-info.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <info>
 <entry
-   path="plugins"
-   revision="32149"
-   kind="dir">
+   revision="32208"
+   kind="dir"
+   path="plugins">
 <url>https://svn.openstreetmap.org/applications/editors/josm/plugins</url>
 <relative-url>^/applications/editors/josm/plugins</relative-url>
 <repository>
@@ -11,9 +11,9 @@
 <uuid>b9d5c4c9-76e1-0310-9c85-f3177eceb1e4</uuid>
 </repository>
 <commit
-   revision="32148">
+   revision="32205">
 <author>donvip</author>
-<date>2016-04-24T00:10:50.443596Z</date>
+<date>2016-05-30T08:11:58.732677Z</date>
 </commit>
 </entry>
 </info>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git