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

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

Location:
trunk/src/org/openstreetmap/josm/gui
Files:
100 edited

Legend:

Unmodified
Added
Removed
  • 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();
Note: See TracChangeset for help on using the changeset viewer.