Index: /trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (revision 6360) +++ /trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (revision 6361) @@ -223,4 +223,5 @@ ImageryType t = ImageryType.fromUrlString(type); this.cookies=cookies; + this.eulaAcceptanceRequired = eulaAcceptanceRequired; if (t != null) { this.imageryType = t; Index: /trunk/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java (revision 6360) +++ /trunk/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java (revision 6361) @@ -29,5 +29,5 @@ final SelectionChangedListener listener; - public ListenerInfo(SelectionChangedListener listener, boolean consolidate) { + public ListenerInfo(SelectionChangedListener listener) { this.listener = listener; } @@ -48,4 +48,7 @@ private final CopyOnWriteArrayList normalListeners = new CopyOnWriteArrayList(); + /** + * Constructs a new {@code SelectionEventManager}. + */ public SelectionEventManager() { DataSet.addSelectionListener(this); @@ -56,12 +59,12 @@ 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); Index: /trunk/src/org/openstreetmap/josm/gui/MapFrame.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MapFrame.java (revision 6360) +++ /trunk/src/org/openstreetmap/josm/gui/MapFrame.java (revision 6361) @@ -220,8 +220,8 @@ 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,5 +229,5 @@ addToggleDialog(validatorDialog = new ValidatorDialog()); addToggleDialog(filterDialog = new FilterDialog()); - addToggleDialog(new ChangesetDialog(this), true); + addToggleDialog(new ChangesetDialog(), true); addToggleDialog(new MapPaintDialog()); toolBarToggle.setFloatable(false); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (revision 6360) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (revision 6361) @@ -41,5 +41,4 @@ 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,5 +242,8 @@ } - public ChangesetDialog(MapFrame mapFrame) { + /** + * Constructs a new {@code ChangesetDialog}. + */ + public ChangesetDialog() { super( tr("Changesets"), Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (revision 6360) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (revision 6361) @@ -40,5 +40,4 @@ 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,5 +75,8 @@ 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,10 +342,11 @@ 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")); - } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java (revision 6360) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java (revision 6361) @@ -163,7 +163,7 @@ 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(); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 6360) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 6361) @@ -195,5 +195,5 @@ 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,5 +229,5 @@ 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); } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java (revision 6360) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java (revision 6361) @@ -126,5 +126,5 @@ @Override public void actionPerformed(ActionEvent e) { - fixErrors(e); + fixErrors(); } }); @@ -141,5 +141,5 @@ @Override public void actionPerformed(ActionEvent e) { - ignoreErrors(e); + ignoreErrors(); } }); @@ -183,9 +183,7 @@ /** * Fix selected errors - * - * @param e */ @SuppressWarnings("unchecked") - private void fixErrors(ActionEvent e) { + private void fixErrors() { TreePath[] selectionPaths = tree.getSelectionPaths(); if (selectionPaths == null) @@ -224,9 +222,7 @@ /** * 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; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 6360) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 6361) @@ -77,5 +77,4 @@ 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,7 +221,6 @@ /** * 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, Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 6360) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 6361) @@ -57,5 +57,4 @@ 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,5 +79,4 @@ 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,5 +180,5 @@ 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)); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (revision 6360) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (revision 6361) @@ -81,4 +81,5 @@ parents = new ArrayList(); this.child = child; + this.full = full; } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java (revision 6360) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java (revision 6361) @@ -68,5 +68,5 @@ } - public ReferringRelationsBrowser(OsmDataLayer layer, ReferringRelationsBrowserModel model, GenericRelationEditor relationEditor) { + public ReferringRelationsBrowser(OsmDataLayer layer, ReferringRelationsBrowserModel model) { this.model = model; this.layer = layer; Index: /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (revision 6360) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (revision 6361) @@ -97,5 +97,5 @@ } - 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,5 +118,5 @@ 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(); Index: /trunk/src/org/openstreetmap/josm/gui/util/StayOpenRadioButtonMenuItem.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/util/StayOpenRadioButtonMenuItem.java (revision 6360) +++ /trunk/src/org/openstreetmap/josm/gui/util/StayOpenRadioButtonMenuItem.java (revision 6361) @@ -42,5 +42,5 @@ */ public StayOpenRadioButtonMenuItem(Action a) { - super(); + super(a); } Index: /trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (revision 6360) +++ /trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (revision 6361) @@ -103,5 +103,5 @@ public OsmServerBackreferenceReader(long id, OsmPrimitiveType type, boolean readFull) throws IllegalArgumentException { this(id, type); - this.readFull = false; + this.readFull = readFull; }