Changeset 6361 in josm for trunk/src

Timestamp:

2013-11-03T00:19:32+01:00 (11 years ago)

Author:

Don-vip

Message:

Sonar/Findbugs - Unused formal parameter

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/ImageryInfo.java (modified) (1 diff)
• data/osm/event/SelectionEventManager.java (modified) (3 diffs)
• gui/MapFrame.java (modified) (2 diffs)
• gui/dialogs/ChangesetDialog.java (modified) (2 diffs)
• gui/dialogs/CommandStackDialog.java (modified) (3 diffs)
• gui/dialogs/LatLonDialog.java (modified) (1 diff)
• gui/dialogs/ToggleDialog.java (modified) (2 diffs)
• gui/dialogs/ValidatorDialog.java (modified) (4 diffs)
• gui/dialogs/properties/PropertiesDialog.java (modified) (2 diffs)
• gui/dialogs/relation/GenericRelationEditor.java (modified) (3 diffs)
• gui/dialogs/relation/ParentRelationLoadingTask.java (modified) (1 diff)
• gui/dialogs/relation/ReferringRelationsBrowser.java (modified) (1 diff)
• gui/preferences/imagery/ImageryPreference.java (modified) (2 diffs)
• gui/util/StayOpenRadioButtonMenuItem.java (modified) (1 diff)
• io/OsmServerBackreferenceReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

@@ -223 +223 @@
         ImageryType t = ImageryType.fromUrlString(type);
         this.cookies=cookies;
+        this.eulaAcceptanceRequired = eulaAcceptanceRequired;
         if (t != null) {
             this.imageryType = t;

trunk/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java

@@ -29 +29 @@
         final SelectionChangedListener listener;
 
-        public ListenerInfo(SelectionChangedListener listener, boolean consolidate) {
+        public ListenerInfo(SelectionChangedListener listener) {
             this.listener = listener;
         }
@@ -48 +48 @@
     private final CopyOnWriteArrayList<ListenerInfo> normalListeners = new CopyOnWriteArrayList<ListenerInfo>();
 
+    /**
+     * Constructs a new {@code SelectionEventManager}.
+     */
     public SelectionEventManager() {
         DataSet.addSelectionListener(this);
@@ -56 +59 @@
             throw new UnsupportedOperationException("IN_EDT mode not supported, you probably want to use IN_EDT_CONSOLIDATED.");
         if (fireMode == FireMode.IN_EDT || fireMode == FireMode.IN_EDT_CONSOLIDATED) {
-            inEDTListeners.addIfAbsent(new ListenerInfo(listener, fireMode == FireMode.IN_EDT_CONSOLIDATED));
+            inEDTListeners.addIfAbsent(new ListenerInfo(listener));
         } else {
-            normalListeners.addIfAbsent(new ListenerInfo(listener, false));
+            normalListeners.addIfAbsent(new ListenerInfo(listener));
         }
     }
 
     public void removeSelectionListener(SelectionChangedListener listener) {
-        ListenerInfo searchListener = new ListenerInfo(listener, false);
+        ListenerInfo searchListener = new ListenerInfo(listener);
         inEDTListeners.remove(searchListener);
         normalListeners.remove(searchListener);

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

@@ -220 +220 @@
         LayerListDialog.createInstance(this);
         addToggleDialog(LayerListDialog.getInstance());
-        addToggleDialog(propertiesDialog = new PropertiesDialog(this));
+        addToggleDialog(propertiesDialog = new PropertiesDialog());
         addToggleDialog(selectionListDialog = new SelectionListDialog());
         addToggleDialog(relationListDialog = new RelationListDialog());
-        addToggleDialog(new CommandStackDialog(this));
+        addToggleDialog(new CommandStackDialog());
         addToggleDialog(new UserListDialog());
         addToggleDialog(new HistoryDialog(), true);
@@ -229 +229 @@
         addToggleDialog(validatorDialog = new ValidatorDialog());
         addToggleDialog(filterDialog = new FilterDialog());
-        addToggleDialog(new ChangesetDialog(this), true);
+        addToggleDialog(new ChangesetDialog(), true);
         addToggleDialog(new MapPaintDialog());
         toolBarToggle.setFloatable(false);

trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java

@@ -41 +41 @@
 import org.openstreetmap.josm.data.osm.event.DatasetEventManager;
 import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
-import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.SideButton;
@@ -243 +242 @@
     }
 
-    public ChangesetDialog(MapFrame mapFrame) {
+    /**
+     * Constructs a new {@code ChangesetDialog}.
+     */
+    public ChangesetDialog() {
         super(
                 tr("Changesets"),

trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java

@@ -40 +40 @@
 import org.openstreetmap.josm.command.PseudoCommand;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -76 +75 @@
     private SelectAndZoomAction selectAndZoomAction = new SelectAndZoomAction();
 
-    public CommandStackDialog(final MapFrame mapFrame) {
+    /**
+     * Constructs a new {@code CommandStackDialog}.
+     */
+    public CommandStackDialog() {
         super(tr("Command Stack"), "commandstack", tr("Open a list of all commands (undo buffer)."),
                 Shortcut.registerShortcut("subwindow:commandstack", tr("Toggle: {0}",
@@ -340 +342 @@
     public class SelectAction extends AbstractAction implements IEnabledStateUpdating {
 
+        /**
+         * Constructs a new {@code SelectAction}.
+         */
         public SelectAction() {
-            super();
             putValue(NAME,tr("Select"));
             putValue(SHORT_DESCRIPTION, tr("Selects the objects that take part in this command (unless currently deleted)"));
             putValue(SMALL_ICON, ImageProvider.get("dialogs","select"));
-
         }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java

@@ -163 +163 @@
 
     public LatLonDialog(Component parent, String title, String help) {
-        super(Main.parent, tr("Add Node..."), new String[] { tr("Ok"), tr("Cancel") });
+        super(parent, title, new String[] { tr("Ok"), tr("Cancel") });
         setButtonIcons(new String[] { "ok", "cancel" });
-        configureContextsensitiveHelp("/Action/AddNode", true);
+        configureContextsensitiveHelp(help, true);
 
         build();

trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java

@@ -195 +195 @@
         setMinimumSize(new Dimension(0,0));
         this.preferredHeight = preferredHeight;
-        toggleAction = new ToggleDialogAction(name, "dialogs/"+iconName, tooltip, shortcut, iconName);
+        toggleAction = new ToggleDialogAction(name, "dialogs/"+iconName, tooltip, shortcut);
         String helpId = "Dialog/"+getClass().getName().substring(getClass().getName().lastIndexOf('.')+1);
         toggleAction.putValue("help", helpId.substring(0, helpId.length()-6));
@@ -229 +229 @@
     public final class ToggleDialogAction extends JosmAction {
 
-        private ToggleDialogAction(String name, String iconName, String tooltip, Shortcut shortcut, String prefname) {
+        private ToggleDialogAction(String name, String iconName, String tooltip, Shortcut shortcut) {
             super(name, iconName, tooltip, shortcut, false);
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java

@@ -126 +126 @@
             @Override
             public void actionPerformed(ActionEvent e) {
-                fixErrors(e);
+                fixErrors();
             }
         });
@@ -141 +141 @@
                 @Override
                 public void actionPerformed(ActionEvent e) {
-                    ignoreErrors(e);
+                    ignoreErrors();
                 }
             });
@@ -183 +183 @@
     /**
      * Fix selected errors
-     *
-     * @param e
      */
     @SuppressWarnings("unchecked")
-    private void fixErrors(ActionEvent e) {
+    private void fixErrors() {
         TreePath[] selectionPaths = tree.getSelectionPaths();
         if (selectionPaths == null)
@@ -224 +222 @@
     /**
      * Set selected errors to ignore state
-     *
-     * @param e
      */
     @SuppressWarnings("unchecked")
-    private void ignoreErrors(ActionEvent e) {
+    private void ignoreErrors() {
         int asked = JOptionPane.DEFAULT_OPTION;
         boolean changed = false;

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

@@ -77 +77 @@
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.PopupMenuHandler;
@@ -222 +221 @@
     /**
      * Create a new PropertiesDialog
-     * @param mapFrame The parent map fram
-     */
-    public PropertiesDialog(MapFrame mapFrame) {
+     */
+    public PropertiesDialog() {
         super(tr("Tags/Memberships"), "propertiesdialog", tr("Tags for selected objects."),
                 Shortcut.registerShortcut("subwindow:properties", tr("Toggle: {0}", tr("Tags/Memberships")), KeyEvent.VK_P,

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -57 +57 @@
 import org.openstreetmap.josm.actions.CopyAction;
 import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.actions.PasteTagsAction.TagPaster;
 import org.openstreetmap.josm.command.AddCommand;
 import org.openstreetmap.josm.command.ChangeCommand;
@@ -80 +79 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.tagging.TagEditorPanel;
-import org.openstreetmap.josm.gui.tagging.TagModel;
 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
 import org.openstreetmap.josm.gui.tagging.TaggingPresetType;
@@ -182 +180 @@
         JTabbedPane tabbedPane = new JTabbedPane();
         tabbedPane.add(tr("Tags and Members"), pnl);
-        referrerBrowser = new ReferringRelationsBrowser(getLayer(), referrerModel, this);
+        referrerBrowser = new ReferringRelationsBrowser(getLayer(), referrerModel);
         tabbedPane.add(tr("Parent Relations"), referrerBrowser);
         tabbedPane.add(tr("Child Relations"), new ChildRelationBrowser(getLayer(), relation));

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java

@@ -81 +81 @@
         parents = new ArrayList<Relation>();
         this.child = child;
+        this.full = full;
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java

@@ -68 +68 @@
     }
 
-    public ReferringRelationsBrowser(OsmDataLayer layer, ReferringRelationsBrowserModel model, GenericRelationEditor relationEditor) {
+    public ReferringRelationsBrowser(OsmDataLayer layer, ReferringRelationsBrowserModel model) {
         this.model = model;
         this.layer = layer;

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java

@@ -97 +97 @@
     }
 
-    private Component buildSettingsPanel(final PreferenceTabbedPane gui) {
+    private Component buildSettingsPanel() {
         final JPanel p = new JPanel(new GridBagLayout());
         p.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
@@ -118 +118 @@
         imageryProviders = new ImageryProvidersPanel(gui, layerInfo);
         pane.addTab(tr("Imagery providers"), imageryProviders);
-        pane.addTab(tr("Settings"), buildSettingsPanel(gui));
+        pane.addTab(tr("Settings"), buildSettingsPanel());
         pane.addTab(tr("Offset bookmarks"), new OffsetBookmarksPanel(gui));
         loadSettings();

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

@@ -42 +42 @@
    */
   public StayOpenRadioButtonMenuItem(Action a) {
-    super();
+    super(a);
   }
 

trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java

@@ -103 +103 @@
     public OsmServerBackreferenceReader(long id, OsmPrimitiveType type, boolean readFull) throws IllegalArgumentException  {
         this(id, type);
-        this.readFull = false;
+        this.readFull = readFull;
     }