Changeset 10768 in josm

Timestamp:

2016-08-08T00:23:04+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S3655 - Optional value should only be accessed after calling isPresent()
sonar - squid:S2259 - Null pointers should not be dereferenced
+add trace message when loading SVG file

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/tagging/presets/TaggingPresetReader.java (modified) (1 diff)
• plugins/PluginHandler.java (modified) (7 diffs)
• tools/ImageProvider.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java

@@ -225 +225 @@
                     if (all.contains(tp)) {
                         lastmenuOriginal = tp;
-                        tp = (TaggingPresetMenu) all.stream().filter(tp::equals).findFirst().get();
+                        java.util.Optional<TaggingPreset> val = all.stream().filter(tp::equals).findFirst();
+                        if (val.isPresent())
+                            tp = (TaggingPresetMenu) val.get();
                         lastmenuOriginal.group = null;
                     } else {

trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

@@ -975 +975 @@
 
             // try to download the plugin lists
-            //
             ReadRemotePluginInformationTask task1 = new ReadRemotePluginInformationTask(
                     monitor.createSubTaskMonitor(1, false),
@@ -981 +980 @@
             );
             task1.run();
-            List<PluginInformation> allPlugins = null;
+            List<PluginInformation> allPlugins = task1.getAvailablePlugins();
 
             try {
-                allPlugins = task1.getAvailablePlugins();
                 plugins = buildListOfPluginsToLoad(parent, monitor.createSubTaskMonitor(1, false));
                 // If only some plugins have to be updated, filter the list
@@ -1009 +1007 @@
 
             // filter plugins which actually have to be updated
-            //
             Collection<PluginInformation> pluginsToUpdate = new ArrayList<>();
-            for (PluginInformation pi: plugins) {
-                if (pi.isUpdateRequired()) {
-                    pluginsToUpdate.add(pi);
+            if (plugins != null) {
+                for (PluginInformation pi: plugins) {
+                    if (pi.isUpdateRequired()) {
+                        pluginsToUpdate.add(pi);
+                    }
                 }
             }
@@ -1030 +1029 @@
                     while (!additionalPlugins.isEmpty()) {
                         // Install the additional plugins to load them later
-                        plugins.addAll(additionalPlugins);
+                        if (plugins != null)
+                            plugins.addAll(additionalPlugins);
                         additionalPlugins = findRequiredPluginsToDownload(additionalPlugins, allPlugins, pluginsToDownload);
                         pluginsToDownload.addAll(additionalPlugins);
@@ -1037 +1037 @@
 
                 // try to update the locally installed plugins
-                //
                 pluginDownloadTask = new PluginDownloadTask(
                         monitor.createSubTaskMonitor(1, false),
@@ -1053 +1052 @@
 
                 // Update Plugin info for downloaded plugins
-                //
                 refreshLocalUpdatedPluginInfo(pluginDownloadTask.getDownloadedPlugins());
 
                 // notify user if downloading a locally installed plugin failed
-                //
                 if (!pluginDownloadTask.getFailedPlugins().isEmpty()) {
                     alertFailedPluginUpdate(parent, pluginDownloadTask.getFailedPlugins());
@@ -1068 +1065 @@
         if (pluginsWanted == null) {
             // if all plugins updated, remember the update because it was successful
-            //
             Main.pref.putInteger("pluginmanager.version", Version.getInstance().getVersion());
             Main.pref.put("pluginmanager.lastupdate", Long.toString(System.currentTimeMillis()));

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -1476 +1476 @@
      */
     public static BufferedImage createImageFromSvg(SVGDiagram svg, Dimension dim) {
+        if (Main.isTraceEnabled()) {
+            Main.trace(String.format("createImageFromSvg: %s %s", svg.getXMLBase(), dim));
+        }
         float sourceWidth = svg.getWidth();
         float sourceHeight = svg.getHeight();