Index: trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (revision 8285) @@ -58,8 +58,8 @@ public static class PolarCoor { - double radius; - double angle; - EastNorth origin = new EastNorth(0, 0); - double azimuth = 0; + private double radius; + private double angle; + private EastNorth origin = new EastNorth(0, 0); + private double azimuth = 0; PolarCoor(double radius, double angle) { Index: trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java (revision 8285) @@ -98,6 +98,6 @@ */ private static class PolarNode { - double a; - Node node; + private double a; + private Node node; PolarNode(EastNorth center, Node n) { Index: trunk/src/org/openstreetmap/josm/actions/PurgeAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/PurgeAction.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/actions/PurgeAction.java (revision 8285) @@ -70,5 +70,5 @@ protected OsmDataLayer layer; - JCheckBox cbClearUndoRedo; + protected JCheckBox cbClearUndoRedo; protected Set toPurge; Index: trunk/src/org/openstreetmap/josm/actions/SelectNonBranchingWaySequences.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/SelectNonBranchingWaySequences.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/actions/SelectNonBranchingWaySequences.java (revision 8285) @@ -21,9 +21,9 @@ * outer endpoints of selected ways */ - Set outerNodes; + private Set outerNodes; /** * endpoints of selected ways */ - Set nodes; + private Set nodes; /** Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmCompressedTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmCompressedTask.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmCompressedTask.java (revision 8285) @@ -2,7 +2,7 @@ package org.openstreetmap.josm.actions.downloadtasks; +import static org.openstreetmap.josm.tools.I18n.tr; + import java.util.concurrent.Future; - -import static org.openstreetmap.josm.tools.I18n.tr; import org.openstreetmap.josm.Main; @@ -19,5 +19,5 @@ public class DownloadOsmCompressedTask extends DownloadOsmTask { - static final String PATTERN_COMPRESS = "https?://.*/.*\\.osm.(gz|bz2?|zip)"; + private static final String PATTERN_COMPRESS = "https?://.*/.*\\.osm.(gz|bz2?|zip)"; @Override @@ -30,5 +30,5 @@ return tr("Download Compressed OSM"); } - + @Override public Future download(boolean newLayer, Bounds downloadArea, @@ -36,5 +36,5 @@ return null; } - + /** * Loads a given URL Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (revision 8285) @@ -82,7 +82,7 @@ private static class DeleteParameters { - DeleteMode mode; - Node nearestNode; - WaySegment nearestSegment; + private DeleteMode mode; + private Node nearestNode; + private WaySegment nearestSegment; } Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 8285) @@ -1286,5 +1286,5 @@ private class SnapHelper { - boolean snapOn; // snapping is turned on + private boolean snapOn; // snapping is turned on private boolean active; // snapping is active for current mouse position @@ -1298,22 +1298,22 @@ private boolean snapToProjections; - EastNorth dir2; - EastNorth projected; - String labelText; - double lastAngle; - - double customBaseHeading=-1; // angle of base line, if not last segment) + private EastNorth dir2; + private EastNorth projected; + private String labelText; + private double lastAngle; + + private double customBaseHeading=-1; // angle of base line, if not last segment) private EastNorth segmentPoint1; // remembered first point of base segment private EastNorth segmentPoint2; // remembered second point of base segment private EastNorth projectionSource; // point that we are projecting to the line - double[] snapAngles; - double snapAngleTolerance; - - double pe,pn; // (pe,pn) - direction of snapping line - double e0,n0; // (e0,n0) - origin of snapping line - - final String fixFmt="%d "+tr("FIX"); - Color snapHelperColor; + private double[] snapAngles; + private double snapAngleTolerance; + + private double pe,pn; // (pe,pn) - direction of snapping line + private double e0,n0; // (e0,n0) - origin of snapping line + + private final String fixFmt="%d "+tr("FIX"); + private Color snapHelperColor; private Color highlightColor; @@ -1322,5 +1322,5 @@ private Stroke highlightStroke; - JCheckBoxMenuItem checkBox; + private JCheckBoxMenuItem checkBox; public final Color ORANGE_TRANSPARENT = new Color(Color.ORANGE.getRed(),Color.ORANGE.getGreen(),Color.ORANGE.getBlue(),128); @@ -1672,6 +1672,7 @@ } - MouseListener anglePopupListener = new PopupMenuLauncher( new JPopupMenu() { - JCheckBoxMenuItem repeatedCb = new JCheckBoxMenuItem(new AbstractAction(tr("Toggle snapping by {0}", getShortcut().getKeyText())){ + private MouseListener anglePopupListener = new PopupMenuLauncher(new JPopupMenu() { + private JCheckBoxMenuItem repeatedCb = new JCheckBoxMenuItem( + new AbstractAction(tr("Toggle snapping by {0}", getShortcut().getKeyText())) { @Override public void actionPerformed(ActionEvent e) { boolean sel=((JCheckBoxMenuItem) e.getSource()).getState(); @@ -1680,5 +1681,6 @@ } }); - JCheckBoxMenuItem helperCb = new JCheckBoxMenuItem(new AbstractAction(tr("Show helper geometry")){ + private JCheckBoxMenuItem helperCb = new JCheckBoxMenuItem( + new AbstractAction(tr("Show helper geometry")) { @Override public void actionPerformed(ActionEvent e) { boolean sel=((JCheckBoxMenuItem) e.getSource()).getState(); @@ -1690,5 +1692,6 @@ } }); - JCheckBoxMenuItem projectionCb = new JCheckBoxMenuItem(new AbstractAction(tr("Snap to node projections")){ + private JCheckBoxMenuItem projectionCb = new JCheckBoxMenuItem( + new AbstractAction(tr("Snap to node projections")) { @Override public void actionPerformed(ActionEvent e) { boolean sel=((JCheckBoxMenuItem) e.getSource()).getState(); Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java (revision 8285) @@ -21,7 +21,7 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.data.Bounds; -import org.openstreetmap.josm.data.SystemOfMeasurement; import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent; import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener; +import org.openstreetmap.josm.data.SystemOfMeasurement; import org.openstreetmap.josm.data.coor.EastNorth; import org.openstreetmap.josm.data.osm.Node; @@ -124,8 +124,12 @@ private EastNorth helperLineEnd; - Stroke helpLineStroke; - Stroke refLineStroke; - Color mainColor; - + private Stroke helpLineStroke; + private Stroke refLineStroke; + private Color mainColor; + + /** + * Constructs a new {@code ParallelWayAction}. + * @param mapFrame Map frame + */ public ParallelWayAction(MapFrame mapFrame) { super(tr("Parallel"), "parallel", tr("Make parallel copies of ways"), @@ -303,6 +307,6 @@ // Since the created way is left selected, we need to unselect again here - if (pWays != null && pWays.ways != null) { - getCurrentDataSet().clearSelection(pWays.ways); + if (pWays != null && pWays.getWays() != null) { + getCurrentDataSet().clearSelection(pWays.getWays()); pWays = null; } @@ -545,5 +549,5 @@ pWays = new ParallelWays(sourceWays, copyTags, referenceWayIndex); pWays.commit(); - getCurrentDataSet().setSelected(pWays.ways); + getCurrentDataSet().setSelected(pWays.getWays()); return true; } catch (IllegalArgumentException e) { Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java (revision 8285) @@ -26,5 +26,5 @@ */ public class ParallelWays { - final List ways; + private final List ways; private final List sortedNodes; @@ -195,3 +195,7 @@ } } + + public final List getWays() { + return ways; + } } Index: trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 8285) @@ -137,5 +137,5 @@ * point where user pressed the mouse to start movement */ - EastNorth startEN; + private EastNorth startEN; /** * The last known position of the mouse. @@ -215,6 +215,4 @@ removeHighlighting(); } - - int previousModifiers; @Override @@ -949,6 +947,6 @@ } - CycleManager cycleManager = new CycleManager(); - VirtualManager virtualManager = new VirtualManager(); + private CycleManager cycleManager = new CycleManager(); + private VirtualManager virtualManager = new VirtualManager(); private class CycleManager { Index: trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 8285) @@ -9,5 +9,4 @@ import java.awt.Dimension; import java.awt.FlowLayout; -import java.awt.Font; import java.awt.GridBagLayout; import java.awt.event.ActionEvent; @@ -154,5 +153,5 @@ private static class DescriptionTextBuilder { - StringBuilder s = new StringBuilder(4096); + private final StringBuilder s = new StringBuilder(4096); public StringBuilder append(String string) { Index: trunk/src/org/openstreetmap/josm/actions/upload/FixDataHook.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/upload/FixDataHook.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/actions/upload/FixDataHook.java (revision 8285) @@ -107,7 +107,7 @@ public static class FixDataKey implements FixData { /** key of wrong data */ - String oldKey; + private String oldKey; /** key of correct data */ - String newKey; + private String newKey; /** @@ -141,11 +141,11 @@ public static class FixDataTag implements FixData { /** key of wrong data */ - String oldKey; + private String oldKey; /** value of wrong data */ - String oldValue; + private String oldValue; /** key of correct data */ - String newKey; + private String newKey; /** value of correct data */ - String newValue; + private String newValue; /** Index: trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java (revision 8285) @@ -42,6 +42,6 @@ private boolean isCanceled = false; - Map updatedNotes = new HashMap<>(); - Map failedNotes = new HashMap<>(); + private Map updatedNotes = new HashMap<>(); + private Map failedNotes = new HashMap<>(); /** Index: trunk/src/org/openstreetmap/josm/command/Command.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/Command.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/command/Command.java (revision 8285) @@ -60,7 +60,7 @@ public static class OldNodeState { - final LatLon latlon; - final EastNorth eastNorth; // cached EastNorth to be used for applying exact displacement - final boolean modified; + private final LatLon latlon; + private final EastNorth eastNorth; // cached EastNorth to be used for applying exact displacement + private final boolean modified; /** @@ -72,4 +72,31 @@ eastNorth = node.getEastNorth(); modified = node.isModified(); + } + + /** + * Returns old lat/lon. + * @return old lat/lon + * @see Node#getCoor() + */ + public final LatLon getLatlon() { + return latlon; + } + + /** + * Returns old east/north. + * @return old east/north + * @see Node#getEastNorth() + */ + public final EastNorth getEastNorth() { + return eastNorth; + } + + /** + * Returns old modified state. + * @return old modified state + * @see Node #isModified() + */ + public final boolean isModified() { + return modified; } } Index: trunk/src/org/openstreetmap/josm/command/MoveCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/MoveCommand.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/command/MoveCommand.java (revision 8285) @@ -171,6 +171,6 @@ for (Node n : nodes) { OldNodeState os = it.next(); - if (os.eastNorth != null) { - n.setEastNorth(os.eastNorth.add(x, y)); + if (os.getEastNorth() != null) { + n.setEastNorth(os.getEastNorth().add(x, y)); } } @@ -197,6 +197,6 @@ for (Node n : nodes) { OldNodeState os = it.next(); - n.setCoor(os.latlon); - n.setModified(os.modified); + n.setCoor(os.getLatlon()); + n.setModified(os.isModified()); } } Index: trunk/src/org/openstreetmap/josm/command/RotateCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/RotateCommand.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/command/RotateCommand.java (revision 8285) @@ -76,5 +76,5 @@ double cosPhi = Math.cos(rotationAngle); double sinPhi = Math.sin(rotationAngle); - EastNorth oldEastNorth = oldStates.get(n).eastNorth; + EastNorth oldEastNorth = oldStates.get(n).getEastNorth(); double x = oldEastNorth.east() - pivot.east(); double y = oldEastNorth.north() - pivot.north(); Index: trunk/src/org/openstreetmap/josm/command/ScaleCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/ScaleCommand.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/command/ScaleCommand.java (revision 8285) @@ -26,7 +26,6 @@ /** * World position of the mouse when the user started the command. - * */ - EastNorth startEN = null; + private EastNorth startEN = null; /** @@ -69,5 +68,5 @@ protected void transformNodes() { for (Node n : nodes) { - EastNorth oldEastNorth = oldStates.get(n).eastNorth; + EastNorth oldEastNorth = oldStates.get(n).getEastNorth(); double dx = oldEastNorth.east() - pivot.east(); double dy = oldEastNorth.north() - pivot.north(); Index: trunk/src/org/openstreetmap/josm/command/TransformNodesCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/TransformNodesCommand.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/command/TransformNodesCommand.java (revision 8285) @@ -94,6 +94,6 @@ for (Node n : nodes) { OldNodeState os = oldStates.get(n); - n.setCoor(os.latlon); - n.setModified(os.modified); + n.setCoor(os.getLatlon()); + n.setModified(os.isModified()); } } Index: trunk/src/org/openstreetmap/josm/data/AutosaveTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/AutosaveTask.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/data/AutosaveTask.java (revision 8285) @@ -72,8 +72,8 @@ private static class AutosaveLayerInfo { - OsmDataLayer layer; - String layerName; - String layerFileName; - final Deque backupFiles = new LinkedList<>(); + private OsmDataLayer layer; + private String layerName; + private String layerFileName; + private final Deque backupFiles = new LinkedList<>(); } Index: trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java (revision 8285) @@ -415,11 +415,10 @@ public static class XMLCommandProcessor { - Preferences mainPrefs; - Map tasksMap = new HashMap<>(); + private Preferences mainPrefs; + private Map tasksMap = new HashMap<>(); private boolean lastV; // last If condition result - - ScriptEngine engine ; + private ScriptEngine engine; public void openAndReadXML(File file) { Index: trunk/src/org/openstreetmap/josm/data/imagery/WmsCache.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/imagery/WmsCache.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/data/imagery/WmsCache.java (revision 8285) @@ -57,12 +57,12 @@ private static class CacheEntry { - final double pixelPerDegree; - final double east; - final double north; - final ProjectionBounds bounds; - final String filename; - - long lastUsed; - long lastModified; + private final double pixelPerDegree; + private final double east; + private final double north; + private final ProjectionBounds bounds; + private final String filename; + + private long lastUsed; + private long lastModified; CacheEntry(double pixelPerDegree, double east, double north, int tileSize, String filename) { @@ -83,7 +83,7 @@ private static class ProjectionEntries { - final String projection; - final String cacheDirectory; - final List entries = new ArrayList<>(); + private final String projection; + private final String cacheDirectory; + private final List entries = new ArrayList<>(); ProjectionEntries(String projection, String cacheDirectory) { Index: trunk/src/org/openstreetmap/josm/data/osm/FilterMatcher.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/FilterMatcher.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/data/osm/FilterMatcher.java (revision 8285) @@ -73,7 +73,7 @@ private static class FilterInfo { - final Match match; - final boolean isDelete; - final boolean isInverted; + private final Match match; + private final boolean isDelete; + private final boolean isInverted; FilterInfo(Filter filter) throws ParseError { Index: trunk/src/org/openstreetmap/josm/data/osm/OsmUtils.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/OsmUtils.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/data/osm/OsmUtils.java (revision 8285) @@ -18,9 +18,9 @@ } - static final List TRUE_VALUES = new ArrayList<>(Arrays + private static final List TRUE_VALUES = new ArrayList<>(Arrays .asList(new String[] { "true", "yes", "1", "on" })); - static final List FALSE_VALUES = new ArrayList<>(Arrays + private static final List FALSE_VALUES = new ArrayList<>(Arrays .asList(new String[] { "false", "no", "0", "off" })); - static final List REVERSE_VALUES = new ArrayList<>(Arrays + private static final List REVERSE_VALUES = new ArrayList<>(Arrays .asList(new String[] { "reverse", "-1" })); Index: trunk/src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java (revision 8285) @@ -56,5 +56,5 @@ new AbstractVisitor() { - boolean firstIteration; + private boolean firstIteration; @Override Index: trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java (revision 8285) @@ -496,7 +496,7 @@ class QuadBucketIterator implements Iterator { - QBLevel current_node; - int content_index; - int iterated_over; + private QBLevel current_node; + private int content_index; + private int iterated_over; final QBLevel next_content_node(QBLevel q) { Index: trunk/src/org/openstreetmap/josm/data/osm/Storage.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/Storage.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/data/osm/Storage.java (revision 8285) @@ -374,5 +374,5 @@ private final class FMap implements Map { - Hash fHash; + private Hash fHash; private FMap(Hash h) { @@ -457,6 +457,6 @@ private final class SafeReadonlyIter implements Iterator { - final T[] data; - int slot = 0; + private final T[] data; + private int slot = 0; SafeReadonlyIter(T[] data) { @@ -491,6 +491,6 @@ private final class Iter implements Iterator { private final int mods; - int slot = 0; - int removeSlot = -1; + private int slot = 0; + private int removeSlot = -1; Iter() { Index: trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java (revision 8285) @@ -45,6 +45,6 @@ private static class ListenerInfo { - final DataSetListener listener; - final boolean consolidate; + private final DataSetListener listener; + private final boolean consolidate; public ListenerInfo(DataSetListener listener, boolean consolidate) { Index: trunk/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java (revision 8285) @@ -27,5 +27,5 @@ private static class ListenerInfo { - final SelectionChangedListener listener; + private final SelectionChangedListener listener; public ListenerInfo(SelectionChangedListener listener) { Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 8285) @@ -190,7 +190,7 @@ private static class StyleRecord implements Comparable { - final ElemStyle style; - final OsmPrimitive osm; - final int flags; + private final ElemStyle style; + private final OsmPrimitive osm; + private final int flags; public StyleRecord(ElemStyle style, OsmPrimitive osm, int flags) { Index: trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShift.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShift.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShift.java (revision 8285) @@ -45,6 +45,6 @@ private double lonAccuracy; private double latAccuracy; - boolean latAccuracyAvailable; - boolean lonAccuracyAvailable; + private boolean latAccuracyAvailable; + private boolean lonAccuracyAvailable; private String subGridName; Index: trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java (revision 8285) @@ -58,5 +58,4 @@ private float[] lonAccuracy; - boolean bigEndian; private NTV2SubGrid[] subGrid; Index: trunk/src/org/openstreetmap/josm/data/validation/PaintVisitor.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/PaintVisitor.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/data/validation/PaintVisitor.java (revision 8285) @@ -33,5 +33,5 @@ /** Is the error selected ? */ private boolean selected; - + private final Set paintedPoints = new HashSet<>(); private final Set paintedSegments = new HashSet<>(); @@ -55,5 +55,5 @@ this.color = color; } - + @Override public int hashCode() { @@ -64,5 +64,5 @@ return result; } - + @Override public boolean equals(Object obj) { @@ -83,6 +83,6 @@ protected static class PaintedSegment extends PaintedPoint { - final LatLon p2; - + private final LatLon p2; + public PaintedSegment(LatLon p1, LatLon p2, Color color) { super(p1, color); @@ -133,9 +133,9 @@ protected void drawNode(Node n, Color color) { PaintedPoint pp = new PaintedPoint(n.getCoor(), color); - + if (!paintedPoints.contains(pp)) { Point p = mv.getPoint(n); g.setColor(color); - + if (selected) { g.fillOval(p.x - 5, p.y - 5, 10, 10); @@ -156,5 +156,5 @@ protected void drawSegment(Point p1, Point p2, Color color) { g.setColor(color); - + double t = Math.atan2(p2.x - p1.x, p2.y - p1.y); double cosT = 5 * Math.cos(t); @@ -272,5 +272,5 @@ } } - + /** * Clears the internal painted objects collections. Index: trunk/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java (revision 8285) @@ -26,10 +26,10 @@ public class ConditionalKeys extends Test.TagTest { - final OpeningHourTest openingHourTest = new OpeningHourTest(); - static final Set RESTRICTION_TYPES = new HashSet<>(Arrays.asList("oneway", "toll", "noexit", "maxspeed", "minspeed", "maxstay", + private final OpeningHourTest openingHourTest = new OpeningHourTest(); + private static final Set RESTRICTION_TYPES = new HashSet<>(Arrays.asList("oneway", "toll", "noexit", "maxspeed", "minspeed", "maxstay", "maxweight", "maxaxleload", "maxheight", "maxwidth", "maxlength", "overtaking", "maxgcweight", "maxgcweightrating", "fee")); - static final Set RESTRICTION_VALUES = new HashSet<>(Arrays.asList("yes", "official", "designated", "destination", + private static final Set RESTRICTION_VALUES = new HashSet<>(Arrays.asList("yes", "official", "designated", "destination", "delivery", "permissive", "private", "agricultural", "forestry", "no")); - static final Set TRANSPORT_MODES = new HashSet<>(Arrays.asList("access", "foot", "ski", "inline_skates", "ice_skates", + private static final Set TRANSPORT_MODES = new HashSet<>(Arrays.asList("access", "foot", "ski", "inline_skates", "ice_skates", "horse", "vehicle", "bicycle", "carriage", "trailer", "caravan", "motor_vehicle", "motorcycle", "moped", "mofa", "motorcar", "motorhome", "psv", "bus", "taxi", "tourist_bus", "goods", "hgv", "agricultural", "atv", "snowmobile" Index: trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java (revision 8285) @@ -57,10 +57,10 @@ protected static final List ISO_COUNTRIES = Arrays.asList(Locale.getISOCountries()); - boolean leftByPedestrians = false; - boolean leftByCyclists = false; - boolean leftByCars = false; - int pedestrianWays = 0; - int cyclistWays = 0; - int carsWays = 0; + private boolean leftByPedestrians = false; + private boolean leftByCyclists = false; + private boolean leftByCars = false; + private int pedestrianWays = 0; + private int cyclistWays = 0; + private int carsWays = 0; /** Index: trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (revision 8285) @@ -242,5 +242,5 @@ } - static final String POSSIBLE_THROWS = possibleThrows(); + private static final String POSSIBLE_THROWS = possibleThrows(); static final String possibleThrows() { Index: trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java (revision 8285) @@ -78,5 +78,5 @@ static enum CheckMode { TIME_RANGE(0), POINTS_IN_TIME(1), BOTH(2); - final int code; + private final int code; CheckMode(int code) { @@ -108,6 +108,7 @@ */ public class OpeningHoursTestError { - final Severity severity; - final String message, prettifiedValue; + private final Severity severity; + private final String message; + private final String prettifiedValue; /** Index: trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (revision 8285) @@ -130,5 +130,5 @@ protected static final Entities entities = new Entities(); - static final List DEFAULT_SOURCES = Arrays.asList(DATA_FILE, IGNORE_FILE, SPELL_FILE); + private static final List DEFAULT_SOURCES = Arrays.asList(DATA_FILE, IGNORE_FILE, SPELL_FILE); /** Index: trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java (revision 8285) @@ -293,7 +293,7 @@ private final double len; private Set nearbyNodeCache; - double nearbyNodeCacheDist = -1.0; - final Node n1; - final Node n2; + private double nearbyNodeCacheDist = -1.0; + private final Node n1; + private final Node n2; public MyWaySegment(Way w, Node n1, Node n2) { Index: trunk/src/org/openstreetmap/josm/data/validation/util/AggregatePrimitivesVisitor.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/util/AggregatePrimitivesVisitor.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/data/validation/util/AggregatePrimitivesVisitor.java (revision 8285) @@ -21,5 +21,5 @@ public class AggregatePrimitivesVisitor extends AbstractVisitor { /** Aggregated data */ - final Collection aggregatedData = new HashSet<>(); + private final Collection aggregatedData = new HashSet<>(); /** Index: trunk/src/org/openstreetmap/josm/gui/MapFrame.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MapFrame.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/MapFrame.java (revision 8285) @@ -447,6 +447,6 @@ */ sideToolBar.setComponentPopupMenu(new JPopupMenu() { - static final int staticMenuEntryCount = 2; - JCheckBoxMenuItem doNotHide = new JCheckBoxMenuItem(new AbstractAction(tr("Do not hide toolbar")) { + private static final int staticMenuEntryCount = 2; + private JCheckBoxMenuItem doNotHide = new JCheckBoxMenuItem(new AbstractAction(tr("Do not hide toolbar")) { @Override public void actionPerformed(ActionEvent e) { Index: trunk/src/org/openstreetmap/josm/gui/MapSlider.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MapSlider.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/MapSlider.java (revision 8285) @@ -17,5 +17,5 @@ private final MapView mv; - boolean preventChange = false; + private boolean preventChange = false; public MapSlider(MapView mv) { Index: trunk/src/org/openstreetmap/josm/gui/MapStatus.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 8285) @@ -175,12 +175,12 @@ } - final ImageLabel latText = new ImageLabel("lat", tr("The geographic latitude at the mouse pointer."), 11, PROP_BACKGROUND_COLOR.get()); - final ImageLabel lonText = new ImageLabel("lon", tr("The geographic longitude at the mouse pointer."), 11, PROP_BACKGROUND_COLOR.get()); - final ImageLabel headingText = new ImageLabel("heading", tr("The (compass) heading of the line segment being drawn."), 6, PROP_BACKGROUND_COLOR.get()); - final ImageLabel angleText = new ImageLabel("angle", tr("The angle between the previous and the current way segment."), 6, PROP_BACKGROUND_COLOR.get()); - final ImageLabel distText = new ImageLabel("dist", tr("The length of the new way segment being drawn."), 10, PROP_BACKGROUND_COLOR.get()); - final ImageLabel nameText = new ImageLabel("name", tr("The name of the object at the mouse pointer."), 20, PROP_BACKGROUND_COLOR.get()); - final JosmTextField helpText = new JosmTextField(); - final JProgressBar progressBar = new JProgressBar(); + private final ImageLabel latText = new ImageLabel("lat", tr("The geographic latitude at the mouse pointer."), 11, PROP_BACKGROUND_COLOR.get()); + private final ImageLabel lonText = new ImageLabel("lon", tr("The geographic longitude at the mouse pointer."), 11, PROP_BACKGROUND_COLOR.get()); + private final ImageLabel headingText = new ImageLabel("heading", tr("The (compass) heading of the line segment being drawn."), 6, PROP_BACKGROUND_COLOR.get()); + private final ImageLabel angleText = new ImageLabel("angle", tr("The angle between the previous and the current way segment."), 6, PROP_BACKGROUND_COLOR.get()); + private final ImageLabel distText = new ImageLabel("dist", tr("The length of the new way segment being drawn."), 10, PROP_BACKGROUND_COLOR.get()); + private final ImageLabel nameText = new ImageLabel("name", tr("The name of the object at the mouse pointer."), 20, PROP_BACKGROUND_COLOR.get()); + private final JosmTextField helpText = new JosmTextField(); + private final JProgressBar progressBar = new JProgressBar(); public final BackgroundProgressMonitor progressMonitor = new BackgroundProgressMonitor(); @@ -202,6 +202,6 @@ private static class StatusTextHistory { - final Object id; - final String text; + private final Object id; + private final String text; public StatusTextHistory(Object id, String text) { @@ -643,11 +643,11 @@ */ static class MouseState { - Point mousePos; - int modifiers; + private Point mousePos; + private int modifiers; } /** * The last sent mouse movement event. */ - MouseState mouseState = new MouseState(); + private MouseState mouseState = new MouseState(); private AWTEventListener awtListener = new AWTEventListener() { Index: trunk/src/org/openstreetmap/josm/gui/MenuScroller.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MenuScroller.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/MenuScroller.java (revision 8285) @@ -471,6 +471,6 @@ UP(9, 1, 9), DOWN(1, 9, 1); - static final int[] XPOINTS = {1, 5, 9}; - final int[] yPoints; + private static final int[] XPOINTS = {1, 5, 9}; + private final int[] yPoints; MenuIcon(int... yPoints) { Index: trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (revision 8285) @@ -612,6 +612,6 @@ private class ZoomData { - final LatLon center; - final double scale; + private final LatLon center; + private final double scale; public ZoomData(EastNorth center, double scale) { @@ -1457,6 +1457,6 @@ private static class CursorInfo { - final Cursor cursor; - final Object object; + private final Cursor cursor; + private final Object object; public CursorInfo(Cursor c, Object o) { cursor = c; Index: trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java (revision 8285) @@ -52,5 +52,5 @@ */ public static class TMSTileSourceProvider implements TileSourceProvider { - static final Set existingSlippyMapUrls = new HashSet<>(); + private static final Set existingSlippyMapUrls = new HashSet<>(); static { // Urls that already exist in the slippymap chooser and shouldn't be copied from TMS layer list @@ -125,6 +125,6 @@ // upper left and lower right corners of the selection rectangle (x/y on ZOOM_MAX) - Point iSelectionRectStart; - Point iSelectionRectEnd; + private Point iSelectionRectStart; + private Point iSelectionRectEnd; /** Index: trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java (revision 8285) @@ -19,4 +19,5 @@ import javax.swing.JPanel; import javax.swing.KeyStroke; + import org.openstreetmap.josm.Main; @@ -168,5 +169,5 @@ private class MoveXAction extends AbstractAction { - int direction; + private int direction; public MoveXAction(int direction) { @@ -182,5 +183,5 @@ private class MoveYAction extends AbstractAction { - int direction; + private int direction; public MoveYAction(int direction) { Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java (revision 8285) @@ -42,5 +42,5 @@ private JTable theirTable; private final TagMergeModel model; - AdjustmentSynchronizer adjustmentSynchronizer; + private AdjustmentSynchronizer adjustmentSynchronizer; /** Index: trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (revision 8285) @@ -246,5 +246,5 @@ * Simple listener setup to update the button enabled state when the side dialog shows. */ - Set showNotifyListener = new LinkedHashSet<>(); + private Set showNotifyListener = new LinkedHashSet<>(); private void addShowNotifyListener(IEnabledStateUpdating listener) { Index: trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java (revision 8285) @@ -63,5 +63,5 @@ protected OsmDataLayer layer; private JosmTextArea txtMappaint; - boolean mappaintTabLoaded; + private boolean mappaintTabLoaded; public InspectPrimitiveDialog(Collection primitives, OsmDataLayer layer) { @@ -117,6 +117,6 @@ class DataText { - static final String INDENT = " "; - static final String NL = "\n"; + private static final String INDENT = " "; + private static final String NL = "\n"; private StringBuilder s = new StringBuilder(); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java (revision 8285) @@ -435,5 +435,6 @@ private static class LatLonHolder { - double lat, lon; + private double lat; + private double lon; } Index: trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 8285) @@ -114,11 +114,11 @@ private SideButton opacityButton; - ActivateLayerAction activateLayerAction; - ShowHideLayerAction showHideLayerAction; + private ActivateLayerAction activateLayerAction; + private ShowHideLayerAction showHideLayerAction; //TODO This duplicates ShowHide actions functionality /** stores which layer index to toggle and executes the ShowHide action if the layer is present */ private final class ToggleLayerIndexVisibility extends AbstractAction { - int layerIndex = -1; + private int layerIndex = -1; public ToggleLayerIndexVisibility(int layerIndex) { this.layerIndex = layerIndex; @@ -946,5 +946,5 @@ private static class ActiveLayerCellRenderer implements TableCellRenderer { - final JCheckBox cb; + private final JCheckBox cb; public ActiveLayerCellRenderer() { cb = new ActiveLayerCheckBox(); @@ -961,5 +961,5 @@ private static class LayerVisibleCellRenderer implements TableCellRenderer { - final LayerVisibleCheckBox cb; + private final LayerVisibleCheckBox cb; public LayerVisibleCellRenderer() { this.cb = new LayerVisibleCheckBox(); @@ -976,5 +976,5 @@ private static class LayerVisibleCellEditor extends DefaultCellEditor { - final LayerVisibleCheckBox cb; + private final LayerVisibleCheckBox cb; public LayerVisibleCellEditor(LayerVisibleCheckBox cb) { super(cb); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java (revision 8285) @@ -206,5 +206,5 @@ protected class StylesModel extends AbstractTableModel implements MapPaintSylesUpdateListener { - List data = new ArrayList<>(); + private List data = new ArrayList<>(); public StylesModel() { @@ -239,5 +239,5 @@ } - Class[] columnClasses = {Boolean.class, StyleSource.class}; + private Class[] columnClasses = {Boolean.class, StyleSource.class}; @Override @@ -348,5 +348,5 @@ protected class MoveUpDownAction extends AbstractAction implements ListSelectionListener { - final int increment; + private final int increment; public MoveUpDownAction(boolean isDown) { @@ -523,6 +523,6 @@ protected class InfoAction extends AbstractAction { - boolean errorsTabLoaded; - boolean sourceTabLoaded; + private boolean errorsTabLoaded; + private boolean sourceTabLoaded; public InfoAction() { Index: trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 8285) @@ -116,5 +116,5 @@ private final AddSelectionToRelations addSelectionToRelations = new AddSelectionToRelations(); - HighlightHelper highlightHelper = new HighlightHelper(); + private final HighlightHelper highlightHelper = new HighlightHelper(); private boolean highlightEnabled = Main.pref.getBoolean("draw.target-highlight", true); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 8285) @@ -896,5 +896,5 @@ class DeleteAction extends JosmAction implements ListSelectionListener { - static final String DELETE_FROM_RELATION_PREF = "delete_from_relation"; + private static final String DELETE_FROM_RELATION_PREF = "delete_from_relation"; public DeleteAction() { @@ -1248,5 +1248,5 @@ class SearchAction extends AbstractAction { - final boolean sameType; + private final boolean sameType; public SearchAction(boolean sameType) { Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 8285) @@ -90,10 +90,10 @@ // Selection that we are editing by using both dialogs - Collection sel; + private Collection sel; private String changedKey; private String objKey; - Comparator defaultACItemComparator = new Comparator() { + private Comparator defaultACItemComparator = new Comparator() { @Override public int compare(AutoCompletionListItem o1, AutoCompletionListItem o2) { @@ -156,5 +156,5 @@ @SuppressWarnings("unchecked") - final EditTagDialog editDialog = new EditTagDialog(key, row, + final EditTagDialog editDialog = new EditTagDialog(key, (Map) tagData.getValueAt(row, 1), focusOnKey); editDialog.showDialog(); @@ -241,9 +241,8 @@ public final class EditTagDialog extends AbstractTagsDialog { - final String key; - final Map m; - final int row; - - Comparator usedValuesAwareComparator = new Comparator() { + private final String key; + private final Map m; + + private Comparator usedValuesAwareComparator = new Comparator() { @Override public int compare(AutoCompletionListItem o1, AutoCompletionListItem o2) { @@ -259,6 +258,6 @@ }; - ListCellRenderer cellRenderer = new ListCellRenderer() { - final DefaultListCellRenderer def = new DefaultListCellRenderer(); + private ListCellRenderer cellRenderer = new ListCellRenderer() { + private final DefaultListCellRenderer def = new DefaultListCellRenderer(); @Override public Component getListCellRendererComponent(JList list, @@ -280,5 +279,5 @@ }; - private EditTagDialog(String key, int row, Map map, final boolean initialFocusOnKey) { + private EditTagDialog(String key, Map map, final boolean initialFocusOnKey) { super(Main.parent, trn("Change value?", "Change values?", map.size()), new String[] {tr("OK"),tr("Cancel")}); setButtonIcons(new String[] {"ok","cancel"}); @@ -286,5 +285,4 @@ configureContextsensitiveHelp("/Dialog/EditValue", true /* show help button */); this.key = key; - this.row = row; this.m = map; @@ -421,7 +419,7 @@ abstract class AbstractTagsDialog extends ExtendedDialog { - AutoCompletingComboBox keys; - AutoCompletingComboBox values; - Component componentUnderMouse; + protected AutoCompletingComboBox keys; + protected AutoCompletingComboBox values; + protected Component componentUnderMouse; public AbstractTagsDialog(Component parent, String title, String[] buttonTexts) { @@ -518,5 +516,5 @@ protected JPopupMenu popupMenu = new JPopupMenu() { - JCheckBoxMenuItem fixTagLanguageCb = new JCheckBoxMenuItem( + private JCheckBoxMenuItem fixTagLanguageCb = new JCheckBoxMenuItem( new AbstractAction(tr("Use English language for tag by default")){ @Override @@ -534,5 +532,5 @@ class AddTagsDialog extends AbstractTagsDialog { - List recentTagsActions = new ArrayList<>(); + private List recentTagsActions = new ArrayList<>(); // Counter of added commands for possible undo Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java (revision 8285) @@ -122,5 +122,5 @@ } - ListSelectionListener highlighterListener = new ListSelectionListener() { + private ListSelectionListener highlighterListener = new ListSelectionListener() { @Override public void valueChanged(ListSelectionEvent lse) { Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java (revision 8285) @@ -17,9 +17,9 @@ public class MemberTableLinkedCellRenderer extends MemberTableCellRenderer { - static final Image arrowUp = ImageProvider.get("dialogs/relation", "arrowup").getImage(); - static final Image arrowDown = ImageProvider.get("dialogs/relation", "arrowdown").getImage(); - static final Image corners = ImageProvider.get("dialogs/relation", "roundedcorners").getImage(); - static final Image roundabout_right = ImageProvider.get("dialogs/relation", "roundabout_right_tiny").getImage(); - static final Image roundabout_left = ImageProvider.get("dialogs/relation", "roundabout_left_tiny").getImage(); + private static final Image arrowUp = ImageProvider.get("dialogs/relation", "arrowup").getImage(); + private static final Image arrowDown = ImageProvider.get("dialogs/relation", "arrowdown").getImage(); + private static final Image corners = ImageProvider.get("dialogs/relation", "roundedcorners").getImage(); + private static final Image roundabout_right = ImageProvider.get("dialogs/relation", "roundabout_right_tiny").getImage(); + private static final Image roundabout_left = ImageProvider.get("dialogs/relation", "roundabout_left_tiny").getImage(); private WayConnectionType value = new WayConnectionType(); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java (revision 8285) @@ -22,5 +22,5 @@ /** keeps track of open relation editors */ - static RelationDialogManager relationDialogManager; + private static RelationDialogManager relationDialogManager; /** Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java (revision 8285) @@ -167,7 +167,7 @@ } - Integer firstOneway = null; - Node lastOnewayNode = null; - Node firstCircular = null; + private Integer firstOneway = null; + private Node lastOnewayNode = null; + private Node firstCircular = null; /** Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java (revision 8285) @@ -106,5 +106,5 @@ } - int firstGroupIdx; + private int firstGroupIdx; private void makeLoopIfNeeded(final List con, final int i) { boolean loop; @@ -136,6 +136,7 @@ } - int lastForwardWay, lastBackwardWay; - boolean onewayBeginning; + private int lastForwardWay; + private int lastBackwardWay; + private boolean onewayBeginning; private WayConnectionType determineOnewayConnectionType(final List con, RelationMember m, int i, final WayConnectionType wct) { Index: trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (revision 8285) @@ -450,6 +450,6 @@ static class NamedResultTableColumnModel extends DefaultTableColumnModel { - TableColumn col3 = null; - TableColumn col4 = null; + private TableColumn col3 = null; + private TableColumn col4 = null; protected final void createColumns() { TableColumn col = null; Index: trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java (revision 8285) @@ -87,5 +87,5 @@ } - final String WINDOW_GEOMETRY_PREF = getClass().getName() + ".geometry"; + private final String WINDOW_GEOMETRY_PREF = getClass().getName() + ".geometry"; protected void placeOnScreen(HistoryBrowserDialog dialog) { @@ -217,5 +217,5 @@ private final Predicate unloadedHistoryPredicate = new Predicate() { - HistoryDataSet hds = HistoryDataSet.getInstance(); + private HistoryDataSet hds = HistoryDataSet.getInstance(); @Override Index: trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java (revision 8285) @@ -90,6 +90,6 @@ return new TableModelListener() { private Boolean reversed = null; - final String nonReversedText = tr("Nodes") + (table.getFont().canDisplay('\u25bc') ? " \u25bc" : " (1-n)"); - final String reversedText = tr("Nodes") + (table.getFont().canDisplay('\u25b2') ? " \u25b2" : " (n-1)"); + private final String nonReversedText = tr("Nodes") + (table.getFont().canDisplay('\u25bc') ? " \u25bc" : " (1-n)"); + private final String reversedText = tr("Nodes") + (table.getFont().canDisplay('\u25b2') ? " \u25b2" : " (n-1)"); @Override Index: trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java (revision 8285) @@ -55,6 +55,6 @@ public List referenceDiff; public List currentDiff; - Object[] reference; - Object[] current; + private Object[] reference; + private Object[] current; boolean referenceReversed = false; Index: trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java (revision 8285) @@ -180,6 +180,6 @@ static class CommentModelListener extends FocusAdapter implements ActionListener { - final HistoryComboBox source; - final ChangesetCommentModel destination; + private final HistoryComboBox source; + private final ChangesetCommentModel destination; CommentModelListener(HistoryComboBox source, ChangesetCommentModel destination) { Index: trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java (revision 8285) @@ -64,5 +64,5 @@ private boolean canceled; protected CredentialPanel pnlCredentials; - String saveUsernameAndPasswordCheckboxText; + private String saveUsernameAndPasswordCheckboxText; public boolean isCanceled() { @@ -283,5 +283,5 @@ private static class OtherHostCredentialsPanel extends CredentialPanel { - String host; + private String host; @Override Index: trunk/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java (revision 8285) @@ -25,5 +25,5 @@ */ public class RecentlyOpenedFilesMenu extends JMenu { - ClearAction clearAction; + private ClearAction clearAction; public RecentlyOpenedFilesMenu() { Index: trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (revision 8285) @@ -177,5 +177,5 @@ lstLayers.setCellRenderer( new ListCellRenderer() { - final DefaultListCellRenderer def = new DefaultListCellRenderer(); + private final DefaultListCellRenderer def = new DefaultListCellRenderer(); @Override public Component getListCellRendererComponent(JList list, SaveLayerInfo info, int index, Index: trunk/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java (revision 8285) @@ -23,5 +23,5 @@ public class CustomizeColor extends AbstractAction implements LayerAction, MultiLayerAction { - List layers; + private List layers; public CustomizeColor(List l) { Index: trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (revision 8285) @@ -207,8 +207,8 @@ private boolean needRedraw; private JPopupMenu tileOptionMenu; - JCheckBoxMenuItem autoZoomPopup; - JCheckBoxMenuItem autoLoadPopup; - JCheckBoxMenuItem showErrorsPopup; - Tile showMetadataTile; + private JCheckBoxMenuItem autoZoomPopup; + private JCheckBoxMenuItem autoLoadPopup; + private JCheckBoxMenuItem showErrorsPopup; + private Tile showMetadataTile; private AttributionSupport attribution = new AttributionSupport(); private static final Font InfoFont = new Font("sansserif", Font.BOLD, 13); @@ -783,9 +783,4 @@ } - /* - * Attempt to approximate how much the image is being scaled. For instance, - * a 100x100 image being scaled to 50x50 would return 0.25. - */ - Image lastScaledImage = null; @Override public boolean imageUpdate(Image img, int infoflags, int x, int y, int width, int height) { @@ -1037,7 +1032,7 @@ private final TileSet nullTileSet = new TileSet((LatLon)null, (LatLon)null, 0); private class TileSet { - int x0, x1, y0, y1; - int zoom; - int tileMax = -1; + private int x0, x1, y0, y1; + private int zoom; + private int tileMax = -1; /** @@ -1195,6 +1190,6 @@ private class DeepTileSet { - final EastNorth topLeft, botRight; - final int minZoom, maxZoom; + private final EastNorth topLeft, botRight; + private final int minZoom, maxZoom; private final TileSet[] tileSets; private final TileSetInfo[] tileSetInfos; Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 8285) @@ -91,7 +91,7 @@ private static List loadedGpxData = new ArrayList<>(); - GeoImageLayer yLayer = null; - double timezone; - long delta; + private GeoImageLayer yLayer = null; + private double timezone; + private long delta; /** @@ -105,7 +105,7 @@ private static class GpxDataWrapper { - String name; - GpxData data; - File file; + private String name; + private GpxData data; + private File file; public GpxDataWrapper(String name, GpxData data, File file) { @@ -121,17 +121,17 @@ } - ExtendedDialog syncDialog; - List gpxLst = new ArrayList<>(); - JPanel outerPanel; - JosmComboBox cbGpx; - JosmTextField tfTimezone; - JosmTextField tfOffset; - JCheckBox cbExifImg; - JCheckBox cbTaggedImg; - JCheckBox cbShowThumbs; - JLabel statusBarText; + private ExtendedDialog syncDialog; + private List gpxLst = new ArrayList<>(); + private JPanel outerPanel; + private JosmComboBox cbGpx; + private JosmTextField tfTimezone; + private JosmTextField tfOffset; + private JCheckBox cbExifImg; + private JCheckBox cbTaggedImg; + private JCheckBox cbShowThumbs; + private JLabel statusBarText; // remember the last number of matched photos - int lastNumMatched = 0; + private int lastNumMatched = 0; /** This class is called when the user doesn't find the GPX file he needs in the files that have @@ -231,10 +231,10 @@ */ private class SetOffsetActionListener implements ActionListener { - JPanel panel; - JLabel lbExifTime; - JosmTextField tfGpsTime; - JosmComboBox cbTimezones; - ImageDisplay imgDisp; - JList imgList; + private JPanel panel; + private JLabel lbExifTime; + private JosmTextField tfGpsTime; + private JosmComboBox cbTimezones; + private ImageDisplay imgDisp; + private JList imgList; @Override @@ -665,8 +665,8 @@ syncDialog.pack(); syncDialog.addWindowListener(new WindowAdapter() { - static final int CANCEL = -1; - static final int DONE = 0; - static final int AGAIN = 1; - static final int NOTHING = 2; + private static final int CANCEL = -1; + private static final int DONE = 0; + private static final int AGAIN = 1; + private static final int NOTHING = 2; private int checkAndSave() { if (syncDialog.isVisible()) @@ -764,6 +764,6 @@ } - StatusBarUpdater statusBarUpdater = new StatusBarUpdater(false); - StatusBarUpdater statusBarUpdaterWithRepaint = new StatusBarUpdater(true); + private StatusBarUpdater statusBarUpdater = new StatusBarUpdater(false); + private StatusBarUpdater statusBarUpdaterWithRepaint = new StatusBarUpdater(true); private class StatusBarUpdater implements DocumentListener, ItemListener, ActionListener { @@ -835,5 +835,5 @@ } - RepaintTheMapListener repaintTheMap = new RepaintTheMapListener(); + private RepaintTheMapListener repaintTheMap = new RepaintTheMapListener(); private class RepaintTheMapListener implements FocusListener { @Override Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 8285) @@ -94,5 +94,5 @@ boolean useThumbs = false; - ExecutorService thumbsLoaderExecutor = Executors.newSingleThreadExecutor(new ThreadFactory() { + private ExecutorService thumbsLoaderExecutor = Executors.newSingleThreadExecutor(new ThreadFactory() { @Override public Thread newThread(Runnable r) { @@ -102,6 +102,6 @@ } }); - ThumbsLoader thumbsloader; - boolean thumbsLoaderRunning = false; + private ThumbsLoader thumbsloader; + private boolean thumbsLoaderRunning = false; volatile boolean thumbsLoaded = false; private BufferedImage offscreenBuffer; Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (revision 8285) @@ -135,7 +135,7 @@ private class ImgDisplayMouseListener implements MouseListener, MouseWheelListener, MouseMotionListener { - boolean mouseIsDragging = false; - long lastTimeForMousePoint = 0L; - Point mousePointInImg = null; + private boolean mouseIsDragging = false; + private long lastTimeForMousePoint = 0L; + private Point mousePointInImg = null; /** Zoom in and out, trying to preserve the point of the image that was under the mouse cursor Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java (revision 8285) @@ -20,9 +20,9 @@ public static final int minSize = 22; public volatile boolean stop = false; - List data; - GeoImageLayer layer; - MediaTracker tracker; - CacheFiles cache; - boolean cacheOff = Main.pref.getBoolean("geoimage.noThumbnailCache", false); + private List data; + private GeoImageLayer layer; + private MediaTracker tracker; + private CacheFiles cache; + private boolean cacheOff = Main.pref.getBoolean("geoimage.noThumbnailCache", false); public ThumbsLoader(GeoImageLayer layer) { Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java (revision 8285) @@ -49,6 +49,6 @@ private final GpxLayer layer; - DateFilterPanel dateFilter; - JTable table; + private DateFilterPanel dateFilter; + private JTable table; /** @@ -181,5 +181,5 @@ } - boolean noUpdates=false; + private boolean noUpdates=false; /** selects all rows (=tracks) in the table that are currently visible on the layer*/ Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/CustomizeDrawingAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/gpx/CustomizeDrawingAction.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/CustomizeDrawingAction.java (revision 8285) @@ -29,5 +29,5 @@ public class CustomizeDrawingAction extends AbstractAction implements LayerAction, MultiLayerAction { - List layers; + private List layers; public CustomizeDrawingAction(List l) { Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java (revision 8285) @@ -23,14 +23,14 @@ public class DateFilterPanel extends JPanel { - DateEditorWithSlider dateFrom = new DateEditorWithSlider(tr("From")); - DateEditorWithSlider dateTo = new DateEditorWithSlider(tr("To")); - JCheckBox noTimestampCb = new JCheckBox(tr("No timestamp")); - GpxLayer layer; - - ActionListener filterAppliedListener; - - final String PREF_DATE_0; - final String PREF_DATE_MIN; - final String PREF_DATE_MAX; + private DateEditorWithSlider dateFrom = new DateEditorWithSlider(tr("From")); + private DateEditorWithSlider dateTo = new DateEditorWithSlider(tr("To")); + private JCheckBox noTimestampCb = new JCheckBox(tr("No timestamp")); + private GpxLayer layer; + + private ActionListener filterAppliedListener; + + private final String PREF_DATE_0; + private final String PREF_DATE_MIN; + private final String PREF_DATE_MAX; /** @@ -45,26 +45,26 @@ PREF_DATE_MAX = preferencePrefix+".maxtime"; this.layer = layer; - + final Date startTime, endTime; Date[] bounds = layer.data.getMinMaxTimeForAllTracks(); startTime = (bounds==null) ? new GregorianCalendar(2000, 1, 1).getTime():bounds[0]; endTime = (bounds==null) ? new Date() : bounds[1]; - - dateFrom.setDate(startTime); + + dateFrom.setDate(startTime); dateTo.setDate(endTime); - dateFrom.setRange(startTime, endTime); - dateTo.setRange(startTime, endTime); - + dateFrom.setRange(startTime, endTime); + dateTo.setRange(startTime, endTime); + add(noTimestampCb, GBC.std().grid(1,1).insets(0, 0, 5, 0)); add(dateFrom, GBC.std().grid(2,1).fill(GBC.HORIZONTAL)); add(dateTo, GBC.eol().grid(3,1).fill(GBC.HORIZONTAL)); - + setEnabled(enabled); - + dateFrom.addDateListener(changeListener); dateTo.addDateListener(changeListener); noTimestampCb.addChangeListener(changeListener); } - + private ChangeListener changeListener = new ChangeListener() { @Override public void stateChanged(ChangeEvent e) { @@ -72,5 +72,5 @@ } }; - + private Timer t = new Timer(200 , new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -78,5 +78,5 @@ } }); - + /** * Do filtering but little bit later (to reduce cpu load) @@ -89,5 +89,5 @@ } } - + public void applyFilter() { t.stop(); @@ -96,5 +96,5 @@ filterAppliedListener.actionPerformed(null); } - + /** * Called by other components when it is correct time to save date filtering parameters @@ -121,5 +121,5 @@ this.filterAppliedListener = filterAppliedListener; } - + private void filterTracksByDate() { Date from = dateFrom.getDate(); @@ -130,5 +130,5 @@ @Override public final void setEnabled(boolean enabled) { - super.setEnabled(enabled); + super.setEnabled(enabled); for (Component c: getComponents()) { c.setEnabled(enabled); Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java (revision 8285) @@ -26,7 +26,7 @@ public class DownloadAlongTrackAction extends DownloadAlongAction { - static final int NEAR_TRACK = 0; - static final int NEAR_WAYPOINTS = 1; - static final int NEAR_BOTH = 2; + private static final int NEAR_TRACK = 0; + private static final int NEAR_WAYPOINTS = 1; + private static final int NEAR_BOTH = 2; private static final String PREF_DOWNLOAD_ALONG_TRACK_OSM = "downloadAlongTrack.download.osm"; Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java (revision 8285) @@ -70,9 +70,9 @@ // default access is used to allow changing from plugins - ColorScale velocityScale; + private ColorScale velocityScale; /** Colors (without custom alpha channel, if given) for HDOP painting. **/ - ColorScale hdopScale; - ColorScale dateScale; - ColorScale directionScale; + private ColorScale hdopScale; + private ColorScale dateScale; + private ColorScale directionScale; /** Opacity for hdop points **/ Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/LiteralExpression.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/LiteralExpression.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/LiteralExpression.java (revision 8285) @@ -11,5 +11,5 @@ */ public class LiteralExpression implements Expression { - Object literal; + private final Object literal; public LiteralExpression(Object literal) { @@ -30,4 +30,3 @@ return "<" + literal.toString() + ">"; } - } Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (revision 8285) @@ -236,5 +236,5 @@ if (left.matches(e.withPrimitive(r))) { final List openEnds = MultipolygonCache.getInstance().get(Main.map.mapView, r).getOpenEnds(); - final int openEndIndex = openEnds.indexOf((Node) e.osm); + final int openEndIndex = openEnds.indexOf(e.osm); if (openEndIndex >= 0) { e.parent = r; @@ -634,5 +634,5 @@ } - static final double R = 6378135; + private static final double R = 6378135; public static double level2scale(int lvl) { Index: trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSourceHandler.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSourceHandler.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSourceHandler.java (revision 8285) @@ -19,15 +19,15 @@ private RuleElem rule = new RuleElem(); - XmlStyleSource style; + private XmlStyleSource style; static class RuleElem { - XmlCondition cond = new XmlCondition(); - Collection conditions; - double scaleMax; - double scaleMin; - LinePrototype line = new LinePrototype(); - LinemodPrototype linemod = new LinemodPrototype(); - AreaPrototype area = new AreaPrototype(); - IconPrototype icon = new IconPrototype(); + private XmlCondition cond = new XmlCondition(); + private Collection conditions; + private double scaleMax; + private double scaleMin; + private LinePrototype line = new LinePrototype(); + private LinemodPrototype linemod = new LinemodPrototype(); + private AreaPrototype area = new AreaPrototype(); + private IconPrototype icon = new IconPrototype(); public void init() { conditions = null; Index: trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java (revision 8285) @@ -52,7 +52,7 @@ private static class SessionId { - String id; - String token; - String userName; + private String id; + private String token; + private String userName; } Index: trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 8285) @@ -153,5 +153,5 @@ private final List settingsInitialized = new ArrayList<>(); - List validationListeners = new ArrayList<>(); + final List validationListeners = new ArrayList<>(); /** @@ -403,5 +403,5 @@ } } while (removed); - + if (!toLoad.isEmpty()) { PluginHandler.loadPlugins(PreferenceTabbedPane.this, toLoad, null); Index: trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (revision 8285) @@ -939,5 +939,5 @@ */ class MoveUpDownAction extends AbstractAction implements ListSelectionListener, TableModelListener { - final int increment; + private final int increment; public MoveUpDownAction(boolean isDown) { increment = isDown ? 1 : -1; Index: trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (revision 8285) @@ -393,5 +393,5 @@ private class ToolbarPopupMenu extends JPopupMenu { - ActionDefinition act; + private ActionDefinition act; private void setActionAndAdapt(ActionDefinition action) { @@ -402,5 +402,5 @@ } - JMenuItem remove = new JMenuItem(new AbstractAction(tr("Remove from toolbar")) { + private JMenuItem remove = new JMenuItem(new AbstractAction(tr("Remove from toolbar")) { @Override public void actionPerformed(ActionEvent e) { @@ -416,5 +416,5 @@ }); - JMenuItem configure = new JMenuItem(new AbstractAction(tr("Configure toolbar")) { + private JMenuItem configure = new JMenuItem(new AbstractAction(tr("Configure toolbar")) { @Override public void actionPerformed(ActionEvent e) { @@ -425,5 +425,5 @@ }); - JMenuItem shortcutEdit = new JMenuItem(new AbstractAction(tr("Edit shortcut")) { + private JMenuItem shortcutEdit = new JMenuItem(new AbstractAction(tr("Edit shortcut")) { @Override public void actionPerformed(ActionEvent e) { @@ -437,5 +437,5 @@ }); - JCheckBoxMenuItem doNotHide = new JCheckBoxMenuItem(new AbstractAction(tr("Do not hide toolbar and menu")) { + private JCheckBoxMenuItem doNotHide = new JCheckBoxMenuItem(new AbstractAction(tr("Do not hide toolbar and menu")) { @Override public void actionPerformed(ActionEvent e) { @@ -625,5 +625,5 @@ ListCellRenderer renderer = new ListCellRenderer() { - final DefaultListCellRenderer def = new DefaultListCellRenderer(); + private final DefaultListCellRenderer def = new DefaultListCellRenderer(); @Override public Component getListCellRendererComponent(JList list, Index: trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java (revision 8285) @@ -160,5 +160,5 @@ p.add(more, GBC.std().insets(5,5,0,0)); more.addActionListener(new ActionListener() { - JPopupMenu menu = buildPopupMenu(); + private JPopupMenu menu = buildPopupMenu(); @Override public void actionPerformed(ActionEvent ev) { menu.show(more, 0, 0); @@ -312,5 +312,5 @@ } - Map profileTypes = new LinkedHashMap<>(); + private Map profileTypes = new LinkedHashMap<>(); private JPopupMenu buildPopupMenu() { Index: trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java (revision 8285) @@ -30,6 +30,6 @@ public class ListEditor extends ExtendedDialog { - List data; - PrefEntry entry; + private List data; + private PrefEntry entry; /** Index: trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java (revision 8285) @@ -38,13 +38,13 @@ public class ListListEditor extends ExtendedDialog { - EntryListModel entryModel; - List> data; - PrefEntry entry; - - JList entryList; - Integer entryIdx; - JTable table; - - ListTableModel tableModel; + private EntryListModel entryModel; + private List> data; + private PrefEntry entry; + + private JList entryList; + private Integer entryIdx; + private JTable table; + + private ListTableModel tableModel; /** Index: trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java (revision 8285) @@ -42,14 +42,14 @@ public class MapListEditor extends ExtendedDialog { - EntryListModel entryModel; - PrefEntry entry; - - JList entryList; - JTable table; - MapTableModel tableModel; - - List> dataKeys; - List> dataValues; - Integer entryIdx; + private EntryListModel entryModel; + private PrefEntry entry; + + private JList entryList; + private JTable table; + private MapTableModel tableModel; + + private List> dataKeys; + private List> dataValues; + private Integer entryIdx; public MapListEditor(JComponent gui, PrefEntry entry, MapListSetting setting) { Index: trunk/src/org/openstreetmap/josm/gui/preferences/advanced/StringEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/advanced/StringEditor.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/preferences/advanced/StringEditor.java (revision 8285) @@ -20,6 +20,6 @@ public class StringEditor extends ExtendedDialog { - PrefEntry entry; - JosmTextField tvalue; + private PrefEntry entry; + private JosmTextField tvalue; /** Index: trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java (revision 8285) @@ -91,5 +91,5 @@ lafCombo.setRenderer(new ListCellRenderer(){ - final DefaultListCellRenderer def = new DefaultListCellRenderer(); + private final DefaultListCellRenderer def = new DefaultListCellRenderer(); @Override public Component getListCellRendererComponent(JList list, LookAndFeelInfo value, Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (revision 8285) @@ -792,6 +792,6 @@ static class OffsetBookmarksPanel extends JPanel { - List bookmarks = OffsetBookmark.allBookmarks; - OffsetsBookmarksModel model = new OffsetsBookmarksModel(); + private List bookmarks = OffsetBookmark.allBookmarks; + private OffsetsBookmarksModel model = new OffsetsBookmarksModel(); public OffsetBookmarksPanel(final PreferenceTabbedPane gui) { Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java (revision 8285) @@ -34,5 +34,5 @@ public class CodeProjectionChoice extends AbstractProjectionChoice implements SubPrefsOptions { - String code; + private String code; /** @@ -48,9 +48,9 @@ private ProjectionCodeListModel model; public JList selectionList; - List data; - List filteredData; - static final String DEFAULT_CODE = "EPSG:3857"; - String lastCode = DEFAULT_CODE; - ActionListener listener; + private List data; + private List filteredData; + private static final String DEFAULT_CODE = "EPSG:3857"; + private String lastCode = DEFAULT_CODE; + private ActionListener listener; public CodeSelectionPanel(String initialCode, ActionListener listener) { @@ -68,5 +68,5 @@ */ private static class CodeComparator implements Comparator { - final Pattern codePattern = Pattern.compile("([a-zA-Z]+):(\\d+)"); + private final Pattern codePattern = Pattern.compile("([a-zA-Z]+):(\\d+)"); @Override public int compare(String c1, String c2) { Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreference.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreference.java (revision 8285) @@ -26,5 +26,5 @@ } - AuthenticationPreferencesPanel pnlAuthPreferences; + private AuthenticationPreferencesPanel pnlAuthPreferences; private AuthenticationPreference() { Index: trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (revision 8285) @@ -99,5 +99,5 @@ private JosmComboBox tfKey = new JosmComboBox<>(); - JTable shortcutTable = new JTable(); + private JTable shortcutTable = new JTable(); private JosmTextField filterField = new JosmTextField(); Index: trunk/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java (revision 8285) @@ -10,14 +10,14 @@ private static class Request { - AbstractProgressMonitor originator; - int childTicks; - double currentValue; - - String title; - String customText; - String extraText; - Boolean intermediate; - - boolean finishRequested; + private AbstractProgressMonitor originator; + private int childTicks; + private double currentValue; + + private String title; + private String customText; + private String extraText; + private Boolean intermediate; + + private boolean finishRequested; } @@ -28,6 +28,6 @@ protected State state = State.INIT; - int ticksCount; - int ticks; + private int ticksCount; + private int ticks; private int childTicks; Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java (revision 8285) @@ -614,5 +614,5 @@ */ class CellEditorRemover implements PropertyChangeListener { - KeyboardFocusManager focusManager; + private KeyboardFocusManager focusManager; public CellEditorRemover(KeyboardFocusManager fm) { Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (revision 8285) @@ -199,5 +199,5 @@ private static class PresetPanel extends JPanel { - boolean hasElements = false; + private boolean hasElements = false; PresetPanel() { super(new GridBagLayout()); Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java (revision 8285) @@ -289,7 +289,7 @@ public static class Usage { - TreeSet values; - boolean hadKeys = false; - boolean hadEmpty = false; + private TreeSet values; + private boolean hadKeys = false; + private boolean hadEmpty = false; public boolean hasUniqueValue() { @@ -1168,5 +1168,5 @@ private static final ListCellRenderer RENDERER = new ListCellRenderer() { - JLabel lbl = new JLabel(); + private JLabel lbl = new JLabel(); @Override Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSelector.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSelector.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSelector.java (revision 8285) @@ -85,5 +85,5 @@ private static class ResultListCellRenderer implements ListCellRenderer { - final DefaultListCellRenderer def = new DefaultListCellRenderer(); + private final DefaultListCellRenderer def = new DefaultListCellRenderer(); @Override public Component getListCellRendererComponent(JList list, TaggingPreset tp, int index, boolean isSelected, boolean cellHasFocus) { Index: trunk/src/org/openstreetmap/josm/gui/util/HighlightHelper.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/util/HighlightHelper.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/gui/util/HighlightHelper.java (revision 8285) @@ -18,5 +18,5 @@ */ public class HighlightHelper { - Set highlightedPrimitives = new HashSet<>(); + private final Set highlightedPrimitives = new HashSet<>(); /** Index: trunk/src/org/openstreetmap/josm/io/NoteReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/NoteReader.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/io/NoteReader.java (revision 8285) @@ -57,5 +57,5 @@ private Boolean commentIsNew; private List notes; - String commentText; + private String commentText; @Override Index: trunk/src/org/openstreetmap/josm/io/OsmApi.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 8285) @@ -167,6 +167,6 @@ private static final String CAPABILITIES = "capabilities"; - ProgressMonitor monitor; - boolean fastFail; + private ProgressMonitor monitor; + private boolean fastFail; public CapabilitiesCache(ProgressMonitor monitor, boolean fastFail) { Index: trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (revision 8285) @@ -57,5 +57,5 @@ private static final int MSECS_PER_MINUTE = MSECS_PER_SECOND * SECONDS_PER_MINUTE; - long uploadStartTime; + private long uploadStartTime; public String timeLeft(int progress, int list_size) { Index: trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java (revision 8285) @@ -72,5 +72,5 @@ private Stack states; - List entries; + private List entries; /** @@ -78,14 +78,15 @@ * that this version of JOSM cannot process. */ - boolean skipEntry; - - ImageryInfo entry; - ImageryBounds bounds; - Shape shape; + private boolean skipEntry; + + private ImageryInfo entry; + private ImageryBounds bounds; + private Shape shape; // language of last element, does only work for simple ENTRY_ATTRIBUTE's - String lang; - List projections; - - @Override public void startDocument() { + private String lang; + private List projections; + + @Override + public void startDocument() { accumulator = new StringBuffer(); skipEntry = false; Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (revision 8285) @@ -57,5 +57,5 @@ */ static class DeleteTagMarker { - int num; + private int num; public DeleteTagMarker(int num) { this.num = num; @@ -71,6 +71,6 @@ */ static class ExistingValues { - String tag; - Map valueCount; + private String tag; + private Map valueCount; public ExistingValues(String tag) { this.tag=tag; valueCount=new HashMap<>(); @@ -126,5 +126,5 @@ final DefaultTableModel tm = new DefaultTableModel(new String[] {tr("Assume"), tr("Key"), tr("Value"), tr("Existing values")}, tags.length) { - final Class[] types = {Boolean.class, String.class, Object.class, ExistingValues.class}; + private final Class[] types = {Boolean.class, String.class, Object.class, ExistingValues.class}; @Override public Class getColumnClass(int c) { Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java (revision 8285) @@ -37,5 +37,5 @@ private final List allCoordinates = new ArrayList<>(); - + private Way way; @@ -43,5 +43,5 @@ * The place to remeber already added nodes (they are reused if needed @since 5845 */ - Map addedNodes; + private Map addedNodes; @Override Index: trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (revision 8285) @@ -48,5 +48,5 @@ private static class BugReporterThread extends Thread { - final Throwable e; + private final Throwable e; public BugReporterThread(Throwable t) { Index: trunk/src/org/openstreetmap/josm/tools/CopyList.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/CopyList.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/tools/CopyList.java (revision 8285) @@ -148,5 +148,5 @@ * Index of element to be returned by subsequent call to next. */ - int cursor = 0; + private int cursor = 0; /** @@ -155,5 +155,5 @@ * to remove. */ - int lastRet = -1; + private int lastRet = -1; /** @@ -162,5 +162,5 @@ * has detected concurrent modification. */ - int expectedModCount = modCount; + private int expectedModCount = modCount; @Override Index: trunk/src/org/openstreetmap/josm/tools/Diff.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/Diff.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/tools/Diff.java (revision 8285) @@ -934,5 +934,5 @@ /** Number of elements (lines) in this file. */ - final int buffered_lines; + private final int buffered_lines; /** Vector, indexed by line number, containing an equivalence code for @@ -943,17 +943,17 @@ /** Vector, like the previous one except that the elements for discarded lines have been squeezed out. */ - final int[] undiscarded; + private final int[] undiscarded; /** Vector mapping virtual line numbers (not counting discarded lines) to real ones (counting those lines). Both are origin-0. */ - final int[] realindexes; + private final int[] realindexes; /** Total number of nondiscarded lines. */ - int nondiscarded_lines; + private int nondiscarded_lines; /** Array, indexed by real origin-1 line number, containing true for a line that is an insertion or a deletion. The results of comparison are stored here. */ - boolean[] changed_flag; + private boolean[] changed_flag; } } Index: trunk/src/org/openstreetmap/josm/tools/ImageProvider.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (revision 8285) @@ -1190,5 +1190,5 @@ /** 90 degrees in radians units */ - static final double DEGREE_90 = 90.0 * Math.PI / 180.0; + private static final double DEGREE_90 = 90.0 * Math.PI / 180.0; /** Index: trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java (revision 8285) @@ -67,6 +67,6 @@ private class MyAction extends AbstractAction { - final MultikeyShortcutAction action; - final Shortcut shortcut; + private final MultikeyShortcutAction action; + private final Shortcut shortcut; MyAction(MultikeyShortcutAction action) { Index: trunk/src/org/openstreetmap/josm/tools/SubclassFilteredCollection.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/SubclassFilteredCollection.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/tools/SubclassFilteredCollection.java (revision 8285) @@ -20,5 +20,5 @@ private final Collection collection; private final Predicate predicate; - int size = -1; + private int size = -1; private class FilterIterator implements Iterator { Index: trunk/src/org/openstreetmap/josm/tools/TextTagParser.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/TextTagParser.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/tools/TextTagParser.java (revision 8285) @@ -40,10 +40,10 @@ public static class TextAnalyzer { - boolean quotesStarted = false; - boolean esc = false; - StringBuilder s = new StringBuilder(200); - int pos; - String data; - int n; + private boolean quotesStarted = false; + private boolean esc = false; + private StringBuilder s = new StringBuilder(200); + private int pos; + private String data; + private int n; public TextAnalyzer(String text) { Index: trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java (revision 8285) @@ -68,6 +68,6 @@ private class Parser extends DefaultHandler { - Stack current = new Stack<>(); - StringBuilder characters = new StringBuilder(64); + private Stack current = new Stack<>(); + private StringBuilder characters = new StringBuilder(64); private Locator locator; @@ -185,7 +185,7 @@ private static class Entry { - Class klass; - boolean onStart; - boolean both; + private Class klass; + private boolean onStart; + private boolean both; private final Map fields = new HashMap<>(); private final Map methods = new HashMap<>(); Index: trunk/src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java (revision 8284) +++ trunk/src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java (revision 8285) @@ -41,5 +41,5 @@ private abstract class ContextProvider extends Match { - Match condition; + protected Match condition; abstract List getPrimitives(OsmPrimitive root); }