Changeset 32137 in osm for applications/editors/josm/plugins

Timestamp:

2016-03-31T18:25:07+02:00 (9 years ago)

Author:

erigrus

Message:

fixes crash appearing in windows

Location:

applications/editors/josm/plugins/indoorhelper

Files:

• . (modified) (1 prop)
• bin/controller/IndoorHelperController$FittingOkButtonListener.class (modified) ( previous)
• bin/controller/IndoorHelperController$LevelCancelButtonListener.class (modified) ( previous)
• bin/controller/IndoorHelperController$LevelOkButtonListener.class (modified) ( previous)
• bin/controller/IndoorHelperController$Preset1Listener.class (modified) ( previous)
• bin/controller/IndoorHelperController$Preset2Listener.class (modified) ( previous)
• bin/controller/IndoorHelperController$Preset3Listener.class (modified) ( previous)
• bin/controller/IndoorHelperController$Preset4Listener.class (modified) ( previous)
• bin/controller/IndoorHelperController$ToolApplyButtonListener.class (modified) ( previous)
• bin/controller/IndoorHelperController$ToolLevelItemListener.class (modified) ( previous)
• bin/controller/IndoorHelperController$ToolObjectItemListener.class (modified) ( previous)
• bin/controller/IndoorHelperController$ToolPowerButtonListener.class (modified) ( previous)
• bin/controller/IndoorHelperController.class (modified) ( previous)
• build/controller/IndoorHelperController.class (modified) ( previous)
• src/controller/IndoorHelperController.java (modified) (1 diff)

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

@@ -408 +408 @@
                 MapListSetting validatorMapListSetting = (MapListSetting) settings.
                                 get("validator.org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.entries");
-                List<Map<String, String>> validatorMaps;
-                validatorMaps = validatorMapListSetting.getValue();
+                List<Map<String, String>> validatorMaps = new ArrayList<>();
+                if(validatorMapListSetting!=null){
+                        validatorMaps = validatorMapListSetting.getValue();
+                }
                 
                 MapListSetting styleMapListSetting = (MapListSetting) settings.
                                 get("mappaint.style.entries");
-                List<Map<String, String>> styleMaps;
-                styleMaps = styleMapListSetting.getValue();
-                                
+                List<Map<String, String>> styleMaps = new ArrayList<>();
+                if(styleMapListSetting != null){
+                        styleMaps = styleMapListSetting.getValue();
+                }
+                                                        
                 if(enabled){
                         //set the validator active