Changeset 6883 in josm for trunk/src/org/openstreetmap/josm/plugins

Timestamp:

2014-02-25T01:31:24+01:00 (11 years ago)

Author:

Don-vip

Message:

fix some Sonar issues

Location:

trunk/src/org/openstreetmap/josm/plugins

Files:

• PluginDownloadTask.java (modified) (3 diffs)
• PluginHandler.java (modified) (4 diffs)
• ReadRemotePluginInformationTask.java (modified) (1 diff)

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

@@ -90 +90 @@
     }
 
-    @Override protected void cancel() {
+    @Override
+    protected void cancel() {
         this.canceled = true;
         synchronized(this) {
@@ -99 +100 @@
     }
 
-    @Override protected void finish() {}
+    @Override
+    protected void finish() {}
 
     protected void download(PluginInformation pi, File file) throws PluginDownloadException{
@@ -152 +154 @@
     }
 
-    @Override protected void realRun() throws SAXException, IOException {
+    @Override
+    protected void realRun() throws SAXException, IOException {
         File pluginDir = Main.pref.getPluginsDirectory();
-        if (!pluginDir.exists()) {
-            if (!pluginDir.mkdirs()) {
-                lastException = new PluginDownloadException(tr("Failed to create plugin directory ''{0}''", pluginDir.toString()));
-                failed.addAll(toUpdate);
-                return;
-            }
+        if (!pluginDir.exists() && !pluginDir.mkdirs()) {
+            lastException = new PluginDownloadException(tr("Failed to create plugin directory ''{0}''", pluginDir.toString()));
+            failed.addAll(toUpdate);
+            return;
         }
         getProgressMonitor().setTicksCount(toUpdate.size());

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

@@ -78 +78 @@
      * Deprecated plugins that are removed on start
      */
-    public final static Collection<DeprecatedPlugin> DEPRECATED_PLUGINS;
+    public static final Collection<DeprecatedPlugin> DEPRECATED_PLUGINS;
     static {
         String IN_CORE = tr("integrated into main program");
@@ -195 +195 @@
      * All installed and loaded plugins (resp. their main classes)
      */
-    public final static Collection<PluginProxy> pluginList = new LinkedList<PluginProxy>();
+    public static final Collection<PluginProxy> pluginList = new LinkedList<PluginProxy>();
 
     /**
@@ -1035 +1035 @@
             File plugin = new File(filePath.substring(0, filePath.length() - 4));
             String pluginName = updatedPlugin.getName().substring(0, updatedPlugin.getName().length() - 8);
-            if (plugin.exists()) {
-                if (!plugin.delete() && dowarn) {
-                    Main.warn(tr("Failed to delete outdated plugin ''{0}''.", plugin.toString()));
-                    Main.warn(tr("Failed to install already downloaded plugin ''{0}''. Skipping installation. JOSM is still going to load the old plugin version.", pluginName));
-                    continue;
-                }
+            if (plugin.exists() && !plugin.delete() && dowarn) {
+                Main.warn(tr("Failed to delete outdated plugin ''{0}''.", plugin.toString()));
+                Main.warn(tr("Failed to install already downloaded plugin ''{0}''. Skipping installation. JOSM is still going to load the old plugin version.", pluginName));
+                continue;
             }
             try {
@@ -1324 +1322 @@
     }
 
-    static private class UpdatePluginsMessagePanel extends JPanel {
+    private static class UpdatePluginsMessagePanel extends JPanel {
         private JMultilineLabel lblMessage;
         private JCheckBox cbDontShowAgain;

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

@@ -325 +325 @@
         try {
             File pluginDir = Main.pref.getPluginsDirectory();
-            if (!pluginDir.exists()) {
-                if (! pluginDir.mkdirs()) {
-                    Main.warn(tr("Failed to create plugin directory ''{0}''. Cannot cache plugin list from plugin site ''{1}''.", pluginDir.toString(), site));
-                }
+            if (!pluginDir.exists() && !pluginDir.mkdirs()) {
+                Main.warn(tr("Failed to create plugin directory ''{0}''. Cannot cache plugin list from plugin site ''{1}''.", pluginDir.toString(), site));
             }
             File cacheFile = createSiteCacheFile(pluginDir, site, CacheType.PLUGIN_LIST);