Changeset 8840 in josm


Ignore:
Timestamp:
2015-10-09T02:12:45+02:00 (4 years ago)
Author:
Don-vip
Message:

sonar - squid:S3052 - Fields should not be initialized to default values

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

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/Main.java

    r8809 r8840  
    528528    }
    529529
    530     private static volatile InitStatusListener initListener = null;
     530    private static volatile InitStatusListener initListener;
    531531
    532532    public interface InitStatusListener {
  • trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java

    r8795 r8840  
    6262        private double angle;
    6363        private EastNorth origin = new EastNorth(0, 0);
    64         private double azimuth = 0;
     64        private double azimuth;
    6565
    6666        PolarCoor(double radius, double angle) {
  • trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

    r8513 r8840  
    464464
    465465        private Set<NodePair> edges;
    466         private int numUndirectedEges = 0;
     466        private int numUndirectedEges;
    467467        private Map<Node, List<NodePair>> successors;
    468468        private Map<Node, List<NodePair>> predecessors;
  • trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

    r8836 r8840  
    5555    // This will be used to commit commands and unite them into one large command sequence at the end
    5656    private final LinkedList<Command> cmds = new LinkedList<>();
    57     private int cmdsCount = 0;
     57    private int cmdsCount;
    5858    private final transient List<Relation> addedRelations = new LinkedList<>();
    5959
  • trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java

    r8757 r8840  
    101101        private final FileFilter fileFilter;
    102102        private boolean canceled;
    103         private boolean recordHistory = false;
     103        private boolean recordHistory;
    104104
    105105        public OpenFileTask(final List<File> files, final FileFilter fileFilter, final String title) {
  • trunk/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java

    r8510 r8840  
    1313public abstract class AbstractDownloadTask implements DownloadTask {
    1414    private List<Object> errorMessages;
    15     private boolean canceled = false;
    16     private boolean failed = false;
     15    private boolean canceled;
     16    private boolean failed;
    1717
    1818    public AbstractDownloadTask() {
  • trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java

    r8836 r8840  
    4444    private static final String PATTERN_EXTERNAL_GPX_FILE = "https?://.*/(.*\\.gpx)";
    4545
    46     protected String newLayerName = null;
     46    protected String newLayerName;
    4747
    4848    @Override
  • trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

    r8540 r8840  
    4747    protected DownloadTask downloadTask;
    4848
    49     protected String newLayerName = null;
     49    protected String newLayerName;
    5050
    5151    @Override
  • trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

    r8674 r8840  
    4747public class DeleteAction extends MapMode implements ModifierListener {
    4848    // Cache previous mouse event (needed when only the modifier keys are pressed but the mouse isn't moved)
    49     private MouseEvent oldEvent = null;
     49    private MouseEvent oldEvent;
    5050
    5151    /**
     
    5454     * set would have to be checked.
    5555     */
    56     private transient WaySegment oldHighlightedWaySegment = null;
     56    private transient WaySegment oldHighlightedWaySegment;
    5757
    5858    private static final HighlightHelper highlightHelper = new HighlightHelper();
  • trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

    r8836 r8840  
    8080    private final Cursor cursorJoinWay;
    8181
    82     private transient Node lastUsedNode = null;
     82    private transient Node lastUsedNode;
    8383    private double toleranceMultiplier;
    8484
     
    9494    private transient Set<OsmPrimitive> newHighlights = new HashSet<>();
    9595    private boolean drawHelperLine;
    96     private boolean wayIsFinished = false;
     96    private boolean wayIsFinished;
    9797    private boolean drawTargetHighlight;
    9898    private Point mousePos;
  • trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

    r8839 r8840  
    6969     * If {@code true}, when extruding create new node(s) even if segments are parallel.
    7070     */
    71     private boolean alwaysCreateNodes = false;
     71    private boolean alwaysCreateNodes;
    7272    private boolean nodeDragWithoutCtrl;
    7373
    74     private long mouseDownTime = 0;
    75     private transient WaySegment selectedSegment = null;
    76     private transient Node selectedNode = null;
     74    private long mouseDownTime;
     75    private transient WaySegment selectedSegment;
     76    private transient Node selectedNode;
    7777    private Color mainColor;
    7878    private transient Stroke mainStroke;
     
    180180    private transient ReferenceSegment dualAlignSegment1, dualAlignSegment2;
    181181    /** {@code true}, if new segment was collapsed */
    182     private boolean dualAlignSegmentCollapsed = false;
     182    private boolean dualAlignSegmentCollapsed;
    183183    // Dual alignment UI stuff
    184184    private final DualAlignChangeAction dualAlignChangeAction;
  • trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java

    r8510 r8840  
    6565
    6666    private transient Way targetWay;
    67     private transient Node candidateNode = null;
    68     private transient WaySegment candidateSegment = null;
    69 
    70     private Point mousePos = null;
    71     private boolean dragging = false;
     67    private transient Node candidateNode;
     68    private transient WaySegment candidateSegment;
     69
     70    private Point mousePos;
     71    private boolean dragging;
    7272
    7373    private final Cursor cursorSelect;
     
    8686    private int dotSize;
    8787
    88     private boolean selectionChangedBlocked = false;
     88    private boolean selectionChangedBlocked;
    8989
    9090    protected String oldModeHelpText;
  • trunk/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java

    r8444 r8840  
    2020public class PlayHeadDragMode extends MapMode {
    2121
    22     private boolean dragging = false;
    23     private Point mousePos = null;
    24     private Point mouseStart = null;
    25     private transient PlayHeadMarker playHeadMarker = null;
     22    private boolean dragging;
     23    private Point mousePos;
     24    private Point mouseStart;
     25    private transient PlayHeadMarker playHeadMarker;
    2626
    2727    /**
  • trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

    r8836 r8840  
    116116    }
    117117
    118     private boolean lassoMode = false;
     118    private boolean lassoMode;
    119119    public boolean repeatedKeySwitchLassoOption;
    120120
    121121    // Cache previous mouse event (needed when only the modifier keys are
    122122    // pressed but the mouse isn't moved)
    123     private MouseEvent oldEvent = null;
    124 
    125     private Mode mode = null;
     123    private MouseEvent oldEvent;
     124
     125    private Mode mode;
    126126    private final transient SelectionManager selectionManager;
    127     private boolean cancelDrawMode = false;
     127    private boolean cancelDrawMode;
    128128    private boolean drawTargetHighlight;
    129     private boolean didMouseDrag = false;
     129    private boolean didMouseDrag;
    130130    /**
    131131     * The component this SelectAction is associated with.
     
    147147     * The time of the user mouse down event.
    148148     */
    149     private long mouseDownTime = 0;
     149    private long mouseDownTime;
    150150    /**
    151151     * The pressed button of the user mouse down event.
    152152     */
    153     private int mouseDownButton = 0;
     153    private int mouseDownButton;
    154154    /**
    155155     * The time of the user mouse down event.
    156156     */
    157     private long mouseReleaseTime = 0;
     157    private long mouseReleaseTime;
    158158    /**
    159159     * The time which needs to pass between click and release before something
     
    166166     */
    167167    private int initialMoveThreshold;
    168     private boolean initialMoveThresholdExceeded = false;
     168    private boolean initialMoveThresholdExceeded;
    169169
    170170    /**
     
    991991
    992992        private Collection<OsmPrimitive> cycleList = Collections.emptyList();
    993         private boolean cyclePrims = false;
    994         private OsmPrimitive cycleStart = null;
     993        private boolean cyclePrims;
     994        private OsmPrimitive cycleStart;
    995995        private boolean waitForMouseUpParameter;
    996996        private boolean multipleMatchesParameter;
     
    11301130    private class VirtualManager {
    11311131
    1132         private Node virtualNode = null;
     1132        private Node virtualNode;
    11331133        private Collection<WaySegment> virtualWays = new LinkedList<>();
    11341134        private int nodeVirtualSize;
  • trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

    r8836 r8840  
    125125    }
    126126
    127     private static volatile SearchSetting lastSearch = null;
     127    private static volatile SearchSetting lastSearch;
    128128
    129129    /**
  • trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

    r8838 r8840  
    6262public class SearchCompiler {
    6363
    64     private boolean caseSensitive = false;
    65     private boolean regexSearch = false;
     64    private boolean caseSensitive;
     65    private boolean regexSearch;
    6666    private static String  rxErrorMsg = marktr("The regex \"{0}\" had a parse error at offset {1}, full error:\n\n{2}");
    6767    private static String  rxErrorMsgNoPos = marktr("The regex \"{0}\" had a parse error, full error:\n\n{1}");
  • trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java

    r8836 r8840  
    3939    private class UploadTask extends PleaseWaitRunnable {
    4040
    41         private boolean isCanceled = false;
     41        private boolean isCanceled;
    4242        private Map<Note, Note> updatedNotes = new HashMap<>();
    4343        private Map<Note, Exception> failedNotes = new HashMap<>();
  • trunk/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java

    r8512 r8840  
    2929
    3030    // only filled on undo
    31     private List<OsmPrimitive> createdPrimitives = null;
    32     private Collection<OsmPrimitive> createdPrimitivesToSelect = null;
     31    private List<OsmPrimitive> createdPrimitives;
     32    private Collection<OsmPrimitive> createdPrimitivesToSelect;
    3333
    3434    /**
  • trunk/src/org/openstreetmap/josm/command/RotateCommand.java

    r8456 r8840  
    2525     * angle of rotation starting click to pivot
    2626     */
    27     private double startAngle = 0.0;
     27    private double startAngle;
    2828
    2929    /**
    3030     * computed rotation angle between starting click and current mouse pos
    3131     */
    32     private double rotationAngle = 0.0;
     32    private double rotationAngle;
    3333
    3434    /**
  • trunk/src/org/openstreetmap/josm/command/ScaleCommand.java

    r8456 r8840  
    2424     * World position of the mouse when the user started the command.
    2525     */
    26     private EastNorth startEN = null;
     26    private EastNorth startEN;
    2727
    2828    /**
  • trunk/src/org/openstreetmap/josm/command/SequenceCommand.java

    r8510 r8840  
    2727    private final String name;
    2828    /** Determines if the sequence execution should continue after one of its commands fails. */
    29     public boolean continueOnError = false;
     29    public boolean continueOnError;
    3030
    3131    /**
  • trunk/src/org/openstreetmap/josm/corrector/CorrectionTable.java

    r8510 r8840  
    3232    }
    3333
    34     private static volatile BoldRenderer boldRenderer = null;
     34    private static volatile BoldRenderer boldRenderer;
    3535
    3636    protected CorrectionTable(T correctionTableModel) {
  • trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java

    r8510 r8840  
    321321    }
    322322
    323     private static boolean busy = false;
     323    private static boolean busy;
    324324
    325325    public static void pluginOperation(String install, String uninstall, String delete)  {
  • trunk/src/org/openstreetmap/josm/data/Preferences.java

    r8836 r8840  
    101101     * @see #getPreferencesDirectory()
    102102     */
    103     private File preferencesDir = null;
     103    private File preferencesDir;
    104104
    105105    /**
    106106     * Internal storage for the cache directory.
    107107     */
    108     private File cacheDir = null;
     108    private File cacheDir;
    109109
    110110    /**
    111111     * Internal storage for the user data directory.
    112112     */
    113     private File userdataDir = null;
     113    private File userdataDir;
    114114
    115115    /**
  • trunk/src/org/openstreetmap/josm/data/cache/BufferedImageCacheEntry.java

    r8624 r8840  
    1717    private static final long serialVersionUID = 1L; //version
    1818    // transient to avoid serialization, volatile to avoid synchronization of whole getImage() method
    19     private transient volatile BufferedImage img = null;
    20     private transient volatile boolean writtenToDisk = false;
     19    private transient volatile BufferedImage img;
     20    private transient volatile boolean writtenToDisk;
    2121    // we need to have separate control variable, to know, if we already tried to load the image, as img might be null
    2222    // after we loaded image, as for example, when image file is malformed (eg. HTML file)
    23     private transient volatile boolean imageLoaded = false;
     23    private transient volatile boolean imageLoaded;
    2424
    2525    /**
  • trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java

    r8659 r8840  
    3838    private static final Logger LOG = FeatureAdapter.getLogger(JCSCacheManager.class.getCanonicalName());
    3939
    40     private static volatile CompositeCacheManager cacheManager = null;
     40    private static volatile CompositeCacheManager cacheManager;
    4141    private static long maxObjectTTL        = -1;
    4242    private static final String PREFERENCE_PREFIX = "jcs.cache";
    4343    private static final AuxiliaryCacheFactory diskCacheFactory = new IndexedDiskCacheFactory();
    44     private static FileLock cacheDirLock = null;
     44    private static FileLock cacheDirLock;
    4545
    4646    /**
  • trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java

    r8800 r8840  
    8989    private ICacheAccess<K, V> cache;
    9090    private ICacheElement<K, V> cacheElement;
    91     protected V cacheData = null;
    92     protected CacheEntryAttributes attributes = null;
     91    protected V cacheData;
     92    protected CacheEntryAttributes attributes;
    9393
    9494    // HTTP connection parameters
     
    9898    private ThreadPoolExecutor downloadJobExecutor;
    9999    private Runnable finishTask;
    100     private boolean force = false;
     100    private boolean force;
    101101
    102102    /**
  • trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

    r8674 r8840  
    164164    private String langName;
    165165    /** whether this is a entry activated by default or not */
    166     private boolean defaultEntry = false;
     166    private boolean defaultEntry;
    167167    /** The data part of HTTP cookies header in case the service requires cookies to work */
    168     private String cookies = null;
     168    private String cookies;
    169169    /** Whether this service requires a explicit EULA acceptance before it can be activated */
    170     private String eulaAcceptanceRequired = null;
     170    private String eulaAcceptanceRequired;
    171171    /** type of the imagery servics - WMS, TMS, ... */
    172172    private ImageryType imageryType = ImageryType.WMS;
    173     private double pixelPerDegree = 0.0;
     173    private double pixelPerDegree;
    174174    /** maximum zoom level for TMS imagery */
    175     private int defaultMaxZoom = 0;
     175    private int defaultMaxZoom;
    176176    /** minimum zoom level for TMS imagery */
    177     private int defaultMinZoom = 0;
     177    private int defaultMinZoom;
    178178    /** display bounds of imagery, displayed in prefs and used for automatic imagery selection */
    179     private ImageryBounds bounds = null;
     179    private ImageryBounds bounds;
    180180    /** projections supported by WMS servers */
    181181    private List<String> serverProjections;
  • trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java

    r8742 r8840  
    9494     * know what id it will get.
    9595     */
    96     protected long id = 0;
     96    protected long id;
    9797
    9898    /**
     
    100100     * Never changed by JOSM.
    101101     */
    102     protected User user = null;
     102    protected User user;
    103103
    104104    /**
     
    106106     * ensure update consistency
    107107     */
    108     protected int version = 0;
     108    protected int version;
    109109
    110110    /**
  • trunk/src/org/openstreetmap/josm/data/osm/Changeset.java

    r8512 r8840  
    4646    private boolean incomplete;
    4747    /** the changeset content */
    48     private ChangesetDataSet content = null;
     48    private ChangesetDataSet content;
    4949    /** the changeset discussion */
    50     private List<ChangesetDiscussionComment> discussion = null;
     50    private List<ChangesetDiscussionComment> discussion;
    5151
    5252    /**
  • trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

    r8512 r8840  
    121121    private int highlightUpdateCount;
    122122
    123     private boolean uploadDiscouraged = false;
     123    private boolean uploadDiscouraged;
    124124
    125125    private final ReadWriteLock lock = new ReentrantReadWriteLock();
  • trunk/src/org/openstreetmap/josm/data/osm/Filter.java

    r8812 r8840  
    1515
    1616    public boolean enable = true;
    17     public boolean hiding = false;
    18     public boolean inverted = false;
     17    public boolean hiding;
     18    public boolean inverted;
    1919
    2020    /**
     
    4848    public static class FilterPreferenceEntry {
    4949        @pref @writeExplicitly public String version = "1";
    50         @pref public String text = null;
     50        @pref public String text;
    5151        @pref @writeExplicitly public String mode = "add";
    52         @pref public boolean case_sensitive = false;
    53         @pref public boolean regex_search = false;
    54         @pref public boolean mapCSS_search = false;
     52        @pref public boolean case_sensitive;
     53        @pref public boolean regex_search;
     54        @pref public boolean mapCSS_search;
    5555        @pref @writeExplicitly public boolean enable = true;
    56         @pref @writeExplicitly public boolean hiding = false;
    57         @pref @writeExplicitly public boolean inverted = false;
     56        @pref @writeExplicitly public boolean hiding;
     57        @pref @writeExplicitly public boolean inverted;
    5858    }
    5959
  • trunk/src/org/openstreetmap/josm/data/osm/NoteData.java

    r8510 r8840  
    2727
    2828    private final Storage<Note> noteList;
    29     private Note selectedNote = null;
     29    private Note selectedNote;
    3030    private Comparator<Note> comparator = DEFAULT_COMPARATOR;
    3131
  • trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

    r8811 r8840  
    291291     * MAPPAINT
    292292     *--------*/
    293     public StyleCache mappaintStyle = null;
     293    public StyleCache mappaintStyle;
    294294    public int mappaintCacheIdx;
    295295
     
    653653     *--------------------------------------------------*/
    654654
    655     private static volatile Collection<String> workinprogress = null;
    656     private static volatile Collection<String> uninteresting = null;
    657     private static volatile Collection<String> discardable = null;
     655    private static volatile Collection<String> workinprogress;
     656    private static volatile Collection<String> uninteresting;
     657    private static volatile Collection<String> discardable;
    658658
    659659    /**
     
    777777    }
    778778
    779     private static volatile Match directionKeys = null;
    780     private static volatile Match reversedDirectionKeys = null;
     779    private static volatile Match directionKeys;
     780    private static volatile Match reversedDirectionKeys;
    781781
    782782    /**
  • trunk/src/org/openstreetmap/josm/data/osm/Storage.java

    r8510 r8840  
    8989    private int mask;
    9090    private int size;
    91     private volatile int modCount = 0;
     91    private volatile int modCount;
    9292    private double loadFactor = 0.6d;
    9393    private static final int DEFAULT_CAPACITY = 16;
     
    459459    private final class SafeReadonlyIter implements Iterator<T> {
    460460        private final T[] data;
    461         private int slot = 0;
     461        private int slot;
    462462
    463463        SafeReadonlyIter(T[] data) {
     
    491491    private final class Iter implements Iterator<T> {
    492492        private final int mods;
    493         private int slot = 0;
     493        private int slot;
    494494        private int removeSlot = -1;
    495495
  • trunk/src/org/openstreetmap/josm/data/osm/User.java

    r8588 r8840  
    2424public final class User {
    2525
    26     private static long uidCounter = 0;
     26    private static long uidCounter;
    2727
    2828    /**
     
    5959    }
    6060
    61     private static User lastUser = null;
     61    private static User lastUser;
    6262
    6363    /**
  • trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java

    r8510 r8840  
    2323public class BoundingXYVisitor extends AbstractVisitor {
    2424
    25     private ProjectionBounds bounds = null;
     25    private ProjectionBounds bounds;
    2626
    2727    @Override
  • trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java

    r8540 r8840  
    109109
    110110    private final List<Descriptor> descriptors = new ArrayList<>();
    111     private Class<? extends AbstractMapRenderer> activeRenderer = null;
     111    private Class<? extends AbstractMapRenderer> activeRenderer;
    112112
    113113    private MapRendererFactory() {
  • trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java

    r8674 r8840  
    3535    private final Color defaultColor;
    3636
    37     private static volatile Color backgroundColorCache = null;
     37    private static volatile Color backgroundColorCache;
    3838
    3939    private static final MapPaintSylesUpdateListener styleOverrideListener = new MapPaintSylesUpdateListener() {
  • trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

    r8839 r8840  
    103103        private int idx;
    104104
    105         private Point prev = null;
     105        private Point prev;
    106106        /* 'prev0' is a point that has distance 'offset' from 'prev' and the
    107107         * line from 'prev' to 'prev0' is perpendicular to the way segment from
  • trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java

    r8512 r8840  
    7474
    7575    /** Color cache to draw subsequent segments of same color as one <code>Path</code>. */
    76     protected Color currentColor = null;
     76    protected Color currentColor;
    7777    /** Path store to draw subsequent segments of same color as one <code>Path</code>. */
    7878    protected GeneralPath currentPath = new GeneralPath();
  • trunk/src/org/openstreetmap/josm/data/projection/AbstractProjection.java

    r8346 r8840  
    2626    protected Datum datum;
    2727    protected Proj proj;
    28     protected double x0 = 0.0;     /* false easting (in meters) */
    29     protected double y0 = 0.0;     /* false northing (in meters) */
    30     protected double lon0 = 0.0;   /* central meridian */
    31     protected double k0 = 1.0;     /* general scale factor */
     28    protected double x0     /* false easting (in meters) */
     29    protected double y0     /* false northing (in meters) */
     30    protected double lon0   /* central meridian */
     31    protected double k0 = 1.0; /* general scale factor */
    3232
    3333    public final Ellipsoid getEllipsoid() {
  • trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java

    r8540 r8840  
    3434    // CHECKSTYLE.ON: LineLength
    3535
    36     private NTV2GridShiftFile instance = null;
     36    private NTV2GridShiftFile instance;
    3737    private String gridFileName;
    3838
  • trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

    r8510 r8840  
    7373public class OsmValidator implements LayerChangeListener {
    7474
    75     public static volatile ValidatorLayer errorLayer = null;
     75    public static volatile ValidatorLayer errorLayer;
    7676
    7777    /** The validate action */
     
    297297    }
    298298
    299     private static boolean testsInitialized = false;
     299    private static boolean testsInitialized;
    300300
    301301    /**
  • trunk/src/org/openstreetmap/josm/data/validation/TestError.java

    r8633 r8840  
    3333public class TestError implements Comparable<TestError>, DataSetListener {
    3434    /** is this error on the ignore list */
    35     private boolean ignored = false;
     35    private boolean ignored;
    3636    /** Severity */
    3737    private Severity severity;
  • trunk/src/org/openstreetmap/josm/data/validation/tests/Coastlines.java

    r8378 r8840  
    3838    private List<Way> coastlines;
    3939
    40     private Area downloadedArea = null;
     40    private Area downloadedArea;
    4141
    4242    /**
  • trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java

    r8540 r8840  
    5858    private static final Set<String> ISO_COUNTRIES = new HashSet<>(Arrays.asList(Locale.getISOCountries()));
    5959
    60     private boolean leftByPedestrians = false;
    61     private boolean leftByCyclists = false;
    62     private boolean leftByCars = false;
    63     private int pedestrianWays = 0;
    64     private int cyclistWays = 0;
    65     private int carsWays = 0;
     60    private boolean leftByPedestrians;
     61    private boolean leftByCyclists;
     62    private boolean leftByCars;
     63    private int pedestrianWays;
     64    private int cyclistWays;
     65    private int carsWays;
    6666
    6767    /**
  • trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

    r8540 r8840  
    241241        protected final Map<String, Boolean> assertions = new HashMap<>();
    242242        protected final Set<String> setClassExpressions = new HashSet<>();
    243         protected boolean deletion = false;
     243        protected boolean deletion;
    244244
    245245        TagCheck(GroupedMapCSSRule rule) {
  • trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java

    r8836 r8840  
    9595
    9696    private static class RoleInfo {
    97         private int total = 0;
     97        private int total;
    9898    }
    9999
  • trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

    r8753 r8840  
    9797    public static final String PREF_CHECK_FIXMES_BEFORE_UPLOAD = PREF_CHECK_FIXMES + "BeforeUpload";
    9898
    99     protected boolean checkKeys = false;
    100     protected boolean checkValues = false;
    101     protected boolean checkComplex = false;
    102     protected boolean checkFixmes = false;
     99    protected boolean checkKeys;
     100    protected boolean checkValues;
     101    protected boolean checkComplex;
     102    protected boolean checkFixmes;
    103103
    104104    protected JCheckBox prefCheckKeys;
     
    667667            public Object value;
    668668            public boolean noMatch;
    669             public boolean tagAll = false;
    670             public boolean valueAll = false;
    671             public boolean valueBool = false;
     669            public boolean tagAll;
     670            public boolean valueAll;
     671            public boolean valueBool;
    672672
    673673            private Pattern getPattern(String str) throws PatternSyntaxException {
  • trunk/src/org/openstreetmap/josm/data/validation/util/Entities.java

    r8513 r8840  
    334334    };
    335335
    336     private static volatile Map<String, String> mapNameToValue = null;
     336    private static volatile Map<String, String> mapNameToValue;
    337337
    338338    public String unescape(String str) {
  • trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java

    r8510 r8840  
    9898
    9999    /** the current list of tags used as naming tags in relations */
    100     private static List<String> namingTagsForRelations =  null;
     100    private static List<String> namingTagsForRelations;
    101101
    102102    /**
  • trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java

    r8836 r8840  
    7575public class ExtendedDialog extends JDialog {
    7676    private final boolean disposeOnClose;
    77     private volatile int result = 0;
     77    private volatile int result;
    7878    public static final int DialogClosedOtherwise = 0;
    79     private boolean toggleable = false;
     79    private boolean toggleable;
    8080    private String rememberSizePref = "";
    81     private transient WindowGeometry defaultWindowGeometry = null;
     81    private transient WindowGeometry defaultWindowGeometry;
    8282    private String togglePref = "";
    8383    private int toggleValue = -1;
     
    9090    private Set<Integer> cancelButtonIdx = Collections.emptySet();
    9191    private int defaultButtonIdx = 1;
    92     protected JButton defaultButton = null;
     92    protected JButton defaultButton;
    9393    private transient Icon icon;
    9494    private boolean modal;
    95     private boolean focusOnDefaultButton = false;
     95    private boolean focusOnDefaultButton;
    9696
    9797    /** true, if the dialog should include a help button */
     
    304304    }
    305305
    306     private boolean setupDone = false;
     306    private boolean setupDone;
    307307
    308308    /**
  • trunk/src/org/openstreetmap/josm/gui/GettingStarted.java

    r8836 r8840  
    3838    private final LinkGeneral lg;
    3939    private String content = "";
    40     private boolean contentInitialized = false;
     40    private boolean contentInitialized;
    4141
    4242    private static final String STYLE = "<style type=\"text/css\">\n"
  • trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java

    r8510 r8840  
    2626    public boolean groupbutton;
    2727    private transient ShowHideButtonListener listener;
    28     private boolean hideIfDisabled = false;
     28    private boolean hideIfDisabled;
    2929    private boolean isExpert;
    3030
  • trunk/src/org/openstreetmap/josm/gui/MainMenu.java

    r8836 r8840  
    386386     * audioMenu contains all audio-related actions. Be careful, this menu is not guaranteed to be displayed at all
    387387     */
    388     public JMenu audioMenu = null;
     388    public JMenu audioMenu;
    389389    /**
    390390     * helpMenu contains JOSM general actions (Help, About, etc.)
     
    402402    public final TaggingPresetSearchPrimitiveDialog.Action presetSearchPrimitiveAction = new TaggingPresetSearchPrimitiveDialog.Action();
    403403    public final DialogsToggleAction dialogsToggleAction = new DialogsToggleAction();
    404     public FullscreenToggleAction fullscreenToggleAction = null;
     404    public FullscreenToggleAction fullscreenToggleAction;
    405405
    406406    /**
     
    10151015        private final JTextField searchField;
    10161016        private final MainMenu mainMenu;
    1017         private String currentSearchText = null;
     1017        private String currentSearchText;
    10181018
    10191019        SearchFieldTextListener(MainMenu mainMenu, JTextField searchField) {
  • trunk/src/org/openstreetmap/josm/gui/MapMover.java

    r8836 r8840  
    8383    private final JPanel contentPane;
    8484
    85     private boolean movementInPlace = false;
     85    private boolean movementInPlace;
    8686
    8787    /**
  • trunk/src/org/openstreetmap/josm/gui/MapSlider.java

    r8836 r8840  
    1717
    1818    private final MapView mv;
    19     private boolean preventChange = false;
     19    private boolean preventChange;
    2020
    2121    MapSlider(MapView mv) {
  • trunk/src/org/openstreetmap/josm/gui/MapStatus.java

    r8836 r8840  
    197197
    198198    // Determines if angle panel is enabled or not
    199     private boolean angleEnabled = false;
     199    private boolean angleEnabled;
    200200
    201201    /**
     
    340340         * popup
    341341         */
    342         private List<JLabel> popupLabels = null;
     342        private List<JLabel> popupLabels;
    343343        /**
    344344         * The popup displayed to show additional information
  • trunk/src/org/openstreetmap/josm/gui/MapView.java

    r8646 r8840  
    123123    }
    124124
    125     public boolean viewportFollowing = false;
     125    public boolean viewportFollowing;
    126126
    127127    /**
     
    240240     * The play head marker: there is only one of these so it isn't in any specific layer
    241241     */
    242     public transient PlayHeadMarker playHeadMarker = null;
     242    public transient PlayHeadMarker playHeadMarker;
    243243
    244244    /**
     
    342342
    343343    // remebered geometry of the component
    344     private Dimension oldSize = null;
    345     private Point oldLoc = null;
     344    private Dimension oldSize;
     345    private Point oldLoc;
    346346
    347347    /**
     
    535535    }
    536536
    537     private boolean virtualNodesEnabled = false;
     537    private boolean virtualNodesEnabled;
    538538
    539539    public void setVirtualNodesEnabled(boolean enabled) {
  • trunk/src/org/openstreetmap/josm/gui/MenuScroller.java

    r8836 r8840  
    5050    private int interval;
    5151    private int topFixedCount;
    52     private int firstIndex = 0;
     52    private int firstIndex;
    5353
    5454    private static final int ARROW_ICON_HEIGHT = 10;
  • trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

    r8836 r8840  
    189189
    190190    private final transient Object paintRequestLock = new Object();
    191     private Rectangle paintRect = null;
    192     private Polygon paintPoly = null;
     191    private Rectangle paintRect;
     192    private Polygon paintPoly;
    193193
    194194    protected transient ViewportData initialViewport;
  • trunk/src/org/openstreetmap/josm/gui/NotificationManager.java

    r8836 r8840  
    7171    private long elapsedTime;
    7272
    73     private static NotificationManager INSTANCE = null;
     73    private static NotificationManager INSTANCE;
    7474
    7575    private static final Color PANEL_SEMITRANSPARENT = new Color(224, 236, 249, 230);
  • trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java

    r8795 r8840  
    2424 */
    2525public abstract class PleaseWaitRunnable implements Runnable, CancelListener {
    26     private boolean canceled = false;
     26    private boolean canceled;
    2727    private boolean ignoreException;
    2828    private final String title;
  • trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java

    r8836 r8840  
    6666
    6767    private JViewport vp = new JViewport();
    68     private JComponent component = null;
     68    private JComponent component;
    6969
    7070    private List<JButton> buttons = new ArrayList<>();
  • trunk/src/org/openstreetmap/josm/gui/bbox/SizeButton.java

    r8510 r8840  
    2020public class SizeButton extends JComponent {
    2121
    22     private int x = 0;
    23     private int y = 0;
     22    private int x;
     23    private int y;
    2424
    2525    private ImageIcon enlargeImage;
    2626    private ImageIcon shrinkImage;
    27     private boolean isEnlarged = false;
     27    private boolean isEnlarged;
    2828    private final SlippyMapBBoxChooser slippyMapBBoxChooser;
    2929
  • trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java

    r8836 r8840  
    203203
    204204        /** The horizontal direction of movement, -1:left, 0:stop, 1:right */
    205         private int directionX = 0;
     205        private int directionX;
    206206
    207207        /** The vertical direction of movement, -1:up, 0:stop, 1:down */
    208         private int directionY = 0;
     208        private int directionY;
    209209
    210210        /**
     
    212212         * executed via timer) or disabled
    213213         */
    214         protected boolean scheduled = false;
     214        protected boolean scheduled;
    215215
    216216        protected void setDirectionX(int directionX) {
  • trunk/src/org/openstreetmap/josm/gui/bbox/SourceButton.java

    r8510 r8840  
    4040    private Font font;
    4141
    42     private boolean isEnlarged = false;
     42    private boolean isEnlarged;
    4343
    4444    private int currentMap;
  • trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java

    r8836 r8840  
    530530    private static class TileAddressValidator extends AbstractTextComponentValidator {
    531531
    532         private TileBounds tileBounds = null;
     532        private TileBounds tileBounds;
    533533
    534534        TileAddressValidator(JTextComponent tc) {
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java

    r8510 r8840  
    6767    public static final String THEIR_PRIMITIVE_PROP = ConflictResolver.class.getName() + ".theirPrimitive";
    6868
    69     private JTabbedPane tabbedPane = null;
     69    private JTabbedPane tabbedPane;
    7070    private TagMerger tagMerger;
    7171    private NodeListMerger nodeListMerger;
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java

    r8510 r8840  
    8888
    8989    private final Set<PropertyChangeListener> listeners;
    90     private boolean isFrozen = false;
     90    private boolean isFrozen;
    9191    private final ComparePairListModel comparePairListModel;
    9292
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java

    r8510 r8840  
    2323 */
    2424public  class RelationMemberTableCellRenderer extends JLabel implements TableCellRenderer {
    25     private transient Border rowNumberBorder = null;
     25    private transient Border rowNumberBorder;
    2626
    2727    /**
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java

    r8513 r8840  
    1717public class TagMergeItem {
    1818
    19     private String key = null;
    20     private String myTagValue = null;
    21     private String theirTagValue = null;
     19    private String key;
     20    private String myTagValue;
     21    private String theirTagValue;
    2222    private MergeDecisionType mergeDecision = MergeDecisionType.UNDECIDED;
    2323
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java

    r8510 r8840  
    3838    private final transient Set<PropertyChangeListener> listeners;
    3939
    40     private int numUndecidedTags = 0;
     40    private int numUndecidedTags;
    4141
    4242    /**
  • trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java

    r8510 r8840  
    6262    private JTabbedPane tpResolvers;
    6363    private Mode mode;
    64     private boolean canceled = false;
     64    private boolean canceled;
    6565
    6666    private final ImageIcon iconResolved;
  • trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java

    r8513 r8840  
    2828    private int numConflicts;
    2929    private PropertyChangeSupport support;
    30     private boolean showTagsWithConflictsOnly = false;
    31     private boolean showTagsWithMultiValuesOnly = false;
     30    private boolean showTagsWithConflictsOnly;
     31    private boolean showTagsWithMultiValuesOnly;
    3232
    3333    /**
  • trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java

    r8540 r8840  
    3434    }
    3535
    36     public boolean initialized = false; // read only from outside
     36    public boolean initialized; // read only from outside
    3737
    3838    public void initialize(List<ToggleDialog> pAllDialogs) {
  • trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java

    r8836 r8840  
    8484
    8585    /** Last selected element */
    86     private DefaultMutableTreeNode lastSelectedNode = null;
     86    private DefaultMutableTreeNode lastSelectedNode;
    8787
    8888    private transient OsmDataLayer linkedLayer;
  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java

    r8836 r8840  
    6464    private final ZoomInCurrentLayerAction       actZoomInCurrentLayerAction = new ZoomInCurrentLayerAction();
    6565
    66     private transient Changeset current = null;
     66    private transient Changeset current;
    6767
    6868    protected JPanel buildActionButtonPanel() {
  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionPanel.java

    r8836 r8840  
    4040    private JTable table;
    4141
    42     private transient Changeset current = null;
     42    private transient Changeset current;
    4343
    4444    protected JPanel buildActionButtonPanel() {
  • trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

    r8836 r8840  
    821821        private List<Integer> position = new ArrayList<>();
    822822        private Iterable<OsmPrimitive> selection;
    823         private String positionString = null;
    824         private String roleString = null;
     823        private String positionString;
     824        private String roleString;
    825825
    826826        MemberInfo(Iterable<OsmPrimitive> selection) {
  • trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

    r8836 r8840  
    102102    };
    103103
    104     private String lastAddKey = null;
    105     private String lastAddValue = null;
     104    private String lastAddKey;
     105    private String lastAddValue;
    106106
    107107    public static final int DEFAULT_LRU_TAGS_NUMBER = 5;
  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java

    r8510 r8840  
    1515
    1616public class MemberRoleCellEditor extends AbstractCellEditor implements TableCellEditor {
    17     private AutoCompletingTextField editor = null;
     17    private AutoCompletingTextField editor;
    1818    private final transient DataSet ds;
    1919    private final transient Relation relation;
    2020
    2121    /** user input is matched against this list of auto completion items */
    22     private AutoCompletionList autoCompletionList = null;
     22    private AutoCompletionList autoCompletionList;
    2323
    2424    /**
  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

    r8510 r8840  
    5151     **/
    5252    private transient List<RelationMember> members;
    53     private transient List<WayConnectionType> connectionType = null;
     53    private transient List<WayConnectionType> connectionType;
    5454
    5555    private DefaultListSelectionModel listSelectionModel;
  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java

    r8836 r8840  
    168168    }
    169169
    170     private Integer firstOneway = null;
    171     private Node lastOnewayNode = null;
    172     private Node firstCircular = null;
     170    private Integer firstOneway;
     171    private Node lastOnewayNode;
     172    private Node firstCircular;
    173173
    174174    /**
  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionType.java

    r8510 r8840  
    3636    public boolean isLoop;
    3737
    38     public boolean isOnewayLoopForwardPart = false;
    39     public boolean isOnewayLoopBackwardPart = false;
    40     public boolean isOnewayHead = false;
    41     public boolean isOnewayTail = false;
     38    public boolean isOnewayLoopForwardPart;
     39    public boolean isOnewayLoopBackwardPart;
     40    public boolean isOnewayHead;
     41    public boolean isOnewayTail;
    4242
    4343    public WayConnectionType(boolean linkPrev, boolean linkNext, Direction direction) {
  • trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java

    r8836 r8840  
    7373     * that refer to one of the primitives in the filter.
    7474     */
    75     private transient Set<? extends OsmPrimitive> filter = null;
     75    private transient Set<? extends OsmPrimitive> filter;
    7676
    7777    /** a counter to check if tree has been rebuild */
  • trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java

    r8836 r8840  
    4242public class BoundingBoxSelection implements DownloadSelection {
    4343
    44     private JosmTextField[] latlon = null;
     44    private JosmTextField[] latlon;
    4545    private final JosmTextArea tfOsmUrl = new JosmTextArea();
    4646    private final JosmTextArea showUrl = new JosmTextArea();
  • trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java

    r8836 r8840  
    7575    protected JCheckBox cbStartup;
    7676    protected final JLabel sizeCheck = new JLabel();
    77     protected transient Bounds currentBounds = null;
     77    protected transient Bounds currentBounds;
    7878    protected boolean canceled;
    7979
  • trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java

    r8836 r8840  
    184184        public double lat;
    185185        public double lon;
    186         public int zoom = 0;
    187         public Bounds bounds = null;
     186        public int zoom;
     187        public Bounds bounds;
    188188
    189189        public Bounds getDownloadArea() {
     
    198198     */
    199199    private static class NameFinderResultParser extends DefaultHandler {
    200         private SearchResult currentResult = null;
    201         private StringBuffer description = null;
    202         private int depth = 0;
     200        private SearchResult currentResult;
     201        private StringBuffer description;
     202        private int depth;
    203203        private List<SearchResult> data = new LinkedList<>();
    204204
     
    330330        private HttpURLConnection connection;
    331331        private List<SearchResult> data;
    332         private boolean canceled = false;
     332        private boolean canceled;
    333333        private Server useserver;
    334334        private Exception lastException;
     
    452452
    453453    static class NamedResultTableColumnModel extends DefaultTableColumnModel {
    454         private TableColumn col3 = null;
    455         private TableColumn col4 = null;
     454        private TableColumn col3;
     455        private TableColumn col4;
    456456        protected final void createColumns() {
    457457            TableColumn col = null;
  • trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java

    r8510 r8840  
    1010    private HelpBrowser browser;
    1111    private List<String> history;
    12     private int historyPos = 0;
     12    private int historyPos;
    1313
    1414    public HelpBrowserHistory(HelpBrowser browser) {
  • trunk/src/org/openstreetmap/josm/gui/history/DiffTableModel.java

    r8510 r8840  
    1515class DiffTableModel extends AbstractTableModel {
    1616    private transient List<TwoColumnDiff.Item> rows = new ArrayList<>();
    17     private boolean reversed = false;
     17    private boolean reversed;
    1818
    1919    public void setRows(List<TwoColumnDiff.Item> rows, boolean reversed) {
  • trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java

    r8510 r8840  
    5050public class HistoryLoadTask extends PleaseWaitRunnable {
    5151
    52     private boolean canceled = false;
    53     private Exception lastException  = null;
     52    private boolean canceled;
     53    private Exception lastException;
    5454    private Set<PrimitiveId> toLoad;
    5555    private HistoryDataSet loadedData;
    56     private OsmServerHistoryReader reader = null;
     56    private OsmServerHistoryReader reader;
    5757
    5858    /**
  • trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java

    r8836 r8840  
    8989    protected TableModelListener newReversedChangeListener(final JTable table, final NodeListTableColumnModel columnModel) {
    9090        return new TableModelListener() {
    91             private Boolean reversed = null;
     91            private Boolean reversed;
    9292            private final String nonReversedText = tr("Nodes") + (table.getFont().canDisplay('\u25bc') ? " \u25bc" : " (1-n)");
    9393            private final String reversedText = tr("Nodes") + (table.getFont().canDisplay('\u25b2') ? " \u25b2" : " (n-1)");
  • trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java

    r8836 r8840  
    6262    private Object[] reference;
    6363    private Object[] current;
    64     boolean referenceReversed = false;
     64    boolean referenceReversed;
    6565
    6666    TwoColumnDiff(Object[] reference, Object[] current) {
  • trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadDialog.java

    r7937 r8840  
    1515public abstract class AbstractUploadDialog extends JDialog {
    1616
    17     private boolean canceled = false;
     17    private boolean canceled;
    1818
    1919    /**
  • trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesWithReferrersTask.java

    r8510 r8840  
    5353    private DownloadPrimitivesTask mainTask;
    5454    /** Flag indicated that user ask for cancel this task */
    55     private boolean canceled = false;
     55    private boolean canceled;
    5656    /** Reference to the task currently running */
    57     private PleaseWaitRunnable currentTask = null;
     57    private PleaseWaitRunnable currentTask;
    5858
    5959    /**
  • trunk/src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java

    r8510 r8840  
    1919public class OpenChangesetComboBoxModel extends DefaultComboBoxModel<Changeset> implements ChangesetCacheListener {
    2020    private transient List<Changeset> changesets;
    21     private transient Changeset selectedChangeset = null;
     21    private transient Changeset selectedChangeset;
    2222
    2323    protected Changeset getChangesetById(long id) {
  • trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java

    r8836 r8840  
    9292    }
    9393
    94     private JButton saveAndProceedActionButton = null;
     94    private JButton saveAndProceedActionButton;
    9595
    9696    /**
  • trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java

    r8540 r8840  
    4343 */
    4444public class UploadPrimitivesTask extends AbstractUploadTask {
    45     private boolean uploadCanceled = false;
    46     private Exception lastException = null;
     45    private boolean uploadCanceled;
     46    private Exception lastException;
    4747    private APIDataSet toUpload;
    4848    private OsmServerWriter writer;
  • trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java

    r8513 r8840  
    6161    private JMultilineLabel lblMultiChangesetPoliciesHeader;
    6262
    63     private long numUploadedObjects = 0;
     63    private long numUploadedObjects;
    6464
    6565    /**
  • trunk/src/org/openstreetmap/josm/gui/layer/AbstractCachedTileSourceLayer.java

    r8659 r8840  
    3030    private static final String PREFERENCE_PREFIX = "imagery.cache.";
    3131
    32     private static volatile TileLoaderFactory loaderFactoryOverride = null;
     32    private static volatile TileLoaderFactory loaderFactoryOverride;
    3333
    3434    /**
  • trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

    r8836 r8840  
    473473     */
    474474    private static final class TileHolder {
    475         private Tile t = null;
     475        private Tile t;
    476476
    477477        public Tile getTile() {
     
    12991299
    13001300    private static class TileSetInfo {
    1301         public boolean hasVisibleTiles = false;
    1302         public boolean hasOverzoomedTiles = false;
    1303         public boolean hasLoadingTiles = false;
     1301        public boolean hasVisibleTiles;
     1302        public boolean hasOverzoomedTiles;
     1303        public boolean hasLoadingTiles;
    13041304    }
    13051305
  • trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java

    r8836 r8840  
    7575    protected Icon icon;
    7676
    77     protected double dx = 0.0;
    78     protected double dy = 0.0;
     77    protected double dx;
     78    protected double dy;
    7979
    8080    protected GammaImageProcessor gammaImageProcessor = new GammaImageProcessor();
  • trunk/src/org/openstreetmap/josm/gui/layer/Layer.java

    r8625 r8840  
    109109     *
    110110     */
    111     private boolean background = false;
     111    private boolean background;
    112112
    113113    /**
  • trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

    r8836 r8840  
    109109    public static final String REQUIRES_UPLOAD_TO_SERVER_PROP = OsmDataLayer.class.getName() + ".requiresUploadToServer";
    110110
    111     private boolean requiresSaveToFile = false;
    112     private boolean requiresUploadToServer = false;
     111    private boolean requiresSaveToFile;
     112    private boolean requiresUploadToServer;
    113113    private boolean isChanged = true;
    114114    private int highlightUpdateCount;
     
    137137
    138138    /** the global counter for created data layers */
    139     private static int dataLayerCounter = 0;
     139    private static int dataLayerCounter;
    140140
    141141    /**
  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

    r8836 r8840  
    9292    private static List<GpxData> loadedGpxData = new ArrayList<>();
    9393
    94     private transient GeoImageLayer yLayer = null;
     94    private transient GeoImageLayer yLayer;
    9595    private double timezone;
    9696    private long delta;
     
    237237
    238238    // remember the last number of matched photos
    239     private int lastNumMatched = 0;
     239    private int lastNumMatched;
    240240
    241241    /** This class is called when the user doesn't find the GPX file he needs in the files that have
  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

    r8836 r8840  
    9393    private int currentPhoto = -1;
    9494
    95     boolean useThumbs = false;
     95    boolean useThumbs;
    9696    private ExecutorService thumbsLoaderExecutor =
    9797            Executors.newSingleThreadExecutor(Utils.newThreadFactory("thumbnail-loader-%d", Thread.MIN_PRIORITY));
    9898    private ThumbsLoader thumbsloader;
    99     private boolean thumbsLoaderRunning = false;
    100     volatile boolean thumbsLoaded = false;
     99    private boolean thumbsLoaderRunning;
     100    volatile boolean thumbsLoaded;
    101101    private BufferedImage offscreenBuffer;
    102102    boolean updateOffscreenBuffer = true;
     
    109109    private static final class Loader extends PleaseWaitRunnable {
    110110
    111         private boolean canceled = false;
     111        private boolean canceled;
    112112        private GeoImageLayer layer;
    113113        private Collection<File> selection;
     
    902902    }
    903903
    904     private static volatile List<MapMode> supportedMapModes = null;
     904    private static volatile List<MapMode> supportedMapModes;
    905905
    906906    /**
     
    938938    }
    939939
    940     private MouseAdapter mouseAdapter = null;
    941     private MapModeChangeListener mapModeListener = null;
     940    private MouseAdapter mouseAdapter;
     941    private MapModeChangeListener mapModeListener;
    942942
    943943    @Override
  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java

    r8836 r8840  
    3333
    3434    /** The file that is currently displayed */
    35     private File file = null;
     35    private File file;
    3636
    3737    /** The image currently displayed */
    38     private transient Image image = null;
     38    private transient Image image;
    3939
    4040    /** The image currently displayed */
    41     private boolean errorLoading = false;
     41    private boolean errorLoading;
    4242
    4343    /** The rectangle (in image coordinates) of the image that is visible. This rectangle is calculated
    4444     * each time the zoom is modified */
    45     private Rectangle visibleRect = null;
     45    private Rectangle visibleRect;
    4646
    4747    /** When a selection is done, the rectangle of the selection (in image coordinates) */
    48     private Rectangle selectedRect = null;
     48    private Rectangle selectedRect;
    4949
    5050    /** The tracker to load the images */
    5151    private MediaTracker tracker = new MediaTracker(this);
    5252
    53     private String osdText = null;
     53    private String osdText;
    5454
    5555    private static final int DRAG_BUTTON = Main.pref.getBoolean("geoimage.agpifo-style-drag-and-zoom", false) ? 1 : 3;
     
    136136    private class ImgDisplayMouseListener implements MouseListener, MouseWheelListener, MouseMotionListener {
    137137
    138         private boolean mouseIsDragging = false;
    139         private long lastTimeForMousePoint = 0L;
    140         private Point mousePointInImg = null;
     138        private boolean mouseIsDragging;
     139        private long lastTimeForMousePoint;
     140        private Point mousePointInImg;
    141141
    142142        /** 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/ImageEntry.java

    r8512 r8840  
    2323     * The flag can used to decide for which image file the EXIF GPS data is (re-)written.
    2424     */
    25     private boolean isNewGpsData = false;
     25    private boolean isNewGpsData;
    2626    /** Temporary source of GPS time if not correlated with GPX track. */
    27     private Date exifGpsTime = null;
     27    private Date exifGpsTime;
    2828    Image thumbnail;
    2929
  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

    r8836 r8840  
    4646
    4747    private ImageDisplay imgDisplay = new ImageDisplay();
    48     private boolean centerView = false;
     48    private boolean centerView;
    4949
    5050    // Only one instance of that class is present at one time
    5151    private static volatile ImageViewerDialog dialog;
    5252
    53     private boolean collapseButtonClicked = false;
     53    private boolean collapseButtonClicked;
    5454
    5555    static void newInstance() {
     
    276276    }
    277277
    278     private transient GeoImageLayer currentLayer = null;
    279     private transient ImageEntry currentEntry = null;
     278    private transient GeoImageLayer currentLayer;
     279    private transient ImageEntry currentEntry;
    280280
    281281    public void displayImage(GeoImageLayer layer, ImageEntry entry) {
  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java

    r8836 r8840  
    2626    public static final int maxSize = 120;
    2727    public static final int minSize = 22;
    28     public volatile boolean stop = false;
     28    public volatile boolean stop;
    2929    private List<ImageEntry> data;
    3030    private GeoImageLayer layer;
  • trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java

    r8554 r8840  
    184184    }
    185185
    186     private boolean noUpdates = false;
     186    private boolean noUpdates;
    187187
    188188    /** selects all rows (=tracks) in the table that are currently visible on the layer*/
  • trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java

    r8836 r8840  
    102102
    103103            private Area a = new Area();
    104             private boolean cancel = false;
    105             private int ticks = 0;
     104            private boolean cancel;
     105            private int ticks;
    106106            private Rectangle2D r = new Rectangle2D.Double();
    107107
  • trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java

    r8540 r8840  
    5353
    5454    //// Variables used only to check cache validity
    55     private boolean computeCacheInSync = false;
     55    private boolean computeCacheInSync;
    5656    private int computeCacheMaxLineLengthUsed;
    5757    private Color computeCacheColorUsed;
  • trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java

    r8540 r8840  
    4343
    4444    private static class Markers {
    45         public boolean timedMarkersOmitted = false;
    46         public boolean untimedMarkersOmitted = false;
     45        public boolean timedMarkersOmitted;
     46        public boolean untimedMarkersOmitted;
    4747    }
    4848
  • trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java

    r8513 r8840  
    2323
    2424    private URL audioUrl;
    25     private static volatile AudioMarker recentlyPlayedMarker = null;
     25    private static volatile AudioMarker recentlyPlayedMarker;
    2626    public double syncOffset;
    27     public boolean timeFromAudio = false; // as opposed to from the GPX track
     27    public boolean timeFromAudio; // as opposed to from the GPX track
    2828
    2929    public AudioMarker(LatLon ll, TemplateEngineDataProvider dataProvider, URL audioUrl, MarkerLayer parentLayer, double time, double offset) {
     
    3434    }
    3535
    36     @Override public void actionPerformed(ActionEvent ev) {
     36    @Override
     37    public void actionPerformed(ActionEvent ev) {
    3738        play();
    3839    }
  • trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java

    r8836 r8840  
    276276
    277277    protected final ImageIcon symbol;
    278     private BufferedImage redSymbol = null;
     278    private BufferedImage redSymbol;
    279279    public final MarkerLayer parentLayer;
    280280    /** Absolute time of marker in seconds since epoch */
     
    287287    private CachedLatLon coor;
    288288
    289     private boolean erroneous = false;
     289    private boolean erroneous;
    290290
    291291    public Marker(LatLon ll, TemplateEngineDataProvider dataProvider, String iconName, MarkerLayer parentLayer,
  • trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

    r8836 r8840  
    6969     */
    7070    public final List<Marker> data;
    71     private boolean mousePressed = false;
    72     public GpxLayer fromLayer = null;
     71    private boolean mousePressed;
     72    public GpxLayer fromLayer;
    7373    private Marker currentMarker;
    74     public AudioMarker syncAudioMarker = null;
     74    public AudioMarker syncAudioMarker;
    7575
    7676    /**
  • trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java

    r8510 r8840  
    3535public final class PlayHeadMarker extends Marker {
    3636
    37     private Timer timer = null;
    38     private double animationInterval = 0.0; // seconds
    39     private static volatile PlayHeadMarker playHead = null;
    40     private MapMode oldMode = null;
     37    private Timer timer;
     38    private double animationInterval; // seconds
     39    private static volatile PlayHeadMarker playHead;
     40    private MapMode oldMode;
    4141    private LatLon oldCoor;
    4242    private boolean enabled;
    43     private boolean wasPlaying = false;
     43    private boolean wasPlaying;
    4444    private int dropTolerance; /* pixels */
    45     private boolean jumpToMarker = false;
     45    private boolean jumpToMarker;
    4646
    4747    /**
  • trunk/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java

    r8540 r8840  
    180180     * session. There should be preference listener updating this cache.
    181181     */
    182     private static volatile Color DEFAULT_TEXT_COLOR = null;
     182    private static volatile Color DEFAULT_TEXT_COLOR;
    183183
    184184    private static void initDefaultParameters() {
  • trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java

    r8836 r8840  
    9696     * a JOSM session. Should have a listener listening to preference changes.
    9797     */
    98     private static volatile String DEFAULT_FONT_NAME = null;
    99     private static volatile Float DEFAULT_FONT_SIZE = null;
     98    private static volatile String DEFAULT_FONT_NAME;
     99    private static volatile Float DEFAULT_FONT_SIZE;
    100100    private static final Object lock = new Object();
    101101
  • trunk/src/org/openstreetmap/josm/gui/mappaint/Environment.java

    r8459 r8840  
    3737     * index of node in parent way or member in parent relation. Must be != null in LINK context.
    3838     */
    39     public Integer index = null;
     39    public Integer index;
    4040
    4141    /**
    4242     * count of nodes in parent way or members in parent relation. Must be != null in LINK context.
    4343     */
    44     public Integer count = null;
     44    public Integer count;
    4545
    4646    /**
  • trunk/src/org/openstreetmap/josm/gui/mappaint/MapImage.java

    r8289 r8840  
    3636    public int width = -1;
    3737    public int height = -1;
    38     public int offsetX = 0;
    39     public int offsetY = 0;
     38    public int offsetX;
     39    public int offsetY;
    4040
    4141    private boolean temporary;
     
    5454    /**
    5555     * Get the image associated with this MapImage object.
    56      * 
     56     *
    5757     * @param disabled {@code} true to request disabled version, {@code false} for the standard version
    5858     * @return the image
  • trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

    r8742 r8840  
    8585
    8686    private Color backgroundColorOverride;
    87     private String css = null;
     87    private String css;
    8888    private ZipFile zipFile;
    8989
  • trunk/src/org/openstreetmap/josm/gui/mappaint/xml/Prototype.java

    r8510 r8840  
    1414    public int priority;
    1515    public String code;
    16     public Collection<XmlCondition> conditions = null;
     16    public Collection<XmlCondition> conditions;
    1717
    1818    public Prototype(Range range) {
  • trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

    r8836 r8840  
    8282        private String name = "";
    8383        private String icon = "";
    84         private ImageIcon ico = null;
     84        private ImageIcon ico;
    8585        private final Map<String, Object> parameters = new ConcurrentHashMap<>();
    8686
  • trunk/src/org/openstreetmap/josm/gui/preferences/imagery/WMSLayerTree.java

    r8836 r8840  
    2828    private final JTree layerTree = new JTree(treeData);
    2929    private final List<WMSImagery.LayerDetails> selectedLayers = new LinkedList<>();
    30     private boolean previouslyShownUnsupportedCrsError = false;
     30    private boolean previouslyShownUnsupportedCrsError;
    3131
    3232    /**
  • trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java

    r8836 r8840  
    155155     * by the user
    156156     */
    157     private boolean pluginPreferencesActivated = false;
     157    private boolean pluginPreferencesActivated;
    158158
    159159    protected JPanel buildSearchFieldPanel() {
  • trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java

    r8836 r8840  
    168168
    169169    class ValidateApiUrlAction extends AbstractAction implements DocumentListener {
    170         private String lastTestedUrl = null;
     170        private String lastTestedUrl;
    171171
    172172        ValidateApiUrlAction() {
  • trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java

    r8692 r8840  
    4141    private final Component dialogParent;
    4242
    43     private int currentProgressValue = 0;
     43    private int currentProgressValue;
    4444    private String customText;
    4545    private String title;
  • trunk/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java

    r8510 r8840  
    1616public class SwingRenderingProgressMonitor extends AbstractProgressMonitor {
    1717    private static final int PROGRESS_BAR_MAX = 100;
    18     private int currentProgressValue = 0;
     18    private int currentProgressValue;
    1919    private ProgressRenderer delegate;
    2020
  • trunk/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java

    r8760 r8840  
    1919public class TagCellEditor extends AbstractCellEditor implements TableCellEditor{
    2020
    21     protected AutoCompletingTextField editor = null;
    22     protected transient TagModel currentTag = null;
     21    protected AutoCompletingTextField editor;
     22    protected transient TagModel currentTag;
    2323
    2424    /** the cache of auto completion items derived from the current JOSM data set */
    25     protected transient AutoCompletionManager autocomplete = null;
     25    protected transient AutoCompletionManager autocomplete;
    2626
    2727    /** user input is matched against this list of auto completion items */
    28     protected AutoCompletionList autoCompletionList = null;
     28    protected AutoCompletionList autoCompletionList;
    2929
    3030    /**
  • trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java

    r8510 r8840  
    2020 */
    2121public class TagCellRenderer extends JLabel implements TableCellRenderer  {
    22     private Font fontStandard = null;
    23     private Font fontItalic = null;
     22    private Font fontStandard;
     23    private Font fontItalic;
    2424
    2525    /**
  • trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java

    r8836 r8840  
    3838
    3939    /** indicates whether the model is dirty */
    40     private boolean dirty =  false;
     40    private boolean dirty;
    4141    private final PropertyChangeSupport propChangeSupport = new PropertyChangeSupport(this);
    4242
  • trunk/src/org/openstreetmap/josm/gui/tagging/TagModel.java

    r8510 r8840  
    88
    99    /** the name of the tag */
    10     private String name = null;
     10    private String name;
    1111
    1212    /** the list of values */
    13     private List<String> values = null;
     13    private List<String> values;
    1414
    1515    /**
  • trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java

    r8836 r8840  
    5757public class TagTable extends JTable  {
    5858    /** the table cell editor used by this table */
    59     private TagCellEditor editor = null;
     59    private TagCellEditor editor;
    6060    private final TagEditorModel model;
    6161    private Component nextFocusComponent;
     
    367367
    368368    /** the delete action */
    369     private RunnableAction deleteAction = null;
     369    private RunnableAction deleteAction;
    370370
    371371    /** the add action */
    372     private RunnableAction addAction = null;
     372    private RunnableAction addAction;
    373373
    374374    /** the tag paste action */
    375     private RunnableAction pasteAction = null;
     375    private RunnableAction pasteAction;
    376376
    377377    /**
  • trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

    r8836 r8840  
    7777    public static final int DIALOG_ANSWER_CANCEL = 3;
    7878
    79     public TaggingPresetMenu group = null;
     79    public TaggingPresetMenu group;
    8080    public String name;
    8181    public String iconName;
     
    212212
    213213    private static class PresetPanel extends JPanel {
    214         private boolean hasElements = false;
     214        private boolean hasElements;
    215215
    216216        PresetPanel() {
     
    414414     * True whenever the original selection given into createSelection was empty
    415415     */
    416     private boolean originalSelectionEmpty = false;
     416    private boolean originalSelectionEmpty;
    417417
    418418    /**
  • trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java

    r8836 r8840  
    8181    }
    8282
    83     private static int auto_increment_selected = 0;
     83    private static int auto_increment_selected;
    8484    /** Translatation of "&lt;different&gt;". Use in combo boxes to display en entry matching several different values. */
    8585    public static final String DIFFERENT = tr("<different>");
     
    189189        public SearchCompiler.Match memberExpression;
    190190
    191         public boolean required = false;
    192         private long count = 0;
     191        public boolean required;
     192        private long count;
    193193
    194194        public void setType(String types) throws SAXException {
     
    307307    public static class Usage {
    308308        private SortedSet<String> values;
    309         private boolean hadKeys = false;
    310         private boolean hadEmpty = false;
     309        private boolean hadKeys;
     310        private boolean hadEmpty;
    311311
    312312        public boolean hasUniqueValue() {
     
    885885        public String value_off = OsmUtils.falseval;
    886886        /** whether the off value is disabled in the dialog, i.e., only unset or yes are provided */
    887         public boolean disable_off = false;
     887        public boolean disable_off;
    888888        /** "on" or "off" or unset (default is unset) */
    889         public String default_ = null; // only used for tagless objects
     889        public String default_; // only used for tagless objects
    890890
    891891        private QuadStateCheckBox check;
     
    10101010        protected JComponent component;
    10111011        protected final Map<String, PresetListEntry> lhm = new LinkedHashMap<>();
    1012         private boolean initialized = false;
     1012        private boolean initialized;
    10131013        protected Usage usage;
    10141014        protected Object originalValue;
  • trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java

    r8510 r8840  
    2525
    2626public class TaggingPresetMenu extends TaggingPreset {
    27     public JMenu menu = null; // set by TaggingPresets
     27    public JMenu menu; // set by TaggingPresets
    2828
    2929    private static class PresetTextComparator implements Comparator<JMenuItem>, Serializable {
  • trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java

    r8710 r8840  
    5050    }
    5151
    52     private static volatile File zipIcons = null;
     52    private static volatile File zipIcons;
    5353    private static volatile boolean loadIcons = true;
    5454
     
    103103
    104104    static class HashSetWithLast<E> extends LinkedHashSet<E> {
    105         protected E last = null;
     105        protected E last;
    106106
    107107        @Override
  • trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java

    r8836 r8840  
    4747    class AutoCompletingComboBoxDocument extends PlainDocument {
    4848        private final JosmComboBox<AutoCompletionListItem> comboBox;
    49         private boolean selecting = false;
     49        private boolean selecting;
    5050
    5151        /**
  • trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java

    r8513 r8840  
    119119
    120120    /** the auto completion list user input is matched against */
    121     protected AutoCompletionList autoCompletionList = null;
     121    protected AutoCompletionList autoCompletionList;
    122122    /** a string which should not be auto completed */
    123     protected String noAutoCompletionString = null;
     123    protected String noAutoCompletionString;
    124124
    125125    @Override
  • trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java

    r8510 r8840  
    3333
    3434    /** the bare list of AutoCompletionItems */
    35     private transient List<AutoCompletionListItem> list = null;
     35    private transient List<AutoCompletionListItem> list;
    3636    /**  the filtered list of AutoCompletionItems */
    37     private transient ArrayList<AutoCompletionListItem> filtered = null;
     37    private transient ArrayList<AutoCompletionListItem> filtered;
    3838    /** the filter expression */
    39     private String filter = null;
     39    private String filter;
    4040    /** map from value to priority */
    4141    private transient Map<String, AutoCompletionListItem> valutToItemMap;
  • trunk/src/org/openstreetmap/josm/gui/widgets/AbstractTextComponentValidator.java

    r8510 r8840  
    4040     * we don't know yet
    4141     */
    42     private Boolean valid = null;
     42    private Boolean valid;
    4343    // remember the message
    4444    private String msg;
  • trunk/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java

    r8836 r8840  
    2828public class BoundingBoxSelectionPanel extends JPanel {
    2929
    30     private JosmTextField[] tfLatLon = null;
     30    private JosmTextField[] tfLatLon;
    3131    private final JosmTextField tfOsmUrl = new JosmTextField();
    3232
  • trunk/src/org/openstreetmap/josm/gui/widgets/ChangesetIdTextField.java

    r8513 r8840  
    4444    public static class ChangesetIdValidator extends AbstractTextComponentValidator {
    4545
    46         private int id = 0;
     46        private int id;
    4747
    4848        /**
  • trunk/src/org/openstreetmap/josm/gui/widgets/JMultilineLabel.java

    r6911 r8840  
    2121public class JMultilineLabel extends JEditorPane {
    2222    private int maxWidth = Integer.MAX_VALUE;
    23     private Rectangle oldbounds = null;
    24     private Dimension oldPreferred = null;
     23    private Rectangle oldbounds;
     24    private Dimension oldPreferred;
    2525
    2626    /**
  • trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java

    r8510 r8840  
    819819     */
    820820    public abstract static class Node {
    821         private Split parent = null;
     821        private Split parent;
    822822        private Rectangle bounds = new Rectangle();
    823         private double weight = 0.0;
     823        private double weight;
    824824
    825825        /**
  • trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitPane.java

    r8512 r8840  
    4747 */
    4848public class MultiSplitPane extends JPanel {
    49     private transient AccessibleContext accessibleContext = null;
     49    private transient AccessibleContext accessibleContext;
    5050    private boolean continuousLayout = true;
    5151    private transient DividerPainter dividerPainter = new DefaultDividerPainter();
     
    219219    }
    220220
    221     private boolean dragUnderway = false;
    222     private transient MultiSplitLayout.Divider dragDivider = null;
    223     private Rectangle initialDividerBounds = null;
     221    private boolean dragUnderway;
     222    private transient MultiSplitLayout.Divider dragDivider;
     223    private Rectangle initialDividerBounds;
    224224    private boolean oldFloatingDividers = true;
    225     private int dragOffsetX = 0;
    226     private int dragOffsetY = 0;
     225    private int dragOffsetX;
     226    private int dragOffsetY;
    227227    private int dragMin = -1;
    228228    private int dragMax = -1;
  • trunk/src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java

    r8415 r8840  
    4545    private static final String EDITABLE = "editable";
    4646
    47     protected JTextComponent component = null;
     47    protected JTextComponent component;
    4848    protected boolean undoRedo;
    4949    protected final UndoAction undoAction = new UndoAction();
  • trunk/src/org/openstreetmap/josm/io/CacheCustomContent.java

    r8510 r8840  
    3838     * Where the data will be stored
    3939     */
    40     private byte[] data = null;
     40    private byte[] data;
    4141
    4242    /**
  • trunk/src/org/openstreetmap/josm/io/CachedFile.java

    r8597 r8840  
    6969    protected CachingStrategy cachingStrategy;
    7070
    71     protected File cacheFile = null;
    72     protected boolean initialized = false;
     71    protected File cacheFile;
     72    protected boolean initialized;
    7373
    7474    public static final long DEFAULT_MAXTIME = -1L;
  • trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java

    r8510 r8840  
    3636
    3737    /** the user id this query is restricted to. null, if no restriction to a user id applies */
    38     private Integer uid = null;
     38    private Integer uid;
    3939    /** the user name this query is restricted to. null, if no restriction to a user name applies */
    40     private String userName = null;
     40    private String userName;
    4141    /** the bounding box this query is restricted to. null, if no restriction to a bounding box applies */
    42     private Bounds bounds = null;
    43 
    44     private Date closedAfter = null;
    45     private Date createdBefore = null;
     42    private Bounds bounds;
     43
     44    private Date closedAfter;
     45    private Date createdBefore;
    4646    /** indicates whether only open changesets are queried. null, if no restrictions regarding open changesets apply */
    47     private Boolean open = null;
     47    private Boolean open;
    4848    /** indicates whether only closed changesets are queried. null, if no restrictions regarding open changesets apply */
    49     private Boolean closed = null;
     49    private Boolean closed;
    5050    /** a collection of changeset ids to query for */
    51     private Collection<Long> changesetIds = null;
     51    private Collection<Long> changesetIds;
    5252
    5353    /**
  • trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java

    r8510 r8840  
    4141     * We therefore read the property at class loading time and remember it's value.
    4242     */
    43     private static boolean JVM_WILL_USE_SYSTEM_PROXIES = false;
     43    private static boolean JVM_WILL_USE_SYSTEM_PROXIES;
    4444    static {
    4545        String v = System.getProperty("java.net.useSystemProxies");
  • trunk/src/org/openstreetmap/josm/io/GpxReader.java

    r8510 r8840  
    6969        private StringBuffer accumulator = new StringBuffer();
    7070
    71         private boolean nokiaSportsTrackerBug = false;
     71        private boolean nokiaSportsTrackerBug;
    7272
    7373        @Override
  • trunk/src/org/openstreetmap/josm/io/MessageNotifier.java

    r8734 r8840  
    5252    private static final Runnable WORKER = new Worker();
    5353
    54     private static volatile ScheduledFuture<?> task = null;
     54    private static volatile ScheduledFuture<?> task;
    5555
    5656    private static class Worker implements Runnable {
    5757
    58         private int lastUnreadCount = 0;
     58        private int lastUnreadCount;
    5959
    6060        @Override
  • trunk/src/org/openstreetmap/josm/io/NmeaReader.java

    r8836 r8840  
    217217        protected WayPoint pWp;
    218218
    219         protected int success = 0; // number of successfully parsed sentences
    220         protected int malformed = 0;
    221         protected int checksumErrors = 0;
    222         protected int noChecksum = 0;
    223         protected int unknown = 0;
    224         protected int zeroCoord = 0;
     219        protected int success; // number of successfully parsed sentences
     220        protected int malformed;
     221        protected int checksumErrors;
     222        protected int noChecksum;
     223        protected int unknown;
     224        protected int zeroCoord;
    225225    }
    226226
  • trunk/src/org/openstreetmap/josm/io/OsmApi.java

    r8836 r8840  
    8181    private static Map<String, OsmApi> instances = new HashMap<>();
    8282
    83     private URL url = null;
     83    private URL url;
    8484
    8585    /**
     
    120120
    121121    /** API version used for server communications */
    122     private String version = null;
     122    private String version;
    123123
    124124    /** API capabilities */
    125     private Capabilities capabilities = null;
     125    private Capabilities capabilities;
    126126
    127127    /** true if successfully initialized */
    128     private boolean initialized = false;
     128    private boolean initialized;
    129129
    130130    /**
  • trunk/src/org/openstreetmap/josm/io/OsmChangeBuilder.java

    r8510 r8840  
    2525    private OsmWriter osmwriter;
    2626    private String apiVersion = DEFAULT_API_VERSION;
    27     private boolean prologWritten = false;
     27    private boolean prologWritten;
    2828
    2929    public OsmChangeBuilder(Changeset changeset) {
  • trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java

    r8510 r8840  
    7171
    7272        /** The current changeset */
    73         private Changeset current = null;
     73        private Changeset current;
    7474
    7575        /** The current comment */
    76         private ChangesetDiscussionComment comment = null;
     76        private ChangesetDiscussionComment comment;
    7777
    7878        /** The current comment text */
    79         private StringBuilder text = null;
     79        private StringBuilder text;
    8080
    8181        protected void parseChangesetAttributes(Changeset cs, Attributes atts) throws XmlParsingException {
  • trunk/src/org/openstreetmap/josm/io/OsmConnection.java

    r8510 r8840  
    1212import java.nio.charset.StandardCharsets;
    1313
    14 import oauth.signpost.OAuthConsumer;
    15 import oauth.signpost.exception.OAuthException;
    16 
    1714import org.openstreetmap.josm.Main;
    1815import org.openstreetmap.josm.data.oauth.OAuthParameters;
     
    2320import org.openstreetmap.josm.tools.Base64;
    2421
     22import oauth.signpost.OAuthConsumer;
     23import oauth.signpost.exception.OAuthException;
     24
    2525/**
    2626 * Base class that handles common things like authentication for the reader and writer
     
    3030 */
    3131public class OsmConnection {
    32     protected boolean cancel = false;
     32    protected boolean cancel;
    3333    protected HttpURLConnection activeConnection;
    3434    protected OAuthParameters oauthParameters;
  • trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java

    r8510 r8840  
    3636        protected final ProgressMonitor progressMonitor;
    3737        protected final Compression compression;
    38         protected InputStream in = null;
     38        protected InputStream in;
    3939
    4040        public Parser(ProgressMonitor progressMonitor, Compression compression) {
  • trunk/src/org/openstreetmap/josm/io/OsmServerReader.java

    r8563 r8840  
    3636public abstract class OsmServerReader extends OsmConnection {
    3737    private OsmApi api = OsmApi.getOsmApi();
    38     private boolean doAuthenticate = false;
     38    private boolean doAuthenticate;
    3939    protected boolean gpxParsedProperly;
    4040
  • trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java

    r8510 r8840  
    5252
    5353    private OsmApi api = OsmApi.getOsmApi();
    54     private boolean canceled = false;
     54    private boolean canceled;
    5555
    5656    private static final int MSECS_PER_SECOND = 1000;
  • trunk/src/org/openstreetmap/josm/io/ProgressInputStream.java

    r8470 r8840  
    1818
    1919    private final InputStream in;
    20     private int readSoFar = 0;
    21     private int lastDialogUpdate = 0;
     20    private int readSoFar;
     21    private int lastDialogUpdate;
    2222    private boolean sizeKnown;
    2323    private final URLConnection connection;
  • trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java

    r8510 r8840  
    2020
    2121    /** The server socket */
    22     private ServerSocket server = null;
     22    private ServerSocket server;
    2323
    2424    /** The server instance for IPv4 */
    25     private static volatile RemoteControlHttpServer instance4 = null;
     25    private static volatile RemoteControlHttpServer instance4;
    2626    /** The server instance for IPv6 */
    27     private static volatile RemoteControlHttpServer instance6 = null;
     27    private static volatile RemoteControlHttpServer instance6;
    2828
    2929    /**
  • trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java

    r8540 r8840  
    7272
    7373    /** The server socket */
    74     private ServerSocket server = null;
     74    private ServerSocket server;
    7575
    7676    /** The server instance for IPv4 */
    77     private static volatile RemoteControlHttpsServer instance4 = null;
     77    private static volatile RemoteControlHttpsServer instance4;
    7878    /** The server instance for IPv6 */
    79     private static volatile RemoteControlHttpsServer instance6 = null;
     79    private static volatile RemoteControlHttpsServer instance6;
    8080
    8181    /** SSL context information for connections */
  • trunk/src/org/openstreetmap/josm/plugins/Plugin.java

    r8513 r8840  
    5050     * is a bit hacky, but it works).
    5151     */
    52     private PluginInformation info = null;
     52    private PluginInformation info;
    5353
    5454    /**
  • trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

    r8836 r8840  
    249249    }
    250250
    251     private static PluginDownloadTask pluginDownloadTask = null;
     251    private static PluginDownloadTask pluginDownloadTask;
    252252
    253253    public static Collection<ClassLoader> getResourceClassLoaders() {
  • trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java

    r8512 r8840  
    4444
    4545    /** The plugin jar file. */
    46     public File file = null;
     46    public File file;
    4747    /** The plugin name. */
    48     public String name = null;
     48    public String name;
    4949    /** The lowest JOSM version required by this plugin (from plugin list). **/
    50     public int mainversion = 0;
     50    public int mainversion;
    5151    /** The lowest JOSM version required by this plugin (from locally available jar). **/
    52     public int localmainversion = 0;
     52    public int localmainversion;
    5353    /** The plugin class name. */
    54     public String className = null;
     54    public String className;
    5555    /** Determines if the plugin is an old version loaded for incompatibility with latest JOSM (from plugin list) */
    56     public boolean oldmode = false;
     56    public boolean oldmode;
    5757    /** The list of required plugins, separated by ';' (from plugin list). */
    58     public String requires = null;
     58    public String requires;
    5959    /** The list of required plugins, separated by ';' (from locally available jar). */
    60     public String localrequires = null;
     60    public String localrequires;
    6161    /** The plugin link (for documentation). */
    62     public String link = null;
     62    public String link;
    6363    /** The plugin description. */
    64     public String description = null;
     64    public String description;
    6565    /** Determines if the plugin must be loaded early or not. */
    66     public boolean early = false;
     66    public boolean early;
    6767    /** The plugin author. */
    68     public String author = null;
     68    public String author;
    6969    /** The plugin stage, determining the loading sequence order of plugins. */
    7070    public int stage = 50;
    7171    /** The plugin version (from plugin list). **/
    72     public String version = null;
     72    public String version;
    7373    /** The plugin version (from locally available jar). **/
    74     public String localversion = null;
     74    public String localversion;
    7575    /** The plugin download link. */
    76     public String downloadlink = null;
     76    public String downloadlink;
    7777    /** The plugin icon path inside jar. */
    7878    public String iconPath;
     
    8080    public ImageIcon icon;
    8181    /** Plugin can be loaded at any time and not just at start. */
    82     public boolean canloadatruntime = false;
     82    public boolean canloadatruntime;
    8383    /** The libraries referenced in Class-Path manifest attribute. */
    8484    public List<URL> libraries = new LinkedList<>();
  • trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java

    r8510 r8840  
    2626public final class AudioPlayer extends Thread {
    2727
    28     private static volatile AudioPlayer audioPlayer = null;
     28    private static volatile AudioPlayer audioPlayer;
    2929
    3030    private enum State { INITIALIZING, NOTPLAYING, PLAYING, PAUSED, INTERRUPTED }
  • trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java

    r8836 r8840  
    4141public final class BugReportExceptionHandler implements Thread.UncaughtExceptionHandler {
    4242
    43     private static boolean handlingInProgress = false;
    44     private static volatile BugReporterThread bugReporterThread = null;
    45     private static int exceptionCounter = 0;
    46     private static boolean suppressExceptionDialogs = false;
     43    private static boolean handlingInProgress;
     44    private static volatile BugReporterThread bugReporterThread;
     45    private static int exceptionCounter;
     46    private static boolean suppressExceptionDialogs;
    4747
    4848    private static class BugReporterThread extends Thread {
  • trunk/src/org/openstreetmap/josm/tools/CopyList.java

    r8394 r8840  
    148148         * Index of element to be returned by subsequent call to next.
    149149         */
    150         private int cursor = 0;
     150        private int cursor;
    151151
    152152        /**
  • trunk/src/org/openstreetmap/josm/tools/Diff.java

    r8624 r8840  
    107107    With this heuristic, for files with a constant small density
    108108    of changes, the algorithm is linear in the file size.  */
    109     public boolean heuristic = false;
     109    public boolean heuristic;
    110110
    111111    /** When set to true, the algorithm returns a guarranteed minimal
    112112      set of changes.  This makes things slower, sometimes much slower. */
    113     public boolean noDiscards = false;
     113    public boolean noDiscards;
    114114
    115115    private int[] xvec, yvec; /* Vectors being compared. */
     
    376376    }
    377377
    378     private boolean inhibit = false;
     378    private boolean inhibit;
    379379
    380380    /** Adjust inserts/deletes of blank lines to join changes
  • trunk/src/org/openstreetmap/josm/tools/I18n.java

    r8513 r8840  
    171171        "OptionPane.cancelButtonText"
    172172    };
    173     private static volatile Map<String, String> strings = null;
    174     private static volatile Map<String, String[]> pstrings = null;
     173    private static volatile Map<String, String> strings;
     174    private static volatile Map<String, String[]> pstrings;
    175175    private static Map<String, PluralMode> languages = new HashMap<>();
    176176
  • trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

    r8836 r8840  
    184184    protected Collection<ClassLoader> additionalClassLoaders;
    185185    /** ordered list of overlay images */
    186     protected List<ImageOverlay> overlayInfo = null;
     186    protected List<ImageOverlay> overlayInfo;
    187187
    188188    private static SVGUniverse svgUniverse;
  • trunk/src/org/openstreetmap/josm/tools/ImageResource.java

    r8723 r8840  
    4040     * ordered list of overlay images
    4141     */
    42     protected List<ImageOverlay> overlayInfo = null;
    43     private Image baseImage = null;
     42    protected List<ImageOverlay> overlayInfo;
     43    private Image baseImage;
    4444
    4545    /**
  • trunk/src/org/openstreetmap/josm/tools/Shortcut.java

    r8720 r8840  
    311311
    312312    // bootstrap
    313     private static boolean initdone = false;
     313    private static boolean initdone;
    314314    private static void doInit() {
    315315        if (initdone) return;
  • trunk/src/org/openstreetmap/josm/tools/TextTagParser.java

    r8513 r8840  
    4040
    4141    public static class TextAnalyzer {
    42         private boolean quotesStarted = false;
    43         private boolean esc = false;
     42        private boolean quotesStarted;
     43        private boolean esc;
    4444        private StringBuilder s = new StringBuilder(200);
    4545        private int pos;
  • trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java

    r8836 r8840  
    232232     */
    233233    private List<Object> queue = new LinkedList<>();
    234     private Iterator<Object> queueIterator = null;
     234    private Iterator<Object> queueIterator;
    235235
    236236    /**
Note: See TracChangeset for help on using the changeset viewer.