Changeset 32134 in osm for applications/editors/josm

Timestamp:

2016-03-30T00:10:58+02:00 (9 years ago)

Author:

donvip

Message:

fix #josm12704 - maintain plugin indoorhelper

Location:

applications/editors/josm/plugins

Files:

• build.xml (modified) (2 diffs)
• indoorhelper/.project (modified) (1 diff)
• indoorhelper/README.template (deleted)
• indoorhelper/bin/PresetCounterTest.class (deleted)
• indoorhelper/bin/org (deleted)
• indoorhelper/build.xml (modified) (3 diffs)
• indoorhelper/src/controller/IndoorHelperController.java (modified) (2 diffs)
• mapillary/test (modified) (1 prop)
• mapillary/test/data/preferences (modified) (1 prop)

applications/editors/josm/plugins/build.xml

@@ -58 +58 @@
         <ant target="dist" dir="ImportImagePlugin"/>
         <ant target="dist" dir="importvec"/>
+        <ant target="dist" dir="indoorhelper"/>
         <ant target="dist" dir="infomode"/>
         <ant target="dist" dir="irsrectify"/>
@@ -167 +168 @@
         <ant target="clean" dir="ImportImagePlugin"/>
         <ant target="clean" dir="importvec"/>
+        <ant target="clean" dir="indoorhelper"/>
         <ant target="clean" dir="infomode"/>
         <ant target="clean" dir="irsrectify"/>

applications/editors/josm/plugins/indoorhelper/.project

@@ -12 +12 @@
                         </arguments>
                 </buildCommand>
+                <buildCommand>
+                        <name>org.sonarlint.eclipse.core.sonarlintBuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
         </buildSpec>
         <natures>

applications/editors/josm/plugins/indoorhelper/build.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-** This is a template build file for a JOSM  plugin.
-**
-** Maintaining versions
-** ====================
-** See README.template
-**
-** Usage
-** =====
-** Call "ant help" to get possible build targets.
-**
--->
 <project name="indoorhelper" default="dist" basedir=".">
 
@@ -17 +5 @@
     <property name="commit.message" value="Inital commit"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="7001"/>
+    <property name="plugin.main.version" value="9759"/>
 
     <!-- Configure these properties (replace "..." accordingly).
-
-
-
          See http://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
     -->
@@ -40 +25 @@
     <!-- ** include targets that all plugins have in common ** -->
     <import file="../build-common.xml"/>
-  
 </project>

applications/editors/josm/plugins/indoorhelper/src/controller/IndoorHelperController.java

@@ -35 +35 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ValidateAction;
-import org.openstreetmap.josm.data.Preferences.MapListSetting;
-import org.openstreetmap.josm.data.Preferences.Setting;
+import org.openstreetmap.josm.data.preferences.MapListSetting;
+import org.openstreetmap.josm.data.preferences.Setting;
 import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.data.validation.OsmValidator;
@@ -527 +527 @@
          */
         private void updateSettings(){
-                try {
-                        Main.pref.load();
-                        Main.pref.init(false);
-                } catch (IOException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                } catch (SAXException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                } catch (XMLStreamException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                }
-                
+                Main.pref.init(false);
                 MapCSSTagChecker tagChecker = OsmValidator.getTest(MapCSSTagChecker.class);
-        if (tagChecker != null) {
-            OsmValidator.initializeTests(Collections.singleton(tagChecker));
-        }
-        
-        MapPaintStyles.readFromPreferences();
+            if (tagChecker != null) {
+                OsmValidator.initializeTests(Collections.singleton(tagChecker));
+            }
+            
+            MapPaintStyles.readFromPreferences();
         }
 }