Index: /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 8855) @@ -539,13 +539,4 @@ } - protected Node getStartNode() { - Set nodes = getNodes(); - for (Node n: nodes) { - if (successors.get(n) != null && successors.get(n).size() == 1) - return n; - } - return null; - } - protected Set getTerminalNodes() { Set ret = new LinkedHashSet<>(); Index: /trunk/src/org/openstreetmap/josm/actions/MapRectifierWMSmenuAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/MapRectifierWMSmenuAction.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/actions/MapRectifierWMSmenuAction.java (revision 8855) @@ -217,5 +217,5 @@ } - // and display an error message. The while (true) ensures that the dialog pops up again + // and display an error message. The while loop ensures that the dialog pops up again JOptionPane.showMessageDialog(Main.parent, tr("Couldn''t match the entered link or id to the selected service. Please try again."), Index: /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (revision 8855) @@ -455,20 +455,7 @@ v = EN.diff(v, segment); } else throw new IllegalStateException(); - /** - * When summing up the length of the sum vector should increase. - * However, it is possible to construct ways, such that this assertion fails. - * So only uncomment this for testing - **/ - // if (segDirections[i].ordinal() % 2 == 0) { - // if (EN.abs(h) < lh) throw new AssertionError(); - // lh = EN.abs(h); - // } else { - // if (EN.abs(v) < lv) throw new AssertionError(); - // lv = EN.abs(v); - // } } // rotate the vertical vector by 90 degrees (clockwise) and add it to the horizontal vector segSum = EN.sum(h, new EastNorth(v.north(), -v.east())); - // if (EN.abs(segSum) < lh) throw new AssertionError(); this.heading = EN.polar(new EastNorth(0., 0.), segSum); } Index: /trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java (revision 8855) @@ -56,5 +56,5 @@ private final Collection source; private final Collection target; - private final List commands = new ArrayList<>(); + private final List tags = new ArrayList<>(); public TagPaster(Collection source, Collection target) { @@ -109,7 +109,7 @@ } - protected void buildChangeCommand(Collection selection, TagCollection tc) { + protected void buildTags(TagCollection tc) { for (String key : tc.getKeys()) { - commands.add(new Tag(key, tc.getValues(key).iterator().next())); + tags.add(new Tag(key, tc.getValues(key).iterator().next())); } } @@ -161,10 +161,10 @@ if (dialog.isCanceled()) return; - buildChangeCommand(target, dialog.getResolution()); + buildTags(dialog.getResolution()); } else { // no conflicts in the source tags to resolve. Just apply the tags // to the target primitives // - buildChangeCommand(target, tc); + buildTags(tc); } } @@ -185,8 +185,7 @@ * Replies true if this a heterogeneous source can be pasted without conflict to targets * - * @param targets the collection of target primitives * @return true if this a heterogeneous source can be pasted without conflicts to targets */ - protected boolean canPasteFromHeterogeneousSourceWithoutConflict(Collection targets) { + protected boolean canPasteFromHeterogeneousSourceWithoutConflict() { for (OsmPrimitiveType type : OsmPrimitiveType.dataValues()) { if (hasTargetPrimitives(type.getOsmClass())) { @@ -200,12 +199,11 @@ /** - * Pastes the tags in the current selection of the paste buffer to a set of target - * primitives. + * Pastes the tags in the current selection of the paste buffer to a set of target primitives. */ protected void pasteFromHeterogeneousSource() { - if (canPasteFromHeterogeneousSourceWithoutConflict(target)) { + if (canPasteFromHeterogeneousSourceWithoutConflict()) { for (OsmPrimitiveType type : OsmPrimitiveType.dataValues()) { if (hasSourceTagsByType(type) && hasTargetPrimitives(type.getOsmClass())) { - buildChangeCommand(target, getSourceTagsByType(type)); + buildTags(getSourceTagsByType(type)); } } @@ -224,5 +222,5 @@ for (OsmPrimitiveType type : OsmPrimitiveType.dataValues()) { if (hasSourceTagsByType(type) && hasTargetPrimitives(type.getOsmClass())) { - buildChangeCommand(OsmPrimitive.getFilteredList(target, type.getOsmClass()), dialog.getResolution(type)); + buildTags(dialog.getResolution(type)); } } @@ -231,5 +229,5 @@ public List execute() { - commands.clear(); + tags.clear(); if (isHeteogeneousSource()) { pasteFromHeterogeneousSource(); @@ -237,5 +235,5 @@ pasteFromHomogeneousSource(); } - return commands; + return tags; } Index: /trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java (revision 8855) @@ -127,15 +127,4 @@ } - protected int getNumWaysInSelection() { - if (getCurrentDataSet() == null) return 0; - int ret = 0; - for (OsmPrimitive primitive : getCurrentDataSet().getSelected()) { - if (primitive instanceof Way) { - ret++; - } - } - return ret; - } - @Override protected void updateEnabledState() { Index: /trunk/src/org/openstreetmap/josm/actions/SearchNotesDownloadAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/SearchNotesDownloadAction.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/actions/SearchNotesDownloadAction.java (revision 8855) @@ -81,5 +81,5 @@ try { final long id = Long.parseLong(searchTerm); - new DownloadNotesTask().download(false, id, null); + new DownloadNotesTask().download(id, null); return; } catch (NumberFormatException ignore) { Index: /trunk/src/org/openstreetmap/josm/actions/ValidateAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/ValidateAction.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/actions/ValidateAction.java (revision 8855) @@ -48,5 +48,5 @@ @Override public void actionPerformed(ActionEvent ev) { - doValidate(ev, true); + doValidate(true); } @@ -58,8 +58,7 @@ * revalidated * - * @param ev The event * @param getSelectedItems If selected or last selected items must be validated */ - public void doValidate(ActionEvent ev, boolean getSelectedItems) { + public void doValidate(boolean getSelectedItems) { if (Main.map == null || !Main.map.isVisible()) return; Index: /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java (revision 8855) @@ -38,5 +38,5 @@ private DownloadTask downloadTask; - public Future download(boolean newLayer, long id, ProgressMonitor progressMonitor) { + public Future download(long id, ProgressMonitor progressMonitor) { final String url = OsmApi.getOsmApi().getBaseUrl() + "notes/" + id; downloadTask = new DownloadRawUrlTask(new OsmServerLocationReader(url), progressMonitor); Index: /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesUrlIdTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesUrlIdTask.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesUrlIdTask.java (revision 8855) @@ -18,5 +18,5 @@ final Matcher matcher = Pattern.compile(URL_ID_PATTERN).matcher(url); if (matcher.matches()) { - return download(newLayer, Long.parseLong(matcher.group(2)), null); + return download(Long.parseLong(matcher.group(2)), null); } else { throw new IllegalStateException("Failed to parse note id from " + url); Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 8855) @@ -236,6 +236,4 @@ Main.map.keyDetector.addModifierListener(this); ignoreNextKeyRelease = true; - // would like to but haven't got mouse position yet: - // computeHelperLine(false, false, false); } Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java (revision 8855) @@ -21,6 +21,5 @@ * is another. * - * MapModes should register/deregister all necessary listeners on the map's view - * control. + * MapModes should register/deregister all necessary listeners on the map's view control. */ public abstract class MapMode extends JosmAction implements MouseListener, MouseMotionListener { @@ -32,4 +31,5 @@ /** * Constructor for mapmodes without an menu + * @param mapFrame unused but kept for plugin compatibility. Can be {@code null} */ public MapMode(String name, String iconName, String tooltip, Shortcut shortcut, MapFrame mapFrame, Cursor cursor) { @@ -41,4 +41,5 @@ /** * Constructor for mapmodes with an menu (no shortcut will be registered) + * @param mapFrame unused but kept for plugin compatibility. Can be {@code null} */ public MapMode(String name, String iconName, String tooltip, MapFrame mapFrame, Cursor cursor) { @@ -84,8 +85,13 @@ } - // By default, all tools will work with all layers. Can be overwritten to require - // a special type of layer + /** + * Determines if layer {@code l} is supported by this map mode. + * By default, all tools will work with all layers. + * Can be overwritten to require a special type of layer + * @param l layer + * @return {@code true} if the layer is supported by this map mode + */ public boolean layerIsSupported(Layer l) { - return true; + return l != null; } Index: /trunk/src/org/openstreetmap/josm/command/DeleteCommand.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (revision 8855) @@ -302,10 +302,9 @@ *
  • it is not referred to by other non-deleted primitives outside of primitivesToDelete
    • * - * @param layer the layer in whose context primitives are deleted * @param primitivesToDelete the primitives to delete * @return the collection of nodes referred to by primitives in primitivesToDelete which * can be deleted too */ - protected static Collection computeNodesToDelete(OsmDataLayer layer, Collection primitivesToDelete) { + protected static Collection computeNodesToDelete(Collection primitivesToDelete) { Collection nodesToDelete = new HashSet<>(); for (Way way : OsmPrimitive.getFilteredList(primitivesToDelete, Way.class)) { @@ -379,5 +378,5 @@ if (alsoDeleteNodesInWay) { // delete untagged nodes only referenced by primitives in primitivesToDelete, too - Collection nodesToDelete = computeNodesToDelete(layer, primitivesToDelete); + Collection nodesToDelete = computeNodesToDelete(primitivesToDelete); primitivesToDelete.addAll(nodesToDelete); } Index: /trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (revision 8855) @@ -215,6 +215,4 @@ if (this.layers.isEmpty()) throw new IllegalArgumentException(tr("No layers defined by getCapabilities document: {0}", info.getUrl())); - - // Not needed ? initProjection(); } @@ -387,11 +385,4 @@ /** - * Initializes projection for this TileSource with current projection - */ - protected void initProjection() { - initProjection(Main.getProjection()); - } - - /** * Initializes projection for this TileSource with projection * @param proj projection to be used by this TileSource Index: /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (revision 8855) @@ -1224,5 +1224,5 @@ } - void fireHighlightingChanged(OsmPrimitive primitive) { + void fireHighlightingChanged() { highlightUpdateCount++; } Index: /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 8855) @@ -640,5 +640,5 @@ updateFlags(FLAG_HIGHLIGHTED, highlighted); if (dataSet != null) { - dataSet.fireHighlightingChanged(this); + dataSet.fireHighlightingChanged(); } } Index: /trunk/src/org/openstreetmap/josm/data/osm/Storage.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/Storage.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/data/osm/Storage.java (revision 8855) @@ -267,5 +267,4 @@ */ private int rehash(int h) { - //return 54435761*h; return 1103515245*h >> 2; } @@ -361,16 +360,4 @@ }; } - /* - public static Hash identityHash() { - return new Hash() { - public int getHashCode(O t) { - return System.identityHashCode(t); - } - public boolean equals(O t1, O t2) { - return t1 == t2; - } - }; - } - */ private final class FMap implements Map { Index: /trunk/src/org/openstreetmap/josm/data/osm/TigerUtils.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/TigerUtils.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/data/osm/TigerUtils.java (revision 8855) @@ -45,5 +45,5 @@ } - public static String combineTags(String name, Set values) { + public static String combineTags(Set values) { Set resultSet = new TreeSet<>(); for (String value: values) { @@ -66,10 +66,3 @@ return combined.toString(); } - - public static String combineTags(String name, String t1, String t2) { - Set set = new TreeSet<>(); - set.add(t1); - set.add(t2); - return TigerUtils.combineTags(name, set); - } } Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java (revision 8855) @@ -6,5 +6,4 @@ import java.awt.Graphics2D; import java.awt.Point; -import java.awt.Polygon; import java.awt.Rectangle; import java.awt.RenderingHints; @@ -455,20 +454,4 @@ /** - * Checks if a polygon is visible in display. - * - * @param polygon The polygon to check. - * @return true if polygon is visible. - */ - protected boolean isPolygonVisible(Polygon polygon) { - Rectangle bounds = polygon.getBounds(); - if (bounds.width == 0 && bounds.height == 0) return false; - if (bounds.x > nc.getWidth()) return false; - if (bounds.y > nc.getHeight()) return false; - if (bounds.x + bounds.width < 0) return false; - if (bounds.y + bounds.height < 0) return false; - return true; - } - - /** * Finally display all segments in currect path. */ Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (revision 8855) @@ -263,7 +263,4 @@ } // TODO directionKeys are no longer in OsmPrimitive (search pattern is used instead) - /* for (String a : OsmPrimitive.getDirectionKeys()) - presetsValueData.add(a); - */ for (String a : Main.pref.getCollection(ValidatorPreference.PREFIX + ".knownkeys", Arrays.asList(new String[]{"is_in", "int_ref", "fixme", "population"}))) { @@ -704,5 +701,5 @@ } - public boolean match(OsmPrimitive osm, Map keys) { + public boolean match(Map keys) { for (Entry prop: keys.entrySet()) { String key = prop.getKey(); @@ -784,5 +781,5 @@ for (CheckerElement ce : data) { - if (!ce.match(osm, keys)) + if (!ce.match(keys)) return false; } Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java (revision 8855) @@ -4,6 +4,4 @@ import static org.openstreetmap.josm.tools.I18n.marktr; import static org.openstreetmap.josm.tools.I18n.tr; - -import java.util.Map; import org.openstreetmap.josm.command.Command; @@ -88,8 +86,4 @@ } - private boolean contains(Map.Entry tag, String s) { - return tag.getKey().indexOf(s) != -1 || tag.getValue().indexOf(s) != -1; - } - @Override public Command fixError(TestError testError) { Index: /trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java (revision 8855) @@ -4,5 +4,4 @@ import static org.openstreetmap.josm.tools.I18n.tr; -import java.awt.Component; import java.text.MessageFormat; @@ -65,5 +64,5 @@ !Main.isOffline(OnlineResource.OSM_API)) { try { - instance.initFromOAuth(Main.parent); + instance.initFromOAuth(); } catch (Exception e) { Main.error(e); @@ -211,9 +210,8 @@ * Initializes the user identity manager from OAuth request of user details. * This method should be called if {@code osm-server.auth-method} is set to {@code oauth}. - * @param parent component relative to which the {@link PleaseWaitDialog} is displayed. * @see #initFromPreferences * @since 5434 */ - public void initFromOAuth(Component parent) { + public void initFromOAuth() { try { UserInfo info = new OsmServerUserInfoReader().fetchUserInfo(NullProgressMonitor.INSTANCE); @@ -283,5 +281,5 @@ if (OsmApi.isUsingOAuth()) { try { - getInstance().initFromOAuth(Main.parent); + getInstance().initFromOAuth(); } catch (Exception e) { Main.error(e); Index: /trunk/src/org/openstreetmap/josm/gui/MapStatus.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 8855) @@ -927,5 +927,4 @@ @Override public synchronized void addMouseListener(MouseListener ml) { - //super.addMouseListener(ml); lonText.addMouseListener(ml); latText.addMouseListener(ml); Index: /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java (revision 8855) @@ -198,8 +198,4 @@ } - protected Point getTopLeftCoordinates() { - return new Point(center.x - (getWidth() / 2), center.y - (getHeight() / 2)); - } - /** * Draw the map. Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java (revision 8855) @@ -53,5 +53,5 @@ * @param isSelected true, if the current row is selected */ - protected void renderNode(ListMergeModel.EntriesTableModel model, Node node, int row, boolean isSelected) { + protected void renderNode(ListMergeModel.EntriesTableModel model, Node node, int row, boolean isSelected) { setIcon(icon); setBorder(null); @@ -84,9 +84,8 @@ /** * render the row id - * @param model the model + * @param model the model * @param row the row index - * @param isSelected true, if the current row is selected */ - protected void renderRowId(ListMergeModel.EntriesTableModel model, int row, boolean isSelected) { + protected void renderRowId(ListMergeModel.EntriesTableModel model, int row) { setIcon(null); setBorder(rowNumberBorder); @@ -111,5 +110,5 @@ switch(column) { case 0: - renderRowId(getModel(table), row, isSelected); + renderRowId(getModel(table), row); break; case 1: Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java (revision 8855) @@ -68,5 +68,5 @@ for (String key: tc.getKeys()) { if (TigerUtils.isTigerTag(key)) { - tc.setUniqueForKey(key, TigerUtils.combineTags(key, tc.getValues(key))); + tc.setUniqueForKey(key, TigerUtils.combineTags(tc.getValues(key))); } } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java (revision 8855) @@ -9,6 +9,4 @@ import java.awt.event.FocusEvent; import java.awt.event.FocusListener; -import java.text.NumberFormat; -import java.text.ParsePosition; import java.util.ArrayList; import java.util.Arrays; @@ -235,29 +233,4 @@ } - protected Double parseDoubleFromUserInput(String input) { - if (input == null) return null; - // remove white space and an optional degree symbol - // - input = input.trim(); - input = input.replaceAll(DEG, ""); - - // try to parse using the current locale - // - NumberFormat f = NumberFormat.getNumberInstance(); - Number n = null; - ParsePosition pp = new ParsePosition(0); - n = f.parse(input, pp); - if (pp.getErrorIndex() >= 0 || pp.getIndex() < input.length()) { - // fall back - try to parse with the english locale - // - pp = new ParsePosition(0); - f = NumberFormat.getNumberInstance(Locale.ENGLISH); - n = f.parse(input, pp); - if (pp.getErrorIndex() >= 0 || pp.getIndex() < input.length()) - return null; - } - return n == null ? null : n.doubleValue(); - } - protected void parseLatLonUserInput() { LatLon latLon; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 8855) @@ -960,10 +960,4 @@ } - protected boolean isActiveLayer(Layer layer) { - if (!Main.isDisplayingMapView()) - return false; - return Main.map.mapView.getActiveLayer() == layer; - } - @Override public void updateEnabledState() { @@ -1148,5 +1142,5 @@ public void showMenu(MouseEvent evt) { Layer layer = getModel().getLayer(layerList.getSelectedRow()); - menu = new LayerListPopup(getModel().getSelectedLayers(), layer); + menu = new LayerListPopup(getModel().getSelectedLayers()); super.showMenu(evt); } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java (revision 8855) @@ -67,5 +67,5 @@ } - public LayerListPopup(List selectedLayers, final Layer layer) { + public LayerListPopup(List selectedLayers) { List actions; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 8855) @@ -839,11 +839,4 @@ /** - * Change the Geometry of the detached dialog to better fit the content. - */ - protected Rectangle getDetachedGeometry(Rectangle last) { - return last; - } - - /** * Default size of the detached dialog. * Override this method to customize the initial dialog size. Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java (revision 8855) @@ -16,5 +16,4 @@ import java.beans.PropertyChangeListener; import java.text.DateFormat; -import java.util.Collection; import java.util.Collections; import java.util.HashSet; @@ -364,5 +363,5 @@ } - protected void alertNoPrimitivesToSelect(Collection primitives) { + protected void alertNoPrimitivesToSelect() { HelpAwareOptionPane.showOptionDialog( ChangesetDetailPanel.this, @@ -391,5 +390,5 @@ } if (target.isEmpty()) { - alertNoPrimitivesToSelect(target); + alertNoPrimitivesToSelect(); return; } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetTagsPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetTagsPanel.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetTagsPanel.java (revision 8855) @@ -38,12 +38,4 @@ } - protected void init(Changeset cs) { - if (cs == null) { - model.clear(); - return; - } - model.initFromTags(cs.getKeys()); - } - /* ---------------------------------------------------------------------------- */ /* interface PropertyChangeListener */ Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 8855) @@ -178,5 +178,5 @@ tagEditorPanel.getModel().ensureOneTag(); - JSplitPane pane = buildSplitPane(relation); + JSplitPane pane = buildSplitPane(); pane.setPreferredSize(new Dimension(100, 100)); @@ -460,5 +460,5 @@ * @return the split panel */ - protected JSplitPane buildSplitPane(Relation relation) { + protected JSplitPane buildSplitPane() { final JSplitPane pane = new JSplitPane(JSplitPane.VERTICAL_SPLIT); pane.setTopComponent(buildTagEditorPanel()); @@ -468,6 +468,5 @@ @Override public void windowOpened(WindowEvent e) { - // has to be called when the window is visible, otherwise - // no effect + // has to be called when the window is visible, otherwise no effect pane.setDividerLocation(0.3); } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (revision 8855) @@ -675,16 +675,4 @@ /** - * Replies true if the layer this model belongs to is equal to the active - * layer - * - * @return true if the layer this model belongs to is equal to the active - * layer - */ - protected boolean isActiveLayer() { - if (!Main.isDisplayingMapView()) return false; - return Main.map.mapView.getActiveLayer() == layer; - } - - /** * Sort the selected relation members by the way they are linked. */ Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java (revision 8855) @@ -48,5 +48,5 @@ } - protected void renderBackground(OsmPrimitive primitive, boolean isSelected) { + protected void renderBackground(OsmPrimitive primitive) { Color bgc = UIManager.getColor("Table.background"); if (primitive != null && model != null && model.getNumMembersWithPrimitive(primitive) == 1) { @@ -72,5 +72,5 @@ return this; - renderBackground((OsmPrimitive) value, isSelected); + renderBackground((OsmPrimitive) value); renderPrimitive((OsmPrimitive) value); return this; Index: /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (revision 8855) @@ -132,11 +132,4 @@ } - protected boolean hasNewNodes(Way way) { - for (Node n: way.getNodes()) { - if (n.isNew()) return true; - } - return false; - } - protected boolean canShowAsLatest(OsmPrimitive primitive) { if (primitive == null) return false; Index: /trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java (revision 8855) @@ -51,5 +51,5 @@ } - protected void renderRole(Item diffItem, int row, boolean isSelected) { + protected void renderRole(Item diffItem) { String text = ""; Color bgColor = diffItem.state.getColor(); @@ -61,5 +61,5 @@ } - protected void renderPrimitive(Item diffItem, int row, boolean isSelected) { + protected void renderPrimitive(Item diffItem) { String text = ""; Color bgColor = diffItem.state.getColor(); @@ -87,8 +87,8 @@ switch(column) { case 0: - renderRole(member, row, isSelected); + renderRole(member); break; case 1: - renderPrimitive(member, row, isSelected); + renderPrimitive(member); break; } @@ -96,7 +96,3 @@ return this; } - - protected DiffTableModel getRelationMemberTableModel(JTable table) { - return (DiffTableModel) table.getModel(); - } } Index: /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (revision 8855) @@ -315,8 +315,4 @@ } - protected void cancelWhenInSaveAndUploadingMode() { - cancelSafeAndUploadTask(); - } - public void cancel() { switch(model.getMode()) { Index: /trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (revision 8855) @@ -514,5 +514,4 @@ initTileSource(this.tileSource); - ; // keep them final here, so we avoid namespace clutter in the class final JPopupMenu tileOptionMenu = new JPopupMenu(); Index: /trunk/src/org/openstreetmap/josm/gui/layer/Layer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/Layer.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/gui/layer/Layer.java (revision 8855) @@ -388,5 +388,5 @@ */ public boolean isProjectionSupported(Projection proj) { - return true; + return proj != null; } Index: /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 8855) @@ -442,6 +442,6 @@ @Override public boolean isMergable(final Layer other) { - // isUploadDiscouraged commented to allow merging between normal layers and discouraged layers with a warning (see #7684) - return other instanceof OsmDataLayer; // && (isUploadDiscouraged() == ((OsmDataLayer)other).isUploadDiscouraged()); + // allow merging between normal layers and discouraged layers with a warning (see #7684) + return other instanceof OsmDataLayer; } Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (revision 8855) @@ -44,5 +44,4 @@ public void clearCached() { // run in EDT to make sure this isn't called during rendering run - // {@link org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer#render} GuiHelper.runInEDT(new Runnable() { @Override Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java (revision 8855) @@ -69,8 +69,4 @@ } - protected TagEditorModel getModel(JTable table) { - return (TagEditorModel) table.getModel(); - } - /** * replies the cell renderer component for a specific cell Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java (revision 8855) @@ -233,5 +233,5 @@ } - public boolean addToPanel(JPanel p, Collection sel) { + public boolean addToPanel(JPanel p) { String cstring; if (count > 0 && !required) { @@ -477,5 +477,5 @@ proles.add(new JLabel(tr("elements")), GBC.eol()); for (Role i : roles) { - i.addToPanel(proles, sel); + i.addToPanel(proles); } p.add(proles, GBC.eol()); Index: /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java (revision 8855) @@ -231,5 +231,4 @@ if (filter == null) { // Collections.copy throws an exception "Source does not fit in dest" - // Collections.copy(filtered, list); filtered.ensureCapacity(list.size()); for (AutoCompletionListItem item: list) { Index: /trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (revision 8855) @@ -14,5 +14,4 @@ import java.util.LinkedHashSet; import java.util.List; -import java.util.NoSuchElementException; import java.util.Set; import java.util.concurrent.Callable; @@ -37,5 +36,4 @@ import org.openstreetmap.josm.gui.progress.NullProgressMonitor; import org.openstreetmap.josm.gui.progress.ProgressMonitor; -import org.openstreetmap.josm.tools.CheckParameterUtil; import org.openstreetmap.josm.tools.Utils; @@ -99,28 +97,4 @@ case RELATION: relations.add(id.getUniqueId()); break; } - } - - /** - * remembers an {@link OsmPrimitive}'s id. ds must include - * an {@link OsmPrimitive} with id=id. The id will - * later we fetched as part of a Multi Get request. - * - * Ignore the id if it id <= 0. - * - * @param ds the dataset (must not be null) - * @param id the primitive id - * @param type The primitive type. Must be one of {@link OsmPrimitiveType#NODE NODE}, {@link OsmPrimitiveType#WAY WAY}, - * {@link OsmPrimitiveType#RELATION RELATION} - * @throws IllegalArgumentException if ds is null - * @throws NoSuchElementException if ds does not include an {@link OsmPrimitive} with id=id - */ - protected void remember(DataSet ds, long id, OsmPrimitiveType type) throws NoSuchElementException { - CheckParameterUtil.ensureParameterNotNull(ds, "ds"); - if (id <= 0) return; - OsmPrimitive primitive = ds.getPrimitiveById(id, type); - if (primitive == null) - throw new NoSuchElementException(tr("No primitive with id {0} in local dataset. Cannot infer primitive type.", id)); - remember(primitive.getPrimitiveId()); - return; } Index: /trunk/src/org/openstreetmap/josm/io/OsmChangeImporter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmChangeImporter.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/io/OsmChangeImporter.java (revision 8855) @@ -15,5 +15,4 @@ import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.gui.layer.OsmDataLayer; -import org.openstreetmap.josm.gui.progress.NullProgressMonitor; import org.openstreetmap.josm.gui.progress.ProgressMonitor; import org.openstreetmap.josm.gui.util.GuiHelper; @@ -45,8 +44,4 @@ } - protected void importData(InputStream in, final File associatedFile) throws IllegalDataException { - importData(in, associatedFile, NullProgressMonitor.INSTANCE); - } - protected void importData(InputStream in, final File associatedFile, ProgressMonitor progressMonitor) throws IllegalDataException { final DataSet dataSet = OsmChangeReader.parseDataSet(in, progressMonitor); Index: /trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java (revision 8855) @@ -79,5 +79,5 @@ private StringBuilder text; - protected void parseChangesetAttributes(Changeset cs, Attributes atts) throws XmlParsingException { + protected void parseChangesetAttributes(Attributes atts) throws XmlParsingException { // -- id String value = atts.getValue("id"); @@ -204,5 +204,5 @@ case "changeset": current = new Changeset(); - parseChangesetAttributes(current, atts); + parseChangesetAttributes(atts); break; case "tag": Index: /trunk/src/org/openstreetmap/josm/io/OsmImporter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmImporter.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/io/OsmImporter.java (revision 8855) @@ -16,5 +16,4 @@ import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; import org.openstreetmap.josm.gui.layer.OsmDataLayer; -import org.openstreetmap.josm.gui.progress.NullProgressMonitor; import org.openstreetmap.josm.gui.progress.ProgressMonitor; import org.openstreetmap.josm.gui.util.GuiHelper; @@ -78,13 +77,4 @@ throw new IOException(tr("File ''{0}'' does not exist.", file.getName()), e); } - } - - /** - * Imports OSM data from stream - * @param in input stream - * @param associatedFile filename of data - */ - protected void importData(InputStream in, final File associatedFile) throws IllegalDataException { - importData(in, associatedFile, NullProgressMonitor.INSTANCE); } Index: /trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java (revision 8855) @@ -44,5 +44,4 @@ private final Collection failed = new LinkedList<>(); private final Collection downloaded = new LinkedList<>(); - //private Exception lastException; private boolean canceled; private HttpURLConnection downloadConnection; Index: /trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java (revision 8855) @@ -75,5 +75,5 @@ interrupt(); while (result == Result.WAITING) { - sleep(10); /* yield(); */ + sleep(10); } if (result == Result.FAILED) @@ -315,5 +315,4 @@ long bytesToSkip = (long) (calibratedOffset /* seconds (double) */ * bytesPerSecond); // skip doesn't seem to want to skip big chunks, so reduce it to smaller ones - // audioInputStream.skip(bytesToSkip); while (bytesToSkip > chunk) { nBytesRead = audioInputStream.skip(chunk); Index: /trunk/src/org/openstreetmap/josm/tools/Geometry.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/Geometry.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/tools/Geometry.java (revision 8855) @@ -344,5 +344,4 @@ double a1 = p2.getY() - p1.getY(); double b1 = p1.getX() - p2.getX(); - // double c1 = 0; double a2 = p4.getY() - p3.getY(); Index: /trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java (revision 8855) @@ -140,8 +140,4 @@ */ public static String getDisplayName(Locale locale) { - /*String full = locale.toString(); - if ("ca__valencia".equals(full)) - return t_r_c("language", "Valencian");*/ - return locale.getDisplayName(); } Index: /trunk/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/tools/OverpassTurboQueryWizard.java (revision 8855) @@ -48,5 +48,4 @@ try (final Reader reader = new InputStreamReader( getClass().getResourceAsStream("/data/overpass-turbo-ffs.js"), StandardCharsets.UTF_8)) { - //engine.eval("var turbo = {ffs: {noPresets: true}};"); engine.eval("var console = {log: function(){}};"); engine.eval(reader); Index: /trunk/src/org/openstreetmap/josm/tools/Utils.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/Utils.java (revision 8854) +++ /trunk/src/org/openstreetmap/josm/tools/Utils.java (revision 8855) @@ -1303,5 +1303,4 @@ */ public static ThreadFactory newThreadFactory(final String nameFormat, final int threadPriority) { - final String ignore = String.format(Locale.ENGLISH, nameFormat, 0); // fail fast return new ThreadFactory() { final AtomicLong count = new AtomicLong(0); Index: /trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java (revision 8854) +++ /trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java (revision 8855) @@ -49,5 +49,5 @@ Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); WMTSTileSource testSource = new WMTSTileSource(testImageryPSEUDO_MERCATOR); - testSource.initProjection(); + testSource.initProjection(Main.getProjection()); verifyMercatorTile(testSource, 0, 0, 1); @@ -80,5 +80,5 @@ Main.setProjection(Projections.getProjectionByCode("EPSG:31370")); WMTSTileSource testSource = new WMTSTileSource(testImageryWALLONIE); - testSource.initProjection(); + testSource.initProjection(Main.getProjection()); assertEquals("http://geoservices.wallonie.be/arcgis/rest/services/DONNEES_BASE/FOND_PLAN_ANNOTATIONS_2012_RW_NB/" @@ -99,5 +99,5 @@ Main.setProjection(Projections.getProjectionByCode("EPSG:31370")); WMTSTileSource testSource = new WMTSTileSource(getImagery("test/data/wmts/WMTSCapabilities-Wallonie-nomatrixdimension.xml")); - testSource.initProjection(); + testSource.initProjection(Main.getProjection()); Bounds wallonieBounds = new Bounds( @@ -123,5 +123,5 @@ Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); WMTSTileSource testSource = new WMTSTileSource(testImageryWIEN); - testSource.initProjection(); + testSource.initProjection(Main.getProjection()); int zoomOffset = 9; @@ -165,5 +165,5 @@ Main.setProjection(Projections.getProjectionByCode("EPSG:4326")); WMTSTileSource testSource = new WMTSTileSource(testImageryTOPO_PL); - testSource.initProjection(); + testSource.initProjection(Main.getProjection()); verifyTile(new LatLon(56, 12), testSource, 0, 0, 1); verifyTile(new LatLon(56, 12), testSource, 0, 0, 2); @@ -187,5 +187,5 @@ Main.setProjection(Projections.getProjectionByCode("EPSG:4326")); WMTSTileSource testSource = new WMTSTileSource(testImageryORTO_PL); - testSource.initProjection(); + testSource.initProjection(Main.getProjection()); verifyTile(new LatLon(53.5993712684958, 19.560669777688176), testSource, 12412, 3941, 14); verifyTile(new LatLon(49.783096954497786, 22.79034127751704), testSource, 17714, 10206, 14); @@ -196,5 +196,5 @@ Main.setProjection(Projections.getProjectionByCode("EPSG:2180")); WMTSTileSource testSource = new WMTSTileSource(testImageryORTO_PL); - testSource.initProjection(); + testSource.initProjection(Main.getProjection()); verifyTile(new LatLon(53.59940948387726, 19.560544913270064), testSource, 6453, 3140, 14); @@ -207,5 +207,5 @@ Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); WMTSTileSource testSource = new WMTSTileSource(testImageryOntario); - testSource.initProjection(); + testSource.initProjection(Main.getProjection()); verifyTile(new LatLon(45.4105023, -75.7153702), testSource, 303751, 375502, 12); verifyTile(new LatLon(45.4601306, -75.7617187), testSource, 1186, 1466, 4);