Changeset 10228 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2016-05-16T14:59:34+02:00 (8 years ago)

Author:

Don-vip

Message:

findbugs: SC_START_IN_CTOR + UW_UNCOND_WAIT + UM_UNNECESSARY_MATH + UPM_UNCALLED_PRIVATE_METHOD + DM_STRING_TOSTRING + DM_BOXED_PRIMITIVE_FOR_COMPARE + SIC_INNER_SHOULD_BE_STATIC_NEEDS_THIS

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainMenu.java (modified) (1 diff)
• MapStatus.java (modified) (1 diff)
• dialogs/properties/PropertiesDialog.java (modified) (1 diff)
• layer/gpx/DownloadWmsAlongTrackAction.java (modified) (1 diff)
• preferences/plugin/PluginCheckBox.java (added)
• preferences/plugin/PluginListPanel.java (modified) (7 diffs)
• tagging/ac/AutoCompletionItemPriority.java (modified) (1 diff)
• util/RotationAngle.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -824 +824 @@
     }
 
-    private int getMaximumAvailableWidth() {
-        int maxWidth = getSize().width;
-        for (int i = 0; i < getMenuCount(); i++) {
-            JMenu menu = getMenu(i);
-            if (menu != null) {
-                maxWidth -= menu.getPreferredSize().width;
-            }
-        }
-        return maxWidth;
-    }
-
     /**
      * Search main menu for items with {@code textToFind} in title.

trunk/src/org/openstreetmap/josm/gui/MapStatus.java

@@ -93 +93 @@
  * @author imi
  */
-public class MapStatus extends JPanel implements Helpful, Destroyable, PreferenceChangedListener, SoMChangeListener {
+public final class MapStatus extends JPanel implements Helpful, Destroyable, PreferenceChangedListener, SoMChangeListener {
 
     private final DecimalFormat DECIMAL_FORMAT = new DecimalFormat(Main.pref.get("statusbar.decimal-format", "0.0"));

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -719 +719 @@
             @Override
             public int compare(Relation o1, Relation o2) {
-                int comp = Boolean.valueOf(o1.isDisabledAndHidden()).compareTo(o2.isDisabledAndHidden());
+                int comp = Boolean.compare(o1.isDisabledAndHidden(), o2.isDisabledAndHidden());
                 return comp != 0 ? comp : DefaultNameFormatter.getInstance().getRelationComparator().compare(o1, o2);
             }

trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java

@@ -60 +60 @@
         protected void realRun() throws SAXException, IOException, OsmTransferException {
             precacheTask = layer.downloadAreaToCache(progressMonitor, points, 0, 0);
-            while (!precacheTask.isFinished() && !progressMonitor.isCanceled()) {
-                synchronized (this) {
-                    try {
+            synchronized (this) {
+                try {
+                    while (!precacheTask.isFinished() && !progressMonitor.isCanceled()) {
                         wait(200);
-                    } catch (InterruptedException ex) {
-                        Main.warn("InterruptedException in "+getClass().getSimpleName()+" while precaching WMS");
                     }
+                } catch (InterruptedException ex) {
+                    Main.warn("InterruptedException in "+getClass().getSimpleName()+" while precaching WMS");
                 }
             }

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.tools.I18n.trn;
 
-import java.awt.Component;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
 import java.awt.Rectangle;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
-import javax.swing.JCheckBox;
 import javax.swing.JLabel;
-import javax.swing.JOptionPane;
 import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
@@ -29 +21 @@
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
 import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
-import org.openstreetmap.josm.plugins.PluginHandler;
 import org.openstreetmap.josm.plugins.PluginInformation;
 import org.openstreetmap.josm.tools.OpenBrowser;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -56 +46 @@
     }
 
-    protected String formatPluginRemoteVersion(PluginInformation pi) {
+    protected static String formatPluginRemoteVersion(PluginInformation pi) {
         StringBuilder sb = new StringBuilder();
         if (pi.version == null || pi.version.trim().isEmpty()) {
@@ -69 +59 @@
     }
 
-    protected String formatPluginLocalVersion(PluginInformation pi) {
+    protected static String formatPluginLocalVersion(PluginInformation pi) {
         if (pi == null)
             return tr("unknown");
@@ -77 +67 @@
     }
 
-    protected String formatCheckboxTooltipText(PluginInformation pi) {
+    protected static String formatCheckboxTooltipText(PluginInformation pi) {
         if (pi == null)
             return "";
@@ -108 +98 @@
 
     /**
-     * A plugin checkbox.
-     */
-    private class JPluginCheckBox extends JCheckBox {
-        protected final transient PluginInformation pi;
-
-        JPluginCheckBox(final PluginInformation pi, boolean selected) {
-            this.pi = pi;
-            setSelected(selected);
-            setToolTipText(formatCheckboxTooltipText(pi));
-            addActionListener(new PluginCbActionListener(this));
-        }
-    }
-
-    /**
-     * Listener called when the user selects/unselects a plugin checkbox.
-     */
-    private class PluginCbActionListener implements ActionListener {
-        private final JPluginCheckBox cb;
-
-        PluginCbActionListener(JPluginCheckBox cb) {
-            this.cb = cb;
-        }
-
-        protected void selectRequiredPlugins(PluginInformation info) {
-            if (info != null && info.requires != null) {
-                for (String s : info.getRequiredPlugins()) {
-                    if (!model.isSelectedPlugin(s)) {
-                        model.setPluginSelected(s, true);
-                        selectRequiredPlugins(model.getPluginInformation(s));
-                    }
-                }
-            }
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            // Select/unselect corresponding plugin in the model
-            model.setPluginSelected(cb.pi.getName(), cb.isSelected());
-            // Does the newly selected plugin require other plugins ?
-            if (cb.isSelected() && cb.pi.requires != null) {
-                // Select required plugins
-                selectRequiredPlugins(cb.pi);
-                // Alert user if plugin requirements are not met
-                PluginHandler.checkRequiredPluginsPreconditions(PluginListPanel.this, model.getAvailablePlugins(), cb.pi, false);
-            } else if (!cb.isSelected()) {
-                // If the plugin has been unselected, was it required by other plugins still selected ?
-                Set<String> otherPlugins = new HashSet<>();
-                for (PluginInformation pi : model.getAvailablePlugins()) {
-                    if (!pi.equals(cb.pi) && pi.requires != null && model.isSelectedPlugin(pi.getName())) {
-                        for (String s : pi.getRequiredPlugins()) {
-                            if (s.equals(cb.pi.getName())) {
-                                otherPlugins.add(pi.getName());
-                                break;
-                            }
-                        }
-                    }
-                }
-                if (!otherPlugins.isEmpty()) {
-                    alertPluginStillRequired(PluginListPanel.this, cb.pi.getName(), otherPlugins);
-                }
-            }
-        }
-    }
-
-    /**
-     * Alerts the user if an unselected plugin is still required by another plugins
-     *
-     * @param parent The parent Component used to display error popup
-     * @param plugin the plugin
-     * @param otherPlugins the other plugins
-     */
-    private static void alertPluginStillRequired(Component parent, String plugin, Set<String> otherPlugins) {
-        StringBuilder sb = new StringBuilder("<html>")
-          .append(trn("Plugin {0} is still required by this plugin:",
-                "Plugin {0} is still required by these {1} plugins:",
-                otherPlugins.size(),
-                plugin,
-                otherPlugins.size()))
-          .append(Utils.joinAsHtmlUnorderedList(otherPlugins))
-          .append("</html>");
-        JOptionPane.showMessageDialog(
-                parent,
-                sb.toString(),
-                tr("Warning"),
-                JOptionPane.WARNING_MESSAGE
-        );
-    }
-
-    /**
      * Refreshes the list.
      */
@@ -221 +122 @@
             String localversion = formatPluginLocalVersion(model.getPluginInformation(pi.getName()));
 
-            final JPluginCheckBox cbPlugin = new JPluginCheckBox(pi, selected);
+            final PluginCheckBox cbPlugin = new PluginCheckBox(pi, selected, this, model);
             String pluginText = tr("{0}: Version {1} (local: {2})", pi.getName(), remoteversion, localversion);
             if (pi.requires != null && !pi.requires.isEmpty()) {

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPriority.java

@@ -117 +117 @@
             return ui;
 
-        int sel = Boolean.valueOf(selected).compareTo(other.selected);
+        int sel = Boolean.compare(selected, other.selected);
         if (sel != 0)
             return sel;
 
-        int ds = Boolean.valueOf(inDataSet).compareTo(other.inDataSet);
+        int ds = Boolean.compare(inDataSet, other.inDataSet);
         if (ds != 0)
             return ds;
 
-        int std = Boolean.valueOf(inStandard).compareTo(other.inStandard);
+        int std = Boolean.compare(inStandard, other.inStandard);
         if (std != 0)
             return std;

trunk/src/org/openstreetmap/josm/gui/util/RotationAngle.java

@@ -67 +67 @@
             case "n":
             case "north":
-                return Math.toRadians(0);
+                return 0; // 0 degree => 0 radian
             case "ne":
             case "northeast":
@@ -79 +79 @@
             case "s":
             case "south":
-                return Math.toRadians(180);
+                return Math.PI; // 180 degree
             case "sw":
             case "southwest":