Index: /trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (revision 10762) +++ /trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (revision 10763) @@ -388,5 +388,5 @@ * @return true if all ways can be joined into a polygon */ - protected static boolean checkWaysArePolygon(Collection ways) { + private static boolean checkWaysArePolygon(Collection ways) { // For each way, nodes strictly between first and last should't be reference by an other way for (Way way: ways) { Index: /trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java (revision 10762) +++ /trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java (revision 10763) @@ -109,13 +109,11 @@ /** - * Fetch the user info from the server. This is necessary if we don't know - * the users id yet + * Fetch the user info from the server. This is necessary if we don't know the users id yet * * @return the user info * @throws OsmTransferException in case of any communication exception */ - protected UserInfo fetchUserInfo() throws OsmTransferException { - OsmServerUserInfoReader reader = new OsmServerUserInfoReader(); - return reader.fetchUserInfo(getProgressMonitor().createSubTaskMonitor(1, false)); + private UserInfo fetchUserInfo() throws OsmTransferException { + return new OsmServerUserInfoReader().fetchUserInfo(getProgressMonitor().createSubTaskMonitor(1, false)); } Index: /trunk/src/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrector.java =================================================================== --- /trunk/src/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrector.java (revision 10762) +++ /trunk/src/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrector.java (revision 10763) @@ -75,5 +75,5 @@ } - protected static boolean confirmReverseWay(Way way, TagCollection tags) { + private static boolean confirmReverseWay(Way way, TagCollection tags) { String msg = trn( // Singular, if a single tag is impacted Index: /trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java (revision 10762) +++ /trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java (revision 10763) @@ -68,5 +68,5 @@ } - protected void fireChangesetCacheEvent(final ChangesetCacheEvent e) { + private void fireChangesetCacheEvent(final ChangesetCacheEvent e) { GuiHelper.runInEDT(() -> { for (ChangesetCacheListener l: listeners) { @@ -76,5 +76,5 @@ } - protected void update(Changeset cs, DefaultChangesetCacheEvent e) { + private void update(Changeset cs, DefaultChangesetCacheEvent e) { if (cs == null) return; if (cs.isNew()) return; @@ -123,5 +123,5 @@ } - protected void remove(int id, DefaultChangesetCacheEvent e) { + private void remove(int id, DefaultChangesetCacheEvent e) { if (id <= 0) return; Changeset cs = cache.get(id); Index: /trunk/src/org/openstreetmap/josm/data/osm/Node.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/Node.java (revision 10762) +++ /trunk/src/org/openstreetmap/josm/data/osm/Node.java (revision 10763) @@ -112,5 +112,5 @@ * @param eastNorth east/north */ - protected void setCoorInternal(LatLon coor, EastNorth eastNorth) { + void setCoorInternal(LatLon coor, EastNorth eastNorth) { if (coor != null) { this.lat = coor.lat(); Index: /trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java (revision 10762) +++ /trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java (revision 10763) @@ -684,5 +684,5 @@ } - protected Point getTopLeftCoordinates() { + private Point getTopLeftCoordinates() { return new Point(center.x - (getWidth() / 2), center.y - (getHeight() / 2)); } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (revision 10762) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (revision 10763) @@ -483,5 +483,5 @@ } - protected static void launchChangesetManager(Collection toSelect) { + private static void launchChangesetManager(Collection toSelect) { ChangesetCacheManager cm = ChangesetCacheManager.getInstance(); if (cm.isVisible()) { Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (revision 10762) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (revision 10763) @@ -116,5 +116,5 @@ * builds the GUI */ - protected void build() { + private void build() { model = new ConflictListModel(); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 10762) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 10763) @@ -686,5 +686,5 @@ * @see LayerListModelListener#makeVisible(int, Layer) */ - protected void fireMakeVisible(int index, Layer layer) { + private void fireMakeVisible(int index, Layer layer) { for (LayerListModelListener listener : listeners) { listener.makeVisible(index, layer); @@ -697,5 +697,5 @@ * @see LayerListModelListener#refresh() */ - protected void fireRefresh() { + private void fireRefresh() { for (LayerListModelListener listener : listeners) { listener.refresh(); @@ -892,5 +892,5 @@ * Make sure the first of the selected layers is visible in the views of this model. */ - protected void ensureSelectedIsVisible() { + private void ensureSelectedIsVisible() { int index = selectionModel.getMinSelectionIndex(); if (index < 0) @@ -941,5 +941,5 @@ * */ - protected void ensureActiveSelected() { + private void ensureActiveSelected() { List layers = getLayers(); if (layers.isEmpty()) @@ -963,18 +963,6 @@ * @return the active layer. null, if no active layer is available */ - protected Layer getActiveLayer() { + private Layer getActiveLayer() { return getLayerManager().getActiveLayer(); - } - - /** - * Replies the scale layer. null, if no active layer is available. - * - * @return the scale layer. null, if no active layer is available - * @deprecated Deprecated since it is unused in JOSM and does not really belong here. Can be removed soon (August 2016). - * You can directly query MapView. - */ - @Deprecated - protected NativeScaleLayer getNativeScaleLayer() { - return Main.isDisplayingMapView() ? Main.map.mapView.getNativeScaleLayer() : null; } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java (revision 10762) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java (revision 10763) @@ -83,5 +83,5 @@ } - protected void setVisibleFlag(boolean visible) { + void setVisibleFlag(boolean visible) { for (Layer l : model.getSelectedLayers()) { l.setVisible(visible); @@ -102,5 +102,5 @@ } - protected void updateValues() { + void updateValues() { List layers = model.getSelectedLayers(); Index: /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java (revision 10762) +++ /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java (revision 10763) @@ -68,5 +68,5 @@ } - protected void show(long id, HistoryBrowserDialog dialog) { + private void show(long id, HistoryBrowserDialog dialog) { if (dialogs.values().contains(dialog)) { show(id); @@ -78,5 +78,5 @@ } - protected void show(long id) { + private void show(long id) { if (dialogs.keySet().contains(id)) { dialogs.get(id).toFront(); @@ -84,5 +84,5 @@ } - protected boolean hasDialogWithCloseUpperLeftCorner(Point p) { + private boolean hasDialogWithCloseUpperLeftCorner(Point p) { for (HistoryBrowserDialog dialog: dialogs.values()) { Point corner = dialog.getLocation(); @@ -94,5 +94,5 @@ } - protected void placeOnScreen(HistoryBrowserDialog dialog) { + private void placeOnScreen(HistoryBrowserDialog dialog) { WindowGeometry geometry = new WindowGeometry(WINDOW_GEOMETRY_PREF, WindowGeometry.centerOnScreen(new Dimension(850, 500))); geometry.applySafe(dialog); Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 10762) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 10763) @@ -171,5 +171,5 @@ } - protected void rememberError(String message) { + private void rememberError(String message) { this.errorMessages.add(message); } @@ -261,5 +261,5 @@ } - protected String formatErrorMessages() { + private String formatErrorMessages() { StringBuilder sb = new StringBuilder(); sb.append(""); Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (revision 10762) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (revision 10763) @@ -84,5 +84,5 @@ } - protected void build() { + private void build() { JPanel content = new JPanel(new BorderLayout()); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 10762) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 10763) @@ -209,5 +209,5 @@ } - protected void buildPanel() { + private void buildPanel() { setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); add(new JLabel(preferenceSetting.getTitle()), GBC.eol().insets(0, 5, 0, 10).anchor(GBC.NORTHWEST)); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AbstractTableListEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AbstractTableListEditor.java (revision 10762) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AbstractTableListEditor.java (revision 10763) @@ -86,5 +86,5 @@ } - protected void updateEnabledState() { + private void updateEnabledState() { setEnabled(entryList.getSelectedIndices().length == 1); } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java (revision 10762) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java (revision 10763) @@ -160,5 +160,5 @@ } - protected JPanel buildSearchFieldPanel() { + private JPanel buildSearchFieldPanel() { JPanel pnl = new JPanel(new GridBagLayout()); pnl.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); @@ -181,5 +181,5 @@ } - protected JPanel buildActionPanel() { + private JPanel buildActionPanel() { JPanel pnl = new JPanel(new GridLayout(1, 3)); @@ -190,5 +190,5 @@ } - protected JPanel buildPluginListPanel() { + private JPanel buildPluginListPanel() { JPanel pnl = new JPanel(new BorderLayout()); pnl.add(buildSearchFieldPanel(), BorderLayout.NORTH); @@ -215,5 +215,5 @@ } - protected JTabbedPane buildContentPane() { + private JTabbedPane buildContentPane() { JTabbedPane pane = getTabPane(); pnlPluginUpdatePolicy = new PluginUpdatePolicyPanel(); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/server/ServerAccessPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/server/ServerAccessPreference.java (revision 10762) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/server/ServerAccessPreference.java (revision 10763) @@ -47,5 +47,5 @@ * @return panel with server preferences tabs */ - protected JPanel buildTabbedServerPreferences() { + private JPanel buildTabbedServerPreferences() { JPanel pnl = new JPanel(new BorderLayout()); pnl.add(getTabPane(), BorderLayout.CENTER); @@ -58,5 +58,5 @@ * @return preferences panel for server settings */ - protected JPanel buildContentPanel() { + private JPanel buildContentPanel() { JPanel pnl = new JPanel(new GridBagLayout()); GridBagConstraints gc = new GridBagConstraints(); Index: /trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java (revision 10762) +++ /trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java (revision 10763) @@ -169,5 +169,5 @@ } - protected void setPropertyText(String propertyText) { + private void setPropertyText(String propertyText) { this.propertyText = propertyText; } Index: /trunk/src/org/openstreetmap/josm/tools/TextTagParser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/TextTagParser.java (revision 10762) +++ /trunk/src/org/openstreetmap/josm/tools/TextTagParser.java (revision 10763) @@ -151,5 +151,5 @@ } - protected static String unescape(String k) { + static String unescape(String k) { if (!(k.startsWith("\"") && k.endsWith("\""))) { if (k.contains("=")) {