Changeset 8285 in josm


Ignore:
Timestamp:
2015-04-28T00:49:49+02:00 (10 years ago)
Author:
Don-vip
Message:

fix sonar squid:S2039 - Member variable visibility should be specified

Location:
trunk/src/org/openstreetmap/josm
Files:
117 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java

    r7509 r8285  
    5858
    5959    public static class PolarCoor {
    60         double radius;
    61         double angle;
    62         EastNorth origin = new EastNorth(0, 0);
    63         double azimuth = 0;
     60        private double radius;
     61        private double angle;
     62        private EastNorth origin = new EastNorth(0, 0);
     63        private double azimuth = 0;
    6464
    6565        PolarCoor(double radius, double angle) {

  • trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java

    r7269 r8285  
    9898     */
    9999    private static class PolarNode {
    100         double a;
    101         Node node;
     100        private double a;
     101        private Node node;
    102102
    103103        PolarNode(EastNorth center, Node n) {

  • trunk/src/org/openstreetmap/josm/actions/PurgeAction.java

    r7433 r8285  
    7070
    7171    protected OsmDataLayer layer;
    72     JCheckBox cbClearUndoRedo;
     72    protected JCheckBox cbClearUndoRedo;
    7373
    7474    protected Set<OsmPrimitive> toPurge;

  • trunk/src/org/openstreetmap/josm/actions/SelectNonBranchingWaySequences.java

    r7937 r8285  
    2121     * outer endpoints of selected ways
    2222     */
    23     Set<Node> outerNodes;
     23    private Set<Node> outerNodes;
    2424    /**
    2525     * endpoints of selected ways
    2626     */
    27     Set<Node> nodes;
     27    private Set<Node> nodes;
    2828
    2929    /**

  • trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmCompressedTask.java

    r7937 r8285  
    22package org.openstreetmap.josm.actions.downloadtasks;
    33
     4import static org.openstreetmap.josm.tools.I18n.tr;
     5
    46import java.util.concurrent.Future;
    5 
    6 import static org.openstreetmap.josm.tools.I18n.tr;
    77
    88import org.openstreetmap.josm.Main;
    … …  
    1919public class DownloadOsmCompressedTask extends DownloadOsmTask {
    2020
    21     static final String PATTERN_COMPRESS =  "https?://.*/.*\\.osm.(gz|bz2?|zip)";
     21    private static final String PATTERN_COMPRESS =  "https?://.*/.*\\.osm.(gz|bz2?|zip)";
    2222
    2323    @Override
    … …  
    3030        return tr("Download Compressed OSM");
    3131    }
    32    
     32
    3333    @Override
    3434    public Future<?> download(boolean newLayer, Bounds downloadArea,
    … …  
    3636        return null;
    3737    }
    38    
     38
    3939    /**
    4040     * Loads a given URL

  • trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

    r7668 r8285  
    8282
    8383    private static class DeleteParameters {
    84         DeleteMode mode;
    85         Node nearestNode;
    86         WaySegment nearestSegment;
     84        private DeleteMode mode;
     85        private Node nearestNode;
     86        private WaySegment nearestSegment;
    8787    }
    8888

  • trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

    r8064 r8285  
    12861286
    12871287    private class SnapHelper {
    1288         boolean snapOn; // snapping is turned on
     1288        private boolean snapOn; // snapping is turned on
    12891289
    12901290        private boolean active; // snapping is active for current mouse position
    … …  
    12981298        private boolean snapToProjections;
    12991299
    1300         EastNorth dir2;
    1301         EastNorth projected;
    1302         String labelText;
    1303         double lastAngle;
    1304 
    1305         double customBaseHeading=-1; // angle of base line, if not last segment)
     1300        private EastNorth dir2;
     1301        private EastNorth projected;
     1302        private String labelText;
     1303        private double lastAngle;
     1304
     1305        private double customBaseHeading=-1; // angle of base line, if not last segment)
    13061306        private EastNorth segmentPoint1; // remembered first point of base segment
    13071307        private EastNorth segmentPoint2; // remembered second point of base segment
    13081308        private EastNorth projectionSource; // point that we are projecting to the line
    13091309
    1310         double[] snapAngles;
    1311         double snapAngleTolerance;
    1312 
    1313         double pe,pn; // (pe,pn) - direction of snapping line
    1314         double e0,n0; // (e0,n0) - origin of snapping line
    1315 
    1316         final String fixFmt="%d "+tr("FIX");
    1317         Color snapHelperColor;
     1310        private double[] snapAngles;
     1311        private double snapAngleTolerance;
     1312
     1313        private double pe,pn; // (pe,pn) - direction of snapping line
     1314        private double e0,n0; // (e0,n0) - origin of snapping line
     1315
     1316        private final String fixFmt="%d "+tr("FIX");
     1317        private Color snapHelperColor;
    13181318        private Color highlightColor;
    13191319
    … …  
    13221322        private Stroke highlightStroke;
    13231323
    1324         JCheckBoxMenuItem checkBox;
     1324        private JCheckBoxMenuItem checkBox;
    13251325        public final Color ORANGE_TRANSPARENT = new Color(Color.ORANGE.getRed(),Color.ORANGE.getGreen(),Color.ORANGE.getBlue(),128);
    13261326
    … …  
    16721672        }
    16731673
    1674         MouseListener anglePopupListener = new PopupMenuLauncher( new JPopupMenu() {
    1675             JCheckBoxMenuItem repeatedCb = new JCheckBoxMenuItem(new AbstractAction(tr("Toggle snapping by {0}", getShortcut().getKeyText())){
     1674        private MouseListener anglePopupListener = new PopupMenuLauncher(new JPopupMenu() {
     1675            private JCheckBoxMenuItem repeatedCb = new JCheckBoxMenuItem(
     1676                    new AbstractAction(tr("Toggle snapping by {0}", getShortcut().getKeyText())) {
    16761677                @Override public void actionPerformed(ActionEvent e) {
    16771678                    boolean sel=((JCheckBoxMenuItem) e.getSource()).getState();
    … …  
    16801681                }
    16811682            });
    1682             JCheckBoxMenuItem helperCb = new JCheckBoxMenuItem(new AbstractAction(tr("Show helper geometry")){
     1683            private JCheckBoxMenuItem helperCb = new JCheckBoxMenuItem(
     1684                    new AbstractAction(tr("Show helper geometry")) {
    16831685                @Override public void actionPerformed(ActionEvent e) {
    16841686                    boolean sel=((JCheckBoxMenuItem) e.getSource()).getState();
    … …  
    16901692                }
    16911693            });
    1692             JCheckBoxMenuItem projectionCb = new JCheckBoxMenuItem(new AbstractAction(tr("Snap to node projections")){
     1694            private JCheckBoxMenuItem projectionCb = new JCheckBoxMenuItem(
     1695                    new AbstractAction(tr("Snap to node projections")) {
    16931696                @Override public void actionPerformed(ActionEvent e) {
    16941697                    boolean sel=((JCheckBoxMenuItem) e.getSource()).getState();

  • trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java

    r7217 r8285  
    2121import org.openstreetmap.josm.Main;
    2222import org.openstreetmap.josm.data.Bounds;
    23 import org.openstreetmap.josm.data.SystemOfMeasurement;
    2423import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
    2524import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
     25import org.openstreetmap.josm.data.SystemOfMeasurement;
    2626import org.openstreetmap.josm.data.coor.EastNorth;
    2727import org.openstreetmap.josm.data.osm.Node;
    … …  
    124124    private EastNorth helperLineEnd;
    125125
    126     Stroke helpLineStroke;
    127     Stroke refLineStroke;
    128     Color mainColor;
    129 
     126    private Stroke helpLineStroke;
     127    private Stroke refLineStroke;
     128    private Color mainColor;
     129
     130    /**
     131     * Constructs a new {@code ParallelWayAction}.
     132     * @param mapFrame Map frame
     133     */
    130134    public ParallelWayAction(MapFrame mapFrame) {
    131135        super(tr("Parallel"), "parallel", tr("Make parallel copies of ways"),
    … …  
    303307
    304308        // Since the created way is left selected, we need to unselect again here
    305         if (pWays != null && pWays.ways != null) {
    306             getCurrentDataSet().clearSelection(pWays.ways);
     309        if (pWays != null && pWays.getWays() != null) {
     310            getCurrentDataSet().clearSelection(pWays.getWays());
    307311            pWays = null;
    308312        }
    … …  
    545549            pWays = new ParallelWays(sourceWays, copyTags, referenceWayIndex);
    546550            pWays.commit();
    547             getCurrentDataSet().setSelected(pWays.ways);
     551            getCurrentDataSet().setSelected(pWays.getWays());
    548552            return true;
    549553        } catch (IllegalArgumentException e) {

  • trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java

    r7025 r8285  
    2626 */
    2727public class ParallelWays {
    28     final List<Way> ways;
     28    private final List<Way> ways;
    2929    private final List<Node> sortedNodes;
    3030
    … …  
    195195        }
    196196    }
     197
     198    public final List<Way> getWays() {
     199        return ways;
     200    }
    197201}

  • trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

    r8061 r8285  
    137137     * point where user pressed the mouse to start movement
    138138     */
    139     EastNorth startEN;
     139    private EastNorth startEN;
    140140    /**
    141141     * The last known position of the mouse.
    … …  
    215215        removeHighlighting();
    216216    }
    217 
    218     int previousModifiers;
    219217
    220218    @Override
    … …  
    949947    }
    950948
    951     CycleManager cycleManager = new CycleManager();
    952     VirtualManager virtualManager = new VirtualManager();
     949    private CycleManager cycleManager = new CycleManager();
     950    private VirtualManager virtualManager = new VirtualManager();
    953951
    954952    private class CycleManager {

  • trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

    r8250 r8285  
    99import java.awt.Dimension;
    1010import java.awt.FlowLayout;
    11 import java.awt.Font;
    1211import java.awt.GridBagLayout;
    1312import java.awt.event.ActionEvent;
    … …  
    154153    private static class DescriptionTextBuilder {
    155154
    156         StringBuilder s = new StringBuilder(4096);
     155        private final StringBuilder s = new StringBuilder(4096);
    157156
    158157        public StringBuilder append(String string) {

  • trunk/src/org/openstreetmap/josm/actions/upload/FixDataHook.java

    r8179 r8285  
    107107    public static class FixDataKey implements FixData {
    108108        /** key of wrong data */
    109         String oldKey;
     109        private String oldKey;
    110110        /** key of correct data */
    111         String newKey;
     111        private String newKey;
    112112
    113113        /**
    … …  
    141141    public static class FixDataTag implements FixData {
    142142        /** key of wrong data */
    143         String oldKey;
     143        private String oldKey;
    144144        /** value of wrong data */
    145         String oldValue;
     145        private String oldValue;
    146146        /** key of correct data */
    147         String newKey;
     147        private String newKey;
    148148        /** value of correct data */
    149         String newValue;
     149        private String newValue;
    150150
    151151        /**

  • trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java

    r7937 r8285  
    4242
    4343        private boolean isCanceled = false;
    44         Map<Note, Note> updatedNotes = new HashMap<>();
    45         Map<Note, Exception> failedNotes = new HashMap<>();
     44        private Map<Note, Note> updatedNotes = new HashMap<>();
     45        private Map<Note, Exception> failedNotes = new HashMap<>();
    4646
    4747        /**

  • trunk/src/org/openstreetmap/josm/command/Command.java

    r7005 r8285  
    6060    public static class OldNodeState {
    6161
    62         final LatLon latlon;
    63         final EastNorth eastNorth; // cached EastNorth to be used for applying exact displacement
    64         final boolean modified;
     62        private final LatLon latlon;
     63        private final EastNorth eastNorth; // cached EastNorth to be used for applying exact displacement
     64        private final boolean modified;
    6565
    6666        /**
    … …  
    7272            eastNorth = node.getEastNorth();
    7373            modified = node.isModified();
     74        }
     75
     76        /**
     77         * Returns old lat/lon.
     78         * @return old lat/lon
     79         * @see Node#getCoor()
     80         */
     81        public final LatLon getLatlon() {
     82            return latlon;
     83        }
     84
     85        /**
     86         * Returns old east/north.
     87         * @return old east/north
     88         * @see Node#getEastNorth()
     89         */
     90        public final EastNorth getEastNorth() {
     91            return eastNorth;
     92        }
     93
     94        /**
     95         * Returns old modified state.
     96         * @return old modified state
     97         * @see Node #isModified()
     98         */
     99        public final boolean isModified() {
     100            return modified;
    74101        }
    75102    }

  • trunk/src/org/openstreetmap/josm/command/MoveCommand.java

    r7005 r8285  
    171171        for (Node n : nodes) {
    172172            OldNodeState os = it.next();
    173             if (os.eastNorth != null) {
    174                 n.setEastNorth(os.eastNorth.add(x, y));
     173            if (os.getEastNorth() != null) {
     174                n.setEastNorth(os.getEastNorth().add(x, y));
    175175            }
    176176        }
    … …  
    197197        for (Node n : nodes) {
    198198            OldNodeState os = it.next();
    199             n.setCoor(os.latlon);
    200             n.setModified(os.modified);
     199            n.setCoor(os.getLatlon());
     200            n.setModified(os.isModified());
    201201        }
    202202    }

  • trunk/src/org/openstreetmap/josm/command/RotateCommand.java

    r6890 r8285  
    7676            double cosPhi = Math.cos(rotationAngle);
    7777            double sinPhi = Math.sin(rotationAngle);
    78             EastNorth oldEastNorth = oldStates.get(n).eastNorth;
     78            EastNorth oldEastNorth = oldStates.get(n).getEastNorth();
    7979            double x = oldEastNorth.east() - pivot.east();
    8080            double y = oldEastNorth.north() - pivot.north();

  • trunk/src/org/openstreetmap/josm/command/ScaleCommand.java

    r6890 r8285  
    2626    /**
    2727     * World position of the mouse when the user started the command.
    28      *
    2928     */
    30     EastNorth startEN = null;
     29    private EastNorth startEN = null;
    3130
    3231    /**
    … …  
    6968    protected void transformNodes() {
    7069        for (Node n : nodes) {
    71             EastNorth oldEastNorth = oldStates.get(n).eastNorth;
     70            EastNorth oldEastNorth = oldStates.get(n).getEastNorth();
    7271            double dx = oldEastNorth.east() - pivot.east();
    7372            double dy = oldEastNorth.north() - pivot.north();

  • trunk/src/org/openstreetmap/josm/command/TransformNodesCommand.java

    r7005 r8285  
    9494        for (Node n : nodes) {
    9595            OldNodeState os = oldStates.get(n);
    96             n.setCoor(os.latlon);
    97             n.setModified(os.modified);
     96            n.setCoor(os.getLatlon());
     97            n.setModified(os.isModified());
    9898        }
    9999    }

  • trunk/src/org/openstreetmap/josm/data/AutosaveTask.java

    r7951 r8285  
    7272
    7373    private static class AutosaveLayerInfo {
    74         OsmDataLayer layer;
    75         String layerName;
    76         String layerFileName;
    77         final Deque<File> backupFiles = new LinkedList<>();
     74        private OsmDataLayer layer;
     75        private String layerName;
     76        private String layerFileName;
     77        private final Deque<File> backupFiles = new LinkedList<>();
    7878    }
    7979

  • trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java

    r7937 r8285  
    415415    public static class XMLCommandProcessor {
    416416
    417         Preferences mainPrefs;
    418         Map<String,Element> tasksMap = new HashMap<>();
     417        private Preferences mainPrefs;
     418        private Map<String,Element> tasksMap = new HashMap<>();
    419419
    420420        private boolean lastV; // last If condition result
    421421
    422 
    423         ScriptEngine engine ;
     422        private ScriptEngine engine;
    424423
    425424        public void openAndReadXML(File file) {

  • trunk/src/org/openstreetmap/josm/data/imagery/WmsCache.java

    r7937 r8285  
    5757
    5858    private static class CacheEntry {
    59         final double pixelPerDegree;
    60         final double east;
    61         final double north;
    62         final ProjectionBounds bounds;
    63         final String filename;
    64 
    65         long lastUsed;
    66         long lastModified;
     59        private final double pixelPerDegree;
     60        private final double east;
     61        private final double north;
     62        private final ProjectionBounds bounds;
     63        private final String filename;
     64
     65        private long lastUsed;
     66        private long lastModified;
    6767
    6868        CacheEntry(double pixelPerDegree, double east, double north, int tileSize, String filename) {
    … …  
    8383
    8484    private static class ProjectionEntries {
    85         final String projection;
    86         final String cacheDirectory;
    87         final List<CacheEntry> entries = new ArrayList<>();
     85        private final String projection;
     86        private final String cacheDirectory;
     87        private final List<CacheEntry> entries = new ArrayList<>();
    8888
    8989        ProjectionEntries(String projection, String cacheDirectory) {

  • trunk/src/org/openstreetmap/josm/data/osm/FilterMatcher.java

    r7005 r8285  
    7373
    7474    private static class FilterInfo {
    75         final Match match;
    76         final boolean isDelete;
    77         final boolean isInverted;
     75        private final Match match;
     76        private final boolean isDelete;
     77        private final boolean isInverted;
    7878
    7979        FilterInfo(Filter filter) throws ParseError {

  • trunk/src/org/openstreetmap/josm/data/osm/OsmUtils.java

    r8257 r8285  
    1818    }
    1919
    20     static final List<String> TRUE_VALUES = new ArrayList<>(Arrays
     20    private static final List<String> TRUE_VALUES = new ArrayList<>(Arrays
    2121            .asList(new String[] { "true", "yes", "1", "on" }));
    22     static final List<String> FALSE_VALUES = new ArrayList<>(Arrays
     22    private static final List<String> FALSE_VALUES = new ArrayList<>(Arrays
    2323            .asList(new String[] { "false", "no", "0", "off" }));
    24     static final List<String> REVERSE_VALUES = new ArrayList<>(Arrays
     24    private static final List<String> REVERSE_VALUES = new ArrayList<>(Arrays
    2525            .asList(new String[] { "reverse", "-1" }));
    2626

  • trunk/src/org/openstreetmap/josm/data/osm/PrimitiveDeepCopy.java

    r7961 r8285  
    5656
    5757        new AbstractVisitor() {
    58             boolean firstIteration;
     58            private boolean firstIteration;
    5959
    6060            @Override

  • trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java

    r7025 r8285  
    496496
    497497    class QuadBucketIterator implements Iterator<T> {
    498         QBLevel<T> current_node;
    499         int content_index;
    500         int iterated_over;
     498        private QBLevel<T> current_node;
     499        private int content_index;
     500        private int iterated_over;
    501501
    502502        final QBLevel<T> next_content_node(QBLevel<T> q) {

  • trunk/src/org/openstreetmap/josm/data/osm/Storage.java

    r7436 r8285  
    374374
    375375    private final class FMap<K> implements Map<K,T> {
    376         Hash<K,? super T> fHash;
     376        private Hash<K,? super T> fHash;
    377377
    378378        private FMap(Hash<K,? super T> h) {
    … …  
    457457
    458458    private final class SafeReadonlyIter implements Iterator<T> {
    459         final T[] data;
    460         int slot = 0;
     459        private final T[] data;
     460        private int slot = 0;
    461461
    462462        SafeReadonlyIter(T[] data) {
    … …  
    491491    private final class Iter implements Iterator<T> {
    492492        private final int mods;
    493         int slot = 0;
    494         int removeSlot = -1;
     493        private int slot = 0;
     494        private int removeSlot = -1;
    495495
    496496        Iter() {

  • trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java

    r7005 r8285  
    4545
    4646    private static class ListenerInfo {
    47         final DataSetListener listener;
    48         final boolean consolidate;
     47        private final DataSetListener listener;
     48        private final boolean consolidate;
    4949
    5050        public ListenerInfo(DataSetListener listener, boolean consolidate) {

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

    r7005 r8285  
    2727
    2828    private static class ListenerInfo {
    29         final SelectionChangedListener listener;
     29        private final SelectionChangedListener listener;
    3030
    3131        public ListenerInfo(SelectionChangedListener listener) {

  • trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

    r8199 r8285  
    190190
    191191    private static class StyleRecord implements Comparable<StyleRecord> {
    192         final ElemStyle style;
    193         final OsmPrimitive osm;
    194         final int flags;
     192        private final ElemStyle style;
     193        private final OsmPrimitive osm;
     194        private final int flags;
    195195
    196196        public StyleRecord(ElemStyle style, OsmPrimitive osm, int flags) {

  • trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShift.java

    r6890 r8285  
    4545    private double lonAccuracy;
    4646    private double latAccuracy;
    47     boolean latAccuracyAvailable;
    48     boolean lonAccuracyAvailable;
     47    private boolean latAccuracyAvailable;
     48    private boolean lonAccuracyAvailable;
    4949    private String subGridName;
    5050

  • trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java

    r7082 r8285  
    5858    private float[] lonAccuracy;
    5959
    60     boolean bigEndian;
    6160    private NTV2SubGrid[] subGrid;
    6261

  • trunk/src/org/openstreetmap/josm/data/validation/PaintVisitor.java

    r7937 r8285  
    3333    /** Is the error selected ? */
    3434    private boolean selected;
    35    
     35
    3636    private final Set<PaintedPoint> paintedPoints = new HashSet<>();
    3737    private final Set<PaintedSegment> paintedSegments = new HashSet<>();
    … …  
    5555            this.color = color;
    5656        }
    57        
     57
    5858        @Override
    5959        public int hashCode() {
    … …  
    6464            return result;
    6565        }
    66        
     66
    6767        @Override
    6868        public boolean equals(Object obj) {
    … …  
    8383
    8484    protected static class PaintedSegment extends PaintedPoint {
    85         final LatLon p2;
    86        
     85        private final LatLon p2;
     86
    8787        public PaintedSegment(LatLon p1, LatLon p2, Color color) {
    8888            super(p1, color);
    … …  
    133133    protected void drawNode(Node n, Color color) {
    134134        PaintedPoint pp = new PaintedPoint(n.getCoor(), color);
    135        
     135
    136136        if (!paintedPoints.contains(pp)) {
    137137            Point p = mv.getPoint(n);
    138138            g.setColor(color);
    139            
     139
    140140            if (selected) {
    141141                g.fillOval(p.x - 5, p.y - 5, 10, 10);
    … …  
    156156    protected void drawSegment(Point p1, Point p2, Color color) {
    157157        g.setColor(color);
    158        
     158
    159159        double t = Math.atan2(p2.x - p1.x, p2.y - p1.y);
    160160        double cosT = 5 * Math.cos(t);
    … …  
    272272        }
    273273    }
    274    
     274
    275275    /**
    276276     * Clears the internal painted objects collections.

  • trunk/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java

    r7937 r8285  
    2626public class ConditionalKeys extends Test.TagTest {
    2727
    28     final OpeningHourTest openingHourTest = new OpeningHourTest();
    29     static final Set<String> RESTRICTION_TYPES = new HashSet<>(Arrays.asList("oneway", "toll", "noexit", "maxspeed", "minspeed", "maxstay",
     28    private final OpeningHourTest openingHourTest = new OpeningHourTest();
     29    private static final Set<String> RESTRICTION_TYPES = new HashSet<>(Arrays.asList("oneway", "toll", "noexit", "maxspeed", "minspeed", "maxstay",
    3030            "maxweight", "maxaxleload", "maxheight", "maxwidth", "maxlength", "overtaking", "maxgcweight", "maxgcweightrating", "fee"));
    31     static final Set<String> RESTRICTION_VALUES = new HashSet<>(Arrays.asList("yes", "official", "designated", "destination",
     31    private static final Set<String> RESTRICTION_VALUES = new HashSet<>(Arrays.asList("yes", "official", "designated", "destination",
    3232            "delivery", "permissive", "private", "agricultural", "forestry", "no"));
    33     static final Set<String> TRANSPORT_MODES = new HashSet<>(Arrays.asList("access", "foot", "ski", "inline_skates", "ice_skates",
     33    private static final Set<String> TRANSPORT_MODES = new HashSet<>(Arrays.asList("access", "foot", "ski", "inline_skates", "ice_skates",
    3434            "horse", "vehicle", "bicycle", "carriage", "trailer", "caravan", "motor_vehicle", "motorcycle", "moped", "mofa",
    3535            "motorcar", "motorhome", "psv", "bus", "taxi", "tourist_bus", "goods", "hgv", "agricultural", "atv", "snowmobile"

  • trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java

    r7937 r8285  
    5757    protected static final List<String> ISO_COUNTRIES = Arrays.asList(Locale.getISOCountries());
    5858
    59     boolean leftByPedestrians = false;
    60     boolean leftByCyclists = false;
    61     boolean leftByCars = false;
    62     int pedestrianWays = 0;
    63     int cyclistWays = 0;
    64     int carsWays = 0;
     59    private boolean leftByPedestrians = false;
     60    private boolean leftByCyclists = false;
     61    private boolean leftByCars = false;
     62    private int pedestrianWays = 0;
     63    private int cyclistWays = 0;
     64    private int carsWays = 0;
    6565
    6666    /**

  • trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

    r8266 r8285  
    242242        }
    243243
    244         static final String POSSIBLE_THROWS = possibleThrows();
     244        private static final String POSSIBLE_THROWS = possibleThrows();
    245245
    246246        static final String possibleThrows() {

  • trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java

    r8242 r8285  
    7878    static enum CheckMode {
    7979        TIME_RANGE(0), POINTS_IN_TIME(1), BOTH(2);
    80         final int code;
     80        private final int code;
    8181
    8282        CheckMode(int code) {
    … …  
    108108     */
    109109    public class OpeningHoursTestError {
    110         final Severity severity;
    111         final String message, prettifiedValue;
     110        private final Severity severity;
     111        private final String message;
     112        private final String prettifiedValue;
    112113
    113114        /**

  • trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

    r8126 r8285  
    130130    protected static final Entities entities = new Entities();
    131131
    132     static final List<String> DEFAULT_SOURCES = Arrays.asList(DATA_FILE, IGNORE_FILE, SPELL_FILE);
     132    private static final List<String> DEFAULT_SOURCES = Arrays.asList(DATA_FILE, IGNORE_FILE, SPELL_FILE);
    133133
    134134    /**

  • trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java

    r7308 r8285  
    293293        private final double len;
    294294        private Set<Node> nearbyNodeCache;
    295         double nearbyNodeCacheDist = -1.0;
    296         final Node n1;
    297         final Node n2;
     295        private double nearbyNodeCacheDist = -1.0;
     296        private final Node n1;
     297        private final Node n2;
    298298
    299299        public MyWaySegment(Way w, Node n1, Node n2) {

  • trunk/src/org/openstreetmap/josm/data/validation/util/AggregatePrimitivesVisitor.java

    r7005 r8285  
    2121public class AggregatePrimitivesVisitor extends AbstractVisitor {
    2222    /** Aggregated data */
    23     final Collection<OsmPrimitive> aggregatedData = new HashSet<>();
     23    private final Collection<OsmPrimitive> aggregatedData = new HashSet<>();
    2424
    2525    /**

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

    r8201 r8285  
    447447         */
    448448        sideToolBar.setComponentPopupMenu(new JPopupMenu() {
    449             static final int staticMenuEntryCount = 2;
    450             JCheckBoxMenuItem doNotHide = new JCheckBoxMenuItem(new AbstractAction(tr("Do not hide toolbar")) {
     449            private static final int staticMenuEntryCount = 2;
     450            private JCheckBoxMenuItem doNotHide = new JCheckBoxMenuItem(new AbstractAction(tr("Do not hide toolbar")) {
    451451                @Override
    452452                public void actionPerformed(ActionEvent e) {

  • trunk/src/org/openstreetmap/josm/gui/MapSlider.java

    r6380 r8285  
    1717
    1818    private final MapView mv;
    19     boolean preventChange = false;
     19    private boolean preventChange = false;
    2020
    2121    public MapSlider(MapView mv) {

  • trunk/src/org/openstreetmap/josm/gui/MapStatus.java

    r8128 r8285  
    175175    }
    176176
    177     final ImageLabel latText = new ImageLabel("lat", tr("The geographic latitude at the mouse pointer."), 11, PROP_BACKGROUND_COLOR.get());
    178     final ImageLabel lonText = new ImageLabel("lon", tr("The geographic longitude at the mouse pointer."), 11, PROP_BACKGROUND_COLOR.get());
    179     final ImageLabel headingText = new ImageLabel("heading", tr("The (compass) heading of the line segment being drawn."), 6, PROP_BACKGROUND_COLOR.get());
    180     final ImageLabel angleText = new ImageLabel("angle", tr("The angle between the previous and the current way segment."), 6, PROP_BACKGROUND_COLOR.get());
    181     final ImageLabel distText = new ImageLabel("dist", tr("The length of the new way segment being drawn."), 10, PROP_BACKGROUND_COLOR.get());
    182     final ImageLabel nameText = new ImageLabel("name", tr("The name of the object at the mouse pointer."), 20, PROP_BACKGROUND_COLOR.get());
    183     final JosmTextField helpText = new JosmTextField();
    184     final JProgressBar progressBar = new JProgressBar();
     177    private final ImageLabel latText = new ImageLabel("lat", tr("The geographic latitude at the mouse pointer."), 11, PROP_BACKGROUND_COLOR.get());
     178    private final ImageLabel lonText = new ImageLabel("lon", tr("The geographic longitude at the mouse pointer."), 11, PROP_BACKGROUND_COLOR.get());
     179    private final ImageLabel headingText = new ImageLabel("heading", tr("The (compass) heading of the line segment being drawn."), 6, PROP_BACKGROUND_COLOR.get());
     180    private final ImageLabel angleText = new ImageLabel("angle", tr("The angle between the previous and the current way segment."), 6, PROP_BACKGROUND_COLOR.get());
     181    private final ImageLabel distText = new ImageLabel("dist", tr("The length of the new way segment being drawn."), 10, PROP_BACKGROUND_COLOR.get());
     182    private final ImageLabel nameText = new ImageLabel("name", tr("The name of the object at the mouse pointer."), 20, PROP_BACKGROUND_COLOR.get());
     183    private final JosmTextField helpText = new JosmTextField();
     184    private final JProgressBar progressBar = new JProgressBar();
    185185    public final BackgroundProgressMonitor progressMonitor = new BackgroundProgressMonitor();
    186186
    … …  
    202202
    203203    private static class StatusTextHistory {
    204         final Object id;
    205         final String text;
     204        private final Object id;
     205        private final String text;
    206206
    207207        public StatusTextHistory(Object id, String text) {
    … …  
    643643     */
    644644    static class MouseState {
    645         Point mousePos;
    646         int modifiers;
     645        private Point mousePos;
     646        private int modifiers;
    647647    }
    648648    /**
    649649     * The last sent mouse movement event.
    650650     */
    651     MouseState mouseState = new MouseState();
     651    private MouseState mouseState = new MouseState();
    652652
    653653    private AWTEventListener awtListener = new AWTEventListener() {

  • trunk/src/org/openstreetmap/josm/gui/MenuScroller.java

    r7937 r8285  
    471471        UP(9, 1, 9),
    472472        DOWN(1, 9, 1);
    473         static final int[] XPOINTS = {1, 5, 9};
    474         final int[] yPoints;
     473        private static final int[] XPOINTS = {1, 5, 9};
     474        private final int[] yPoints;
    475475
    476476        MenuIcon(int... yPoints) {

  • trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

    r8093 r8285  
    612612
    613613    private class ZoomData {
    614         final LatLon center;
    615         final double scale;
     614        private final LatLon center;
     615        private final double scale;
    616616
    617617        public ZoomData(EastNorth center, double scale) {
    … …  
    14571457
    14581458    private static class CursorInfo {
    1459         final Cursor cursor;
    1460         final Object object;
     1459        private final Cursor cursor;
     1460        private final Object object;
    14611461        public CursorInfo(Cursor c, Object o) {
    14621462            cursor = c;

  • trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java

    r8168 r8285  
    5252     */
    5353    public static class TMSTileSourceProvider implements TileSourceProvider {
    54         static final Set<String> existingSlippyMapUrls = new HashSet<>();
     54        private static final Set<String> existingSlippyMapUrls = new HashSet<>();
    5555        static {
    5656            // Urls that already exist in the slippymap chooser and shouldn't be copied from TMS layer list
    … …  
    125125
    126126    // upper left and lower right corners of the selection rectangle (x/y on ZOOM_MAX)
    127     Point iSelectionRectStart;
    128     Point iSelectionRectEnd;
     127    private Point iSelectionRectStart;
     128    private Point iSelectionRectEnd;
    129129
    130130    /**

  • trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java

    r7509 r8285  
    1919import javax.swing.JPanel;
    2020import javax.swing.KeyStroke;
     21
    2122import org.openstreetmap.josm.Main;
    2223
    … …  
    168169    private class MoveXAction extends AbstractAction {
    169170
    170         int direction;
     171        private int direction;
    171172
    172173        public MoveXAction(int direction) {
    … …  
    182183    private class MoveYAction extends AbstractAction {
    183184
    184         int direction;
     185        private int direction;
    185186
    186187        public MoveYAction(int direction) {

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java

    r8047 r8285  
    4242    private JTable theirTable;
    4343    private final TagMergeModel model;
    44     AdjustmentSynchronizer adjustmentSynchronizer;
     44    private AdjustmentSynchronizer adjustmentSynchronizer;
    4545
    4646    /**

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

    r7398 r8285  
    246246     * Simple listener setup to update the button enabled state when the side dialog shows.
    247247     */
    248     Set<IEnabledStateUpdating> showNotifyListener = new LinkedHashSet<>();
     248    private Set<IEnabledStateUpdating> showNotifyListener = new LinkedHashSet<>();
    249249
    250250    private void addShowNotifyListener(IEnabledStateUpdating listener) {

  • trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java

    r7896 r8285  
    6363    protected OsmDataLayer layer;
    6464    private JosmTextArea txtMappaint;
    65     boolean mappaintTabLoaded;
     65    private boolean mappaintTabLoaded;
    6666
    6767    public InspectPrimitiveDialog(Collection<OsmPrimitive> primitives, OsmDataLayer layer) {
    … …  
    117117
    118118    class DataText {
    119         static final String INDENT = "  ";
    120         static final String NL = "\n";
     119        private static final String INDENT = "  ";
     120        private static final String NL = "\n";
    121121
    122122        private StringBuilder s = new StringBuilder();

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

    r7509 r8285  
    435435
    436436    private static class LatLonHolder {
    437         double lat, lon;
     437        private double lat;
     438        private double lon;
    438439    }
    439440

  • trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

    r8126 r8285  
    114114    private SideButton opacityButton;
    115115
    116     ActivateLayerAction activateLayerAction;
    117     ShowHideLayerAction showHideLayerAction;
     116    private ActivateLayerAction activateLayerAction;
     117    private ShowHideLayerAction showHideLayerAction;
    118118
    119119    //TODO This duplicates ShowHide actions functionality
    120120    /** stores which layer index to toggle and executes the ShowHide action if the layer is present */
    121121    private final class ToggleLayerIndexVisibility extends AbstractAction {
    122         int layerIndex = -1;
     122        private int layerIndex = -1;
    123123        public ToggleLayerIndexVisibility(int layerIndex) {
    124124            this.layerIndex = layerIndex;
    … …  
    946946
    947947    private static class ActiveLayerCellRenderer implements TableCellRenderer {
    948         final JCheckBox cb;
     948        private final JCheckBox cb;
    949949        public ActiveLayerCellRenderer() {
    950950            cb = new ActiveLayerCheckBox();
    … …  
    961961
    962962    private static class LayerVisibleCellRenderer implements TableCellRenderer {
    963         final LayerVisibleCheckBox cb;
     963        private final LayerVisibleCheckBox cb;
    964964        public LayerVisibleCellRenderer() {
    965965            this.cb = new LayerVisibleCheckBox();
    … …  
    976976
    977977    private static class LayerVisibleCellEditor extends DefaultCellEditor {
    978         final LayerVisibleCheckBox cb;
     978        private final LayerVisibleCheckBox cb;
    979979        public LayerVisibleCellEditor(LayerVisibleCheckBox cb) {
    980980            super(cb);

  • trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java

    r8056 r8285  
    206206    protected class StylesModel extends AbstractTableModel implements MapPaintSylesUpdateListener {
    207207
    208         List<StyleSource> data = new ArrayList<>();
     208        private List<StyleSource> data = new ArrayList<>();
    209209
    210210        public StylesModel() {
    … …  
    239239        }
    240240
    241         Class<?>[] columnClasses = {Boolean.class, StyleSource.class};
     241        private Class<?>[] columnClasses = {Boolean.class, StyleSource.class};
    242242
    243243        @Override
    … …  
    348348    protected class MoveUpDownAction extends AbstractAction implements ListSelectionListener {
    349349
    350         final int increment;
     350        private final int increment;
    351351
    352352        public MoveUpDownAction(boolean isDown) {
    … …  
    523523    protected class InfoAction extends AbstractAction {
    524524
    525         boolean errorsTabLoaded;
    526         boolean sourceTabLoaded;
     525        private boolean errorsTabLoaded;
     526        private boolean sourceTabLoaded;
    527527
    528528        public InfoAction() {

  • trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

    r7547 r8285  
    116116    private final AddSelectionToRelations addSelectionToRelations = new AddSelectionToRelations();
    117117
    118     HighlightHelper highlightHelper = new HighlightHelper();
     118    private final HighlightHelper highlightHelper = new HighlightHelper();
    119119    private boolean highlightEnabled = Main.pref.getBoolean("draw.target-highlight", true);
    120120

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

    r8170 r8285  
    896896    class DeleteAction extends JosmAction implements ListSelectionListener {
    897897
    898         static final String DELETE_FROM_RELATION_PREF = "delete_from_relation";
     898        private static final String DELETE_FROM_RELATION_PREF = "delete_from_relation";
    899899
    900900        public DeleteAction() {
    … …  
    12481248
    12491249    class SearchAction extends AbstractAction {
    1250         final boolean sameType;
     1250        private final boolean sameType;
    12511251
    12521252        public SearchAction(boolean sameType) {

  • trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

    r8234 r8285  
    9090
    9191    // Selection that we are editing by using both dialogs
    92     Collection<OsmPrimitive> sel;
     92    private Collection<OsmPrimitive> sel;
    9393
    9494    private String changedKey;
    9595    private String objKey;
    9696
    97     Comparator<AutoCompletionListItem> defaultACItemComparator = new Comparator<AutoCompletionListItem>() {
     97    private Comparator<AutoCompletionListItem> defaultACItemComparator = new Comparator<AutoCompletionListItem>() {
    9898        @Override
    9999        public int compare(AutoCompletionListItem o1, AutoCompletionListItem o2) {
    … …  
    156156
    157157        @SuppressWarnings("unchecked")
    158         final EditTagDialog editDialog = new EditTagDialog(key, row,
     158        final EditTagDialog editDialog = new EditTagDialog(key,
    159159                (Map<String, Integer>) tagData.getValueAt(row, 1), focusOnKey);
    160160        editDialog.showDialog();
    … …  
    241241
    242242    public final class EditTagDialog extends AbstractTagsDialog {
    243         final String key;
    244         final Map<String, Integer> m;
    245         final int row;
    246 
    247         Comparator<AutoCompletionListItem> usedValuesAwareComparator = new Comparator<AutoCompletionListItem>() {
     243        private final String key;
     244        private final Map<String, Integer> m;
     245
     246        private Comparator<AutoCompletionListItem> usedValuesAwareComparator = new Comparator<AutoCompletionListItem>() {
    248247                @Override
    249248                public int compare(AutoCompletionListItem o1, AutoCompletionListItem o2) {
    … …  
    259258            };
    260259
    261         ListCellRenderer<AutoCompletionListItem> cellRenderer = new ListCellRenderer<AutoCompletionListItem>() {
    262             final DefaultListCellRenderer def = new DefaultListCellRenderer();
     260        private ListCellRenderer<AutoCompletionListItem> cellRenderer = new ListCellRenderer<AutoCompletionListItem>() {
     261            private final DefaultListCellRenderer def = new DefaultListCellRenderer();
    263262            @Override
    264263            public Component getListCellRendererComponent(JList<? extends AutoCompletionListItem> list,
    … …  
    280279        };
    281280
    282         private EditTagDialog(String key, int row, Map<String, Integer> map, final boolean initialFocusOnKey) {
     281        private EditTagDialog(String key, Map<String, Integer> map, final boolean initialFocusOnKey) {
    283282            super(Main.parent, trn("Change value?", "Change values?", map.size()), new String[] {tr("OK"),tr("Cancel")});
    284283            setButtonIcons(new String[] {"ok","cancel"});
    … …  
    286285            configureContextsensitiveHelp("/Dialog/EditValue", true /* show help button */);
    287286            this.key = key;
    288             this.row = row;
    289287            this.m = map;
    290288
    … …  
    421419
    422420    abstract class AbstractTagsDialog extends ExtendedDialog {
    423         AutoCompletingComboBox keys;
    424         AutoCompletingComboBox values;
    425         Component componentUnderMouse;
     421        protected AutoCompletingComboBox keys;
     422        protected AutoCompletingComboBox values;
     423        protected Component componentUnderMouse;
    426424
    427425        public AbstractTagsDialog(Component parent, String title, String[] buttonTexts) {
    … …  
    518516
    519517        protected JPopupMenu popupMenu = new JPopupMenu() {
    520             JCheckBoxMenuItem fixTagLanguageCb = new JCheckBoxMenuItem(
     518            private JCheckBoxMenuItem fixTagLanguageCb = new JCheckBoxMenuItem(
    521519                new AbstractAction(tr("Use English language for tag by default")){
    522520                @Override
    … …  
    534532
    535533    class AddTagsDialog extends AbstractTagsDialog {
    536         List<JosmAction> recentTagsActions = new ArrayList<>();
     534        private List<JosmAction> recentTagsActions = new ArrayList<>();
    537535
    538536        // Counter of added commands for possible undo

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java

    r7556 r8285  
    122122    }
    123123
    124     ListSelectionListener highlighterListener = new ListSelectionListener() {
     124    private ListSelectionListener highlighterListener = new ListSelectionListener() {
    125125            @Override
    126126            public void valueChanged(ListSelectionEvent lse) {

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java

    r6889 r8285  
    1717public class MemberTableLinkedCellRenderer extends MemberTableCellRenderer {
    1818
    19     static final Image arrowUp = ImageProvider.get("dialogs/relation", "arrowup").getImage();
    20     static final Image arrowDown = ImageProvider.get("dialogs/relation", "arrowdown").getImage();
    21     static final Image corners = ImageProvider.get("dialogs/relation", "roundedcorners").getImage();
    22     static final Image roundabout_right = ImageProvider.get("dialogs/relation", "roundabout_right_tiny").getImage();
    23     static final Image roundabout_left = ImageProvider.get("dialogs/relation", "roundabout_left_tiny").getImage();
     19    private static final Image arrowUp = ImageProvider.get("dialogs/relation", "arrowup").getImage();
     20    private static final Image arrowDown = ImageProvider.get("dialogs/relation", "arrowdown").getImage();
     21    private static final Image corners = ImageProvider.get("dialogs/relation", "roundedcorners").getImage();
     22    private static final Image roundabout_right = ImageProvider.get("dialogs/relation", "roundabout_right_tiny").getImage();
     23    private static final Image roundabout_left = ImageProvider.get("dialogs/relation", "roundabout_left_tiny").getImage();
    2424    private WayConnectionType value = new WayConnectionType();
    2525

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java

    r7005 r8285  
    2222
    2323    /** keeps track of open relation editors */
    24     static RelationDialogManager relationDialogManager;
     24    private static RelationDialogManager relationDialogManager;
    2525
    2626    /**

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java

    r7662 r8285  
    167167    }
    168168
    169     Integer firstOneway = null;
    170     Node lastOnewayNode = null;
    171     Node firstCircular = null;
     169    private Integer firstOneway = null;
     170    private Node lastOnewayNode = null;
     171    private Node firstCircular = null;
    172172
    173173    /**

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java

    r7937 r8285  
    106106    }
    107107
    108     int firstGroupIdx;
     108    private int firstGroupIdx;
    109109    private void makeLoopIfNeeded(final List<WayConnectionType> con, final int i) {
    110110        boolean loop;
    … …  
    136136    }
    137137
    138     int lastForwardWay, lastBackwardWay;
    139     boolean onewayBeginning;
     138    private int lastForwardWay;
     139    private int lastBackwardWay;
     140    private boolean onewayBeginning;
    140141    private WayConnectionType determineOnewayConnectionType(final List<WayConnectionType> con,
    141142            RelationMember m, int i, final WayConnectionType wct) {

  • trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java

    r7628 r8285  
    450450
    451451    static class NamedResultTableColumnModel extends DefaultTableColumnModel {
    452         TableColumn col3 = null;
    453         TableColumn col4 = null;
     452        private TableColumn col3 = null;
     453        private TableColumn col4 = null;
    454454        protected final void createColumns() {
    455455            TableColumn col = null;

  • trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java

    r8126 r8285  
    8787    }
    8888
    89     final String WINDOW_GEOMETRY_PREF = getClass().getName() + ".geometry";
     89    private final String WINDOW_GEOMETRY_PREF = getClass().getName() + ".geometry";
    9090
    9191    protected void placeOnScreen(HistoryBrowserDialog dialog) {
    … …  
    217217    private final Predicate<PrimitiveId> unloadedHistoryPredicate = new Predicate<PrimitiveId>() {
    218218
    219         HistoryDataSet hds = HistoryDataSet.getInstance();
     219        private HistoryDataSet hds = HistoryDataSet.getInstance();
    220220
    221221        @Override

  • trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java

    r8219 r8285  
    9090        return new TableModelListener() {
    9191            private Boolean reversed = null;
    92             final String nonReversedText = tr("Nodes") + (table.getFont().canDisplay('\u25bc') ? " \u25bc" : " (1-n)");
    93             final String reversedText = tr("Nodes") + (table.getFont().canDisplay('\u25b2') ? " \u25b2" : " (n-1)");
     92            private final String nonReversedText = tr("Nodes") + (table.getFont().canDisplay('\u25bc') ? " \u25bc" : " (1-n)");
     93            private final String reversedText = tr("Nodes") + (table.getFont().canDisplay('\u25b2') ? " \u25b2" : " (n-1)");
    9494
    9595            @Override

  • trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java

    r8219 r8285  
    5555    public List<Item> referenceDiff;
    5656    public List<Item> currentDiff;
    57     Object[] reference;
    58     Object[] current;
     57    private Object[] reference;
     58    private Object[] current;
    5959    boolean referenceReversed = false;
    6060

  • trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java

    r8177 r8285  
    180180    static class CommentModelListener extends FocusAdapter implements ActionListener {
    181181
    182         final HistoryComboBox source;
    183         final ChangesetCommentModel destination;
     182        private final HistoryComboBox source;
     183        private final ChangesetCommentModel destination;
    184184
    185185        CommentModelListener(HistoryComboBox source, ChangesetCommentModel destination) {

  • trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java

    r8038 r8285  
    6464    private boolean canceled;
    6565    protected CredentialPanel pnlCredentials;
    66     String saveUsernameAndPasswordCheckboxText;
     66    private String saveUsernameAndPasswordCheckboxText;
    6767
    6868    public boolean isCanceled() {
    … …  
    283283    private static class OtherHostCredentialsPanel extends CredentialPanel {
    284284
    285         String host;
     285        private String host;
    286286
    287287        @Override

  • trunk/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java

    r7694 r8285  
    2525 */
    2626public class RecentlyOpenedFilesMenu extends JMenu {
    27     ClearAction clearAction;
     27    private ClearAction clearAction;
    2828
    2929    public RecentlyOpenedFilesMenu() {

  • trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java

    r7402 r8285  
    177177            lstLayers.setCellRenderer(
    178178                    new ListCellRenderer<SaveLayerInfo>() {
    179                         final DefaultListCellRenderer def = new DefaultListCellRenderer();
     179                        private final DefaultListCellRenderer def = new DefaultListCellRenderer();
    180180                        @Override
    181181                        public Component getListCellRendererComponent(JList<? extends SaveLayerInfo> list, SaveLayerInfo info, int index,

  • trunk/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java

    r7937 r8285  
    2323
    2424public class CustomizeColor extends AbstractAction implements LayerAction, MultiLayerAction {
    25     List<Layer> layers;
     25    private List<Layer> layers;
    2626
    2727    public CustomizeColor(List<Layer> l) {

  • trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java

    r8186 r8285  
    207207    private boolean needRedraw;
    208208    private JPopupMenu tileOptionMenu;
    209     JCheckBoxMenuItem autoZoomPopup;
    210     JCheckBoxMenuItem autoLoadPopup;
    211     JCheckBoxMenuItem showErrorsPopup;
    212     Tile showMetadataTile;
     209    private JCheckBoxMenuItem autoZoomPopup;
     210    private JCheckBoxMenuItem autoLoadPopup;
     211    private JCheckBoxMenuItem showErrorsPopup;
     212    private Tile showMetadataTile;
    213213    private AttributionSupport attribution = new AttributionSupport();
    214214    private static final Font InfoFont = new Font("sansserif", Font.BOLD, 13);
    … …  
    783783    }
    784784
    785     /*
    786      * Attempt to approximate how much the image is being scaled. For instance,
    787      * a 100x100 image being scaled to 50x50 would return 0.25.
    788      */
    789     Image lastScaledImage = null;
    790785    @Override
    791786    public boolean imageUpdate(Image img, int infoflags, int x, int y, int width, int height) {
    … …  
    10371032    private final TileSet nullTileSet = new TileSet((LatLon)null, (LatLon)null, 0);
    10381033    private class TileSet {
    1039         int x0, x1, y0, y1;
    1040         int zoom;
    1041         int tileMax = -1;
     1034        private int x0, x1, y0, y1;
     1035        private int zoom;
     1036        private int tileMax = -1;
    10421037
    10431038        /**
    … …  
    11951190
    11961191    private class DeepTileSet {
    1197         final EastNorth topLeft, botRight;
    1198         final int minZoom, maxZoom;
     1192        private final EastNorth topLeft, botRight;
     1193        private final int minZoom, maxZoom;
    11991194        private final TileSet[] tileSets;
    12001195        private final TileSetInfo[] tileSetInfos;

  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

    r8061 r8285  
    9191    private static List<GpxData> loadedGpxData = new ArrayList<>();
    9292
    93     GeoImageLayer yLayer = null;
    94     double timezone;
    95     long delta;
     93    private GeoImageLayer yLayer = null;
     94    private double timezone;
     95    private long delta;
    9696
    9797    /**
    … …  
    105105
    106106    private static class GpxDataWrapper {
    107         String name;
    108         GpxData data;
    109         File file;
     107        private String name;
     108        private GpxData data;
     109        private File file;
    110110
    111111        public GpxDataWrapper(String name, GpxData data, File file) {
    … …  
    121121    }
    122122
    123     ExtendedDialog syncDialog;
    124     List<GpxDataWrapper> gpxLst = new ArrayList<>();
    125     JPanel outerPanel;
    126     JosmComboBox<GpxDataWrapper> cbGpx;
    127     JosmTextField tfTimezone;
    128     JosmTextField tfOffset;
    129     JCheckBox cbExifImg;
    130     JCheckBox cbTaggedImg;
    131     JCheckBox cbShowThumbs;
    132     JLabel statusBarText;
     123    private ExtendedDialog syncDialog;
     124    private List<GpxDataWrapper> gpxLst = new ArrayList<>();
     125    private JPanel outerPanel;
     126    private JosmComboBox<GpxDataWrapper> cbGpx;
     127    private JosmTextField tfTimezone;
     128    private JosmTextField tfOffset;
     129    private JCheckBox cbExifImg;
     130    private JCheckBox cbTaggedImg;
     131    private JCheckBox cbShowThumbs;
     132    private JLabel statusBarText;
    133133
    134134    // remember the last number of matched photos
    135     int lastNumMatched = 0;
     135    private int lastNumMatched = 0;
    136136
    137137    /** This class is called when the user doesn't find the GPX file he needs in the files that have
    … …  
    231231     */
    232232    private class SetOffsetActionListener implements ActionListener {
    233         JPanel panel;
    234         JLabel lbExifTime;
    235         JosmTextField tfGpsTime;
    236         JosmComboBox<String> cbTimezones;
    237         ImageDisplay imgDisp;
    238         JList<String> imgList;
     233        private JPanel panel;
     234        private JLabel lbExifTime;
     235        private JosmTextField tfGpsTime;
     236        private JosmComboBox<String> cbTimezones;
     237        private ImageDisplay imgDisp;
     238        private JList<String> imgList;
    239239
    240240        @Override
    … …  
    665665        syncDialog.pack();
    666666        syncDialog.addWindowListener(new WindowAdapter() {
    667             static final int CANCEL = -1;
    668             static final int DONE = 0;
    669             static final int AGAIN = 1;
    670             static final int NOTHING = 2;
     667            private static final int CANCEL = -1;
     668            private static final int DONE = 0;
     669            private static final int AGAIN = 1;
     670            private static final int NOTHING = 2;
    671671            private int checkAndSave() {
    672672                if (syncDialog.isVisible())
    … …  
    764764    }
    765765
    766     StatusBarUpdater statusBarUpdater = new StatusBarUpdater(false);
    767     StatusBarUpdater statusBarUpdaterWithRepaint = new StatusBarUpdater(true);
     766    private StatusBarUpdater statusBarUpdater = new StatusBarUpdater(false);
     767    private StatusBarUpdater statusBarUpdaterWithRepaint = new StatusBarUpdater(true);
    768768
    769769    private class StatusBarUpdater implements  DocumentListener, ItemListener, ActionListener {
    … …  
    835835    }
    836836
    837     RepaintTheMapListener repaintTheMap = new RepaintTheMapListener();
     837    private RepaintTheMapListener repaintTheMap = new RepaintTheMapListener();
    838838    private class RepaintTheMapListener implements FocusListener {
    839839        @Override

  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

    r8243 r8285  
    9494
    9595    boolean useThumbs = false;
    96     ExecutorService thumbsLoaderExecutor = Executors.newSingleThreadExecutor(new ThreadFactory() {
     96    private ExecutorService thumbsLoaderExecutor = Executors.newSingleThreadExecutor(new ThreadFactory() {
    9797        @Override
    9898        public Thread newThread(Runnable r) {
    … …  
    102102        }
    103103    });
    104     ThumbsLoader thumbsloader;
    105     boolean thumbsLoaderRunning = false;
     104    private ThumbsLoader thumbsloader;
     105    private boolean thumbsLoaderRunning = false;
    106106    volatile boolean thumbsLoaded = false;
    107107    private BufferedImage offscreenBuffer;

  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java

    r7956 r8285  
    135135    private class ImgDisplayMouseListener implements MouseListener, MouseWheelListener, MouseMotionListener {
    136136
    137         boolean mouseIsDragging = false;
    138         long lastTimeForMousePoint = 0L;
    139         Point mousePointInImg = null;
     137        private boolean mouseIsDragging = false;
     138        private long lastTimeForMousePoint = 0L;
     139        private Point mousePointInImg = null;
    140140
    141141        /** Zoom in and out, trying to preserve the point of the image that was under the mouse cursor

  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java

    r7956 r8285  
    2020    public static final int minSize = 22;
    2121    public volatile boolean stop = false;
    22     List<ImageEntry> data;
    23     GeoImageLayer layer;
    24     MediaTracker tracker;
    25     CacheFiles cache;
    26     boolean cacheOff = Main.pref.getBoolean("geoimage.noThumbnailCache", false);
     22    private List<ImageEntry> data;
     23    private GeoImageLayer layer;
     24    private MediaTracker tracker;
     25    private CacheFiles cache;
     26    private boolean cacheOff = Main.pref.getBoolean("geoimage.noThumbnailCache", false);
    2727
    2828    public ThumbsLoader(GeoImageLayer layer) {

  • trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java

    r7937 r8285  
    4949    private final GpxLayer layer;
    5050
    51     DateFilterPanel dateFilter;
    52     JTable table;
     51    private DateFilterPanel dateFilter;
     52    private JTable table;
    5353
    5454    /**
    … …  
    181181    }
    182182
    183     boolean noUpdates=false;
     183    private boolean noUpdates=false;
    184184
    185185    /** selects all rows (=tracks) in the table that are currently visible on the layer*/

  • trunk/src/org/openstreetmap/josm/gui/layer/gpx/CustomizeDrawingAction.java

    r7937 r8285  
    2929
    3030public class CustomizeDrawingAction extends AbstractAction implements LayerAction, MultiLayerAction {
    31     List<Layer> layers;
     31    private List<Layer> layers;
    3232
    3333    public CustomizeDrawingAction(List<Layer> l) {

  • trunk/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java

    r7937 r8285  
    2323
    2424public class DateFilterPanel extends JPanel {
    25     DateEditorWithSlider dateFrom = new DateEditorWithSlider(tr("From"));
    26     DateEditorWithSlider dateTo = new DateEditorWithSlider(tr("To"));
    27     JCheckBox noTimestampCb  = new JCheckBox(tr("No timestamp"));
    28     GpxLayer layer;
    29    
    30     ActionListener filterAppliedListener;
    31    
    32     final String PREF_DATE_0;
    33     final String PREF_DATE_MIN;
    34     final String PREF_DATE_MAX;
     25    private DateEditorWithSlider dateFrom = new DateEditorWithSlider(tr("From"));
     26    private DateEditorWithSlider dateTo = new DateEditorWithSlider(tr("To"));
     27    private JCheckBox noTimestampCb  = new JCheckBox(tr("No timestamp"));
     28    private GpxLayer layer;
     29
     30    private ActionListener filterAppliedListener;
     31
     32    private final String PREF_DATE_0;
     33    private final String PREF_DATE_MIN;
     34    private final String PREF_DATE_MAX;
    3535
    3636    /**
    … …  
    4545        PREF_DATE_MAX = preferencePrefix+".maxtime";
    4646        this.layer = layer;
    47        
     47
    4848        final Date startTime, endTime;
    4949        Date[] bounds = layer.data.getMinMaxTimeForAllTracks();
    5050        startTime = (bounds==null) ? new GregorianCalendar(2000, 1, 1).getTime():bounds[0];
    5151        endTime = (bounds==null) ? new Date() : bounds[1];
    52                
    53         dateFrom.setDate(startTime); 
     52
     53        dateFrom.setDate(startTime);
    5454        dateTo.setDate(endTime);
    55         dateFrom.setRange(startTime, endTime); 
    56         dateTo.setRange(startTime, endTime); 
    57        
     55        dateFrom.setRange(startTime, endTime);
     56        dateTo.setRange(startTime, endTime);
     57
    5858        add(noTimestampCb, GBC.std().grid(1,1).insets(0, 0, 5, 0));
    5959        add(dateFrom, GBC.std().grid(2,1).fill(GBC.HORIZONTAL));
    6060        add(dateTo, GBC.eol().grid(3,1).fill(GBC.HORIZONTAL));
    61        
     61
    6262        setEnabled(enabled);
    63        
     63
    6464        dateFrom.addDateListener(changeListener);
    6565        dateTo.addDateListener(changeListener);
    6666        noTimestampCb.addChangeListener(changeListener);
    6767    }
    68    
     68
    6969    private ChangeListener changeListener = new ChangeListener() {
    7070        @Override public void stateChanged(ChangeEvent e) {
    … …  
    7272        }
    7373    };
    74    
     74
    7575    private Timer t = new Timer(200 , new ActionListener() {
    7676        @Override  public void actionPerformed(ActionEvent e) {
    … …  
    7878        }
    7979    });
    80    
     80
    8181    /**
    8282     * Do filtering but little bit later (to reduce cpu load)
    … …  
    8989        }
    9090    }
    91    
     91
    9292    public void applyFilter() {
    9393        t.stop();
    … …  
    9696           filterAppliedListener.actionPerformed(null);
    9797    }
    98    
     98
    9999    /**
    100100     * Called by other components when it is correct time to save date filtering parameters
    … …  
    121121        this.filterAppliedListener = filterAppliedListener;
    122122    }
    123    
     123
    124124    private void filterTracksByDate() {
    125125        Date from = dateFrom.getDate();
    … …  
    130130    @Override
    131131    public final void setEnabled(boolean enabled) {
    132         super.setEnabled(enabled); 
     132        super.setEnabled(enabled);
    133133        for (Component c: getComponents()) {
    134134            c.setEnabled(enabled);

  • trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java

    r7937 r8285  
    2626public class DownloadAlongTrackAction extends DownloadAlongAction {
    2727
    28     static final int NEAR_TRACK = 0;
    29     static final int NEAR_WAYPOINTS = 1;
    30     static final int NEAR_BOTH = 2;
     28    private static final int NEAR_TRACK = 0;
     29    private static final int NEAR_WAYPOINTS = 1;
     30    private static final int NEAR_BOTH = 2;
    3131
    3232    private static final String PREF_DOWNLOAD_ALONG_TRACK_OSM = "downloadAlongTrack.download.osm";

  • trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java

    r7937 r8285  
    7070
    7171    // default access is used to allow changing from plugins
    72     ColorScale velocityScale;
     72    private ColorScale velocityScale;
    7373    /** Colors (without custom alpha channel, if given) for HDOP painting. **/
    74     ColorScale hdopScale;
    75     ColorScale dateScale;
    76     ColorScale directionScale;
     74    private ColorScale hdopScale;
     75    private ColorScale dateScale;
     76    private ColorScale directionScale;
    7777
    7878    /** Opacity for hdop points **/

  • trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/LiteralExpression.java

    r7937 r8285  
    1111 */
    1212public class LiteralExpression implements Expression {
    13     Object literal;
     13    private final Object literal;
    1414
    1515    public LiteralExpression(Object literal) {
    … …  
    3030        return "<" + literal.toString() + ">";
    3131    }
    32 
    3332}

  • trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

    r8237 r8285  
    236236                    if (left.matches(e.withPrimitive(r))) {
    237237                        final List<Node> openEnds = MultipolygonCache.getInstance().get(Main.map.mapView, r).getOpenEnds();
    238                         final int openEndIndex = openEnds.indexOf((Node) e.osm);
     238                        final int openEndIndex = openEnds.indexOf(e.osm);
    239239                        if (openEndIndex >= 0) {
    240240                            e.parent = r;
    … …  
    634634        }
    635635
    636         static final double R = 6378135;
     636        private static final double R = 6378135;
    637637
    638638        public static double level2scale(int lvl) {

  • trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSourceHandler.java

    r7012 r8285  
    1919    private RuleElem rule = new RuleElem();
    2020
    21     XmlStyleSource style;
     21    private XmlStyleSource style;
    2222
    2323    static class RuleElem {
    24         XmlCondition cond = new XmlCondition();
    25         Collection<XmlCondition> conditions;
    26         double scaleMax;
    27         double scaleMin;
    28         LinePrototype line = new LinePrototype();
    29         LinemodPrototype linemod = new LinemodPrototype();
    30         AreaPrototype area = new AreaPrototype();
    31         IconPrototype icon = new IconPrototype();
     24        private XmlCondition cond = new XmlCondition();
     25        private Collection<XmlCondition> conditions;
     26        private double scaleMax;
     27        private double scaleMin;
     28        private LinePrototype line = new LinePrototype();
     29        private LinemodPrototype linemod = new LinemodPrototype();
     30        private AreaPrototype area = new AreaPrototype();
     31        private IconPrototype icon = new IconPrototype();
    3232        public void init() {
    3333            conditions = null;

  • trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java

    r7082 r8285  
    5252
    5353    private static class SessionId {
    54         String id;
    55         String token;
    56         String userName;
     54        private String id;
     55        private String token;
     56        private String userName;
    5757    }
    5858

  • trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java

    r8074 r8285  
    153153    private final List<PreferenceSetting> settingsInitialized = new ArrayList<>();
    154154
    155     List<ValidationListener> validationListeners = new ArrayList<>();
     155    final List<ValidationListener> validationListeners = new ArrayList<>();
    156156
    157157    /**
    … …  
    403403                        }
    404404                    } while (removed);
    405                    
     405
    406406                    if (!toLoad.isEmpty()) {
    407407                        PluginHandler.loadPlugins(PreferenceTabbedPane.this, toLoad, null);

  • trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

    r7578 r8285  
    939939     */
    940940    class MoveUpDownAction extends AbstractAction implements ListSelectionListener, TableModelListener {
    941         final int increment;
     941        private final int increment;
    942942        public MoveUpDownAction(boolean isDown) {
    943943            increment = isDown ? 1 : -1;

  • trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

    r7687 r8285  
    393393
    394394    private class ToolbarPopupMenu extends JPopupMenu  {
    395         ActionDefinition act;
     395        private ActionDefinition act;
    396396
    397397        private void setActionAndAdapt(ActionDefinition action) {
    … …  
    402402        }
    403403
    404         JMenuItem remove = new JMenuItem(new AbstractAction(tr("Remove from toolbar")) {
     404        private JMenuItem remove = new JMenuItem(new AbstractAction(tr("Remove from toolbar")) {
    405405            @Override
    406406            public void actionPerformed(ActionEvent e) {
    … …  
    416416                });
    417417
    418         JMenuItem configure = new JMenuItem(new AbstractAction(tr("Configure toolbar")) {
     418        private JMenuItem configure = new JMenuItem(new AbstractAction(tr("Configure toolbar")) {
    419419            @Override
    420420            public void actionPerformed(ActionEvent e) {
    … …  
    425425            });
    426426
    427         JMenuItem shortcutEdit = new JMenuItem(new AbstractAction(tr("Edit shortcut")) {
     427        private JMenuItem shortcutEdit = new JMenuItem(new AbstractAction(tr("Edit shortcut")) {
    428428            @Override
    429429            public void actionPerformed(ActionEvent e) {
    … …  
    437437            });
    438438
    439         JCheckBoxMenuItem doNotHide = new JCheckBoxMenuItem(new AbstractAction(tr("Do not hide toolbar and menu")) {
     439        private JCheckBoxMenuItem doNotHide = new JCheckBoxMenuItem(new AbstractAction(tr("Do not hide toolbar and menu")) {
    440440            @Override
    441441            public void actionPerformed(ActionEvent e) {
    … …  
    625625
    626626            ListCellRenderer<ActionDefinition> renderer = new ListCellRenderer<ActionDefinition>() {
    627                 final DefaultListCellRenderer def = new DefaultListCellRenderer();
     627                private final DefaultListCellRenderer def = new DefaultListCellRenderer();
    628628                @Override
    629629                public Component getListCellRendererComponent(JList<? extends ActionDefinition> list,

  • trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java

    r7834 r8285  
    160160        p.add(more, GBC.std().insets(5,5,0,0));
    161161        more.addActionListener(new ActionListener() {
    162             JPopupMenu menu = buildPopupMenu();
     162            private JPopupMenu menu = buildPopupMenu();
    163163            @Override public void actionPerformed(ActionEvent ev) {
    164164                menu.show(more, 0, 0);
    … …  
    312312    }
    313313
    314     Map<String,String> profileTypes = new LinkedHashMap<>();
     314    private Map<String,String> profileTypes = new LinkedHashMap<>();
    315315
    316316    private JPopupMenu buildPopupMenu() {

  • trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java

    r7005 r8285  
    3030public class ListEditor extends ExtendedDialog {
    3131
    32     List<String> data;
    33     PrefEntry entry;
     32    private List<String> data;
     33    private PrefEntry entry;
    3434
    3535    /**

  • trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java

    r7005 r8285  
    3838public class ListListEditor extends ExtendedDialog {
    3939
    40     EntryListModel entryModel;
    41     List<List<String>> data;
    42     PrefEntry entry;
    43 
    44     JList<String> entryList;
    45     Integer entryIdx;
    46     JTable table;
    47 
    48     ListTableModel tableModel;
     40    private EntryListModel entryModel;
     41    private List<List<String>> data;
     42    private PrefEntry entry;
     43
     44    private JList<String> entryList;
     45    private Integer entryIdx;
     46    private JTable table;
     47
     48    private ListTableModel tableModel;
    4949
    5050    /**

  • trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java

    r7005 r8285  
    4242public class MapListEditor extends ExtendedDialog {
    4343
    44     EntryListModel entryModel;
    45     PrefEntry entry;
    46 
    47     JList<String> entryList;
    48     JTable table;
    49     MapTableModel tableModel;
    50 
    51     List<List<String>> dataKeys;
    52     List<List<String>> dataValues;
    53     Integer entryIdx;
     44    private EntryListModel entryModel;
     45    private PrefEntry entry;
     46
     47    private JList<String> entryList;
     48    private JTable table;
     49    private MapTableModel tableModel;
     50
     51    private List<List<String>> dataKeys;
     52    private List<List<String>> dataValues;
     53    private Integer entryIdx;
    5454
    5555    public MapListEditor(JComponent gui, PrefEntry entry, MapListSetting setting) {

  • trunk/src/org/openstreetmap/josm/gui/preferences/advanced/StringEditor.java

    r6890 r8285  
    2020public class StringEditor extends ExtendedDialog {
    2121
    22     PrefEntry entry;
    23     JosmTextField tvalue;
     22    private PrefEntry entry;
     23    private JosmTextField tvalue;
    2424
    2525    /**

  • trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java

    r7578 r8285  
    9191
    9292        lafCombo.setRenderer(new ListCellRenderer<LookAndFeelInfo>(){
    93             final DefaultListCellRenderer def = new DefaultListCellRenderer();
     93            private final DefaultListCellRenderer def = new DefaultListCellRenderer();
    9494            @Override
    9595            public Component getListCellRendererComponent(JList<? extends LookAndFeelInfo> list, LookAndFeelInfo value,

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

    r8066 r8285  
    792792
    793793    static class OffsetBookmarksPanel extends JPanel {
    794         List<OffsetBookmark> bookmarks = OffsetBookmark.allBookmarks;
    795         OffsetsBookmarksModel model = new OffsetsBookmarksModel();
     794        private List<OffsetBookmark> bookmarks = OffsetBookmark.allBookmarks;
     795        private OffsetsBookmarksModel model = new OffsetsBookmarksModel();
    796796
    797797        public OffsetBookmarksPanel(final PreferenceTabbedPane gui) {

  • trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java

    r7937 r8285  
    3434public class CodeProjectionChoice extends AbstractProjectionChoice implements SubPrefsOptions {
    3535
    36     String code;
     36    private String code;
    3737
    3838    /**
    … …  
    4848        private ProjectionCodeListModel model;
    4949        public JList<String> selectionList;
    50         List<String> data;
    51         List<String> filteredData;
    52         static final String DEFAULT_CODE = "EPSG:3857";
    53         String lastCode = DEFAULT_CODE;
    54         ActionListener listener;
     50        private List<String> data;
     51        private List<String> filteredData;
     52        private static final String DEFAULT_CODE = "EPSG:3857";
     53        private String lastCode = DEFAULT_CODE;
     54        private ActionListener listener;
    5555
    5656        public CodeSelectionPanel(String initialCode, ActionListener listener) {
    … …  
    6868         */
    6969        private static class CodeComparator implements Comparator<String> {
    70             final Pattern codePattern = Pattern.compile("([a-zA-Z]+):(\\d+)");
     70            private final Pattern codePattern = Pattern.compile("([a-zA-Z]+):(\\d+)");
    7171            @Override
    7272            public int compare(String c1, String c2) {

  • trunk/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreference.java

    r7937 r8285  
    2626    }
    2727
    28     AuthenticationPreferencesPanel pnlAuthPreferences;
     28    private AuthenticationPreferencesPanel pnlAuthPreferences;
    2929
    3030    private AuthenticationPreference() {

  • trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java

    r7834 r8285  
    9999    private JosmComboBox<String> tfKey = new JosmComboBox<>();
    100100
    101     JTable shortcutTable = new JTable();
     101    private JTable shortcutTable = new JTable();
    102102
    103103    private JosmTextField filterField = new JosmTextField();

  • trunk/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java

    r7005 r8285  
    1010
    1111    private static class Request {
    12         AbstractProgressMonitor originator;
    13         int childTicks;
    14         double currentValue;
    15 
    16         String title;
    17         String customText;
    18         String extraText;
    19         Boolean intermediate;
    20 
    21         boolean finishRequested;
     12        private AbstractProgressMonitor originator;
     13        private int childTicks;
     14        private double currentValue;
     15
     16        private String title;
     17        private String customText;
     18        private String extraText;
     19        private Boolean intermediate;
     20
     21        private boolean finishRequested;
    2222    }
    2323
    … …  
    2828    protected State state = State.INIT;
    2929
    30     int ticksCount;
    31     int ticks;
     30    private int ticksCount;
     31    private int ticks;
    3232    private int childTicks;
    3333

  • trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java

    r7509 r8285  
    614614     */
    615615    class CellEditorRemover implements PropertyChangeListener {
    616         KeyboardFocusManager focusManager;
     616        private KeyboardFocusManager focusManager;
    617617
    618618        public CellEditorRemover(KeyboardFocusManager fm) {

  • trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

    r8274 r8285  
    199199
    200200    private static class PresetPanel extends JPanel {
    201         boolean hasElements = false;
     201        private boolean hasElements = false;
    202202        PresetPanel() {
    203203            super(new GridBagLayout());

  • trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java

    r7937 r8285  
    289289
    290290    public static class Usage {
    291         TreeSet<String> values;
    292         boolean hadKeys = false;
    293         boolean hadEmpty = false;
     291        private TreeSet<String> values;
     292        private boolean hadKeys = false;
     293        private boolean hadEmpty = false;
    294294
    295295        public boolean hasUniqueValue() {
    … …  
    11681168        private static final ListCellRenderer<PresetListEntry> RENDERER = new ListCellRenderer<PresetListEntry>() {
    11691169
    1170             JLabel lbl = new JLabel();
     1170            private JLabel lbl = new JLabel();
    11711171
    11721172            @Override

  • trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSelector.java

    r7937 r8285  
    8585
    8686    private static class ResultListCellRenderer implements ListCellRenderer<TaggingPreset> {
    87         final DefaultListCellRenderer def = new DefaultListCellRenderer();
     87        private final DefaultListCellRenderer def = new DefaultListCellRenderer();
    8888        @Override
    8989        public Component getListCellRendererComponent(JList<? extends TaggingPreset> list, TaggingPreset tp, int index, boolean isSelected, boolean cellHasFocus) {

  • trunk/src/org/openstreetmap/josm/gui/util/HighlightHelper.java

    r7937 r8285  
    1818 */
    1919public class HighlightHelper {
    20     Set<OsmPrimitive> highlightedPrimitives = new HashSet<>();
     20    private final Set<OsmPrimitive> highlightedPrimitives = new HashSet<>();
    2121
    2222    /**

  • trunk/src/org/openstreetmap/josm/io/NoteReader.java

    r8225 r8285  
    5757        private Boolean commentIsNew;
    5858        private List<Note> notes;
    59         String commentText;
     59        private String commentText;
    6060
    6161        @Override

  • trunk/src/org/openstreetmap/josm/io/OsmApi.java

    r7748 r8285  
    167167        private static final String CAPABILITIES = "capabilities";
    168168
    169         ProgressMonitor monitor;
    170         boolean fastFail;
     169        private ProgressMonitor monitor;
     170        private boolean fastFail;
    171171
    172172        public CapabilitiesCache(ProgressMonitor monitor, boolean fastFail) {

  • trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java

    r8126 r8285  
    5757    private static final int MSECS_PER_MINUTE = MSECS_PER_SECOND * SECONDS_PER_MINUTE;
    5858
    59     long uploadStartTime;
     59    private long uploadStartTime;
    6060
    6161    public String timeLeft(int progress, int list_size) {

  • trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java

    r8091 r8285  
    7272        private Stack<State> states;
    7373
    74         List<ImageryInfo> entries;
     74        private List<ImageryInfo> entries;
    7575
    7676        /**
    … …  
    7878         * that this version of JOSM cannot process.
    7979         */
    80         boolean skipEntry;
    81 
    82         ImageryInfo entry;
    83         ImageryBounds bounds;
    84         Shape shape;
     80        private boolean skipEntry;
     81
     82        private ImageryInfo entry;
     83        private ImageryBounds bounds;
     84        private Shape shape;
    8585        // language of last element, does only work for simple ENTRY_ATTRIBUTE's
    86         String lang;
    87         List<String> projections;
    88 
    89         @Override public void startDocument() {
     86        private String lang;
     87        private List<String> projections;
     88
     89        @Override
     90        public void startDocument() {
    9091            accumulator = new StringBuffer();
    9192            skipEntry = false;

  • trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java

    r7679 r8285  
    5757     */
    5858    static class DeleteTagMarker {
    59         int num;
     59        private int num;
    6060        public DeleteTagMarker(int num) {
    6161            this.num = num;
    … …  
    7171     */
    7272    static class ExistingValues {
    73         String tag;
    74         Map<String, Integer> valueCount;
     73        private String tag;
     74        private Map<String, Integer> valueCount;
    7575        public ExistingValues(String tag) {
    7676            this.tag=tag; valueCount=new HashMap<>();
    … …  
    126126
    127127        final DefaultTableModel tm = new DefaultTableModel(new String[] {tr("Assume"), tr("Key"), tr("Value"), tr("Existing values")}, tags.length) {
    128             final Class<?>[] types = {Boolean.class, String.class, Object.class, ExistingValues.class};
     128            private final Class<?>[] types = {Boolean.class, String.class, Object.class, ExistingValues.class};
    129129            @Override
    130130            public Class<?> getColumnClass(int c) {

  • trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java

    r7937 r8285  
    3737
    3838    private final List<LatLon> allCoordinates = new ArrayList<>();
    39    
     39
    4040    private Way way;
    4141
    … …  
    4343     * The place to remeber already added nodes (they are reused if needed @since 5845
    4444     */
    45     Map<LatLon, Node> addedNodes;
     45    private Map<LatLon, Node> addedNodes;
    4646
    4747    @Override

  • trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java

    r8126 r8285  
    4848    private static class BugReporterThread extends Thread {
    4949
    50         final Throwable e;
     50        private final Throwable e;
    5151
    5252        public BugReporterThread(Throwable t) {

  • trunk/src/org/openstreetmap/josm/tools/CopyList.java

    r7005 r8285  
    148148         * Index of element to be returned by subsequent call to next.
    149149         */
    150         int cursor = 0;
     150        private int cursor = 0;
    151151
    152152        /**
    … …  
    155155         * to remove.
    156156         */
    157         int lastRet = -1;
     157        private int lastRet = -1;
    158158
    159159        /**
    … …  
    162162         * has detected concurrent modification.
    163163         */
    164         int expectedModCount = modCount;
     164        private int expectedModCount = modCount;
    165165
    166166        @Override

  • trunk/src/org/openstreetmap/josm/tools/Diff.java

    r7801 r8285  
    934934
    935935        /** Number of elements (lines) in this file. */
    936         final int buffered_lines;
     936        private final int buffered_lines;
    937937
    938938        /** Vector, indexed by line number, containing an equivalence code for
    … …  
    943943        /** Vector, like the previous one except that
    944944           the elements for discarded lines have been squeezed out.  */
    945         final int[]    undiscarded;
     945        private final int[]    undiscarded;
    946946
    947947        /** Vector mapping virtual line numbers (not counting discarded lines)
    948948           to real ones (counting those lines).  Both are origin-0.  */
    949         final int[]    realindexes;
     949        private final int[]    realindexes;
    950950
    951951        /** Total number of nondiscarded lines. */
    952         int         nondiscarded_lines;
     952        private int         nondiscarded_lines;
    953953
    954954        /** Array, indexed by real origin-1 line number,
    955955           containing true for a line that is an insertion or a deletion.
    956956           The results of comparison are stored here.  */
    957         boolean[]       changed_flag;
     957        private boolean[]       changed_flag;
    958958    }
    959959}

  • trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

    r8149 r8285  
    11901190
    11911191    /** 90 degrees in radians units */
    1192     static final double DEGREE_90 = 90.0 * Math.PI / 180.0;
     1192    private static final double DEGREE_90 = 90.0 * Math.PI / 180.0;
    11931193
    11941194    /**

  • trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java

    r8126 r8285  
    6767    private class MyAction extends AbstractAction {
    6868
    69         final MultikeyShortcutAction action;
    70         final Shortcut shortcut;
     69        private final MultikeyShortcutAction action;
     70        private final Shortcut shortcut;
    7171
    7272        MyAction(MultikeyShortcutAction action) {

  • trunk/src/org/openstreetmap/josm/tools/SubclassFilteredCollection.java

    r7395 r8285  
    2020    private final Collection<? extends S> collection;
    2121    private final Predicate<? super S> predicate;
    22     int size = -1;
     22    private int size = -1;
    2323
    2424    private class FilterIterator implements Iterator<T> {

  • trunk/src/org/openstreetmap/josm/tools/TextTagParser.java

    r8061 r8285  
    4040
    4141    public static class TextAnalyzer {
    42         boolean quotesStarted = false;
    43         boolean esc = false;
    44         StringBuilder s = new StringBuilder(200);
    45         int pos;
    46         String data;
    47         int n;
     42        private boolean quotesStarted = false;
     43        private boolean esc = false;
     44        private StringBuilder s = new StringBuilder(200);
     45        private int pos;
     46        private String data;
     47        private int n;
    4848
    4949        public TextAnalyzer(String text) {

  • trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java

    r7889 r8285  
    6868
    6969    private class Parser extends DefaultHandler {
    70         Stack<Object> current = new Stack<>();
    71         StringBuilder characters = new StringBuilder(64);
     70        private Stack<Object> current = new Stack<>();
     71        private StringBuilder characters = new StringBuilder(64);
    7272
    7373        private Locator locator;
    … …  
    185185
    186186    private static class Entry {
    187         Class<?> klass;
    188         boolean onStart;
    189         boolean both;
     187        private Class<?> klass;
     188        private boolean onStart;
     189        private boolean both;
    190190        private final Map<String, Field> fields = new HashMap<>();
    191191        private final Map<String, Method> methods = new HashMap<>();

  • trunk/src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java

    r7937 r8285  
    4141
    4242    private abstract class ContextProvider extends Match {
    43         Match condition;
     43        protected Match condition;
    4444        abstract List<OsmPrimitive> getPrimitives(OsmPrimitive root);
    4545    }
Note: See TracChangeset for help on using the changeset viewer.