Changeset 9078 in josm


Ignore:
Timestamp:
2015-12-02T00:05:09+01:00 (8 years ago)
Author:
Don-vip
Message:

sonar - Immutable Field

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

Legend:

Unmodified
Added
Removed

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

    r9074 r9078  
    107107
    108108    private static class DefaultAction extends AbstractAction {
    109         private JDialog dialog;
    110         private JOptionPane pane;
    111         private int value;
     109        private final JDialog dialog;
     110        private final JOptionPane pane;
     111        private final int value;
    112112
    113113        DefaultAction(JDialog dialog, JOptionPane pane, int value) {

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

    r8792 r9078  
    5959    };
    6060
    61     private transient Action offsetAction = new JosmAction(
     61    private final transient Action offsetAction = new JosmAction(
    6262            tr("Imagery offset"), "mapmode/adjustimg", tr("Adjust imagery offset"), null, false, false) {
    6363        {
    … …  
    258258     * @since 5803
    259259     */
    260     private List<Object> dynamicItems = new ArrayList<>(20);
     260    private final List<Object> dynamicItems = new ArrayList<>(20);
    261261
    262262    /**

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

    r9059 r9078  
    407407     * Popup menu to display menu items search result.
    408408     */
    409     private JPopupMenu searchResultsMenu = new JPopupMenu();
     409    private final JPopupMenu searchResultsMenu = new JPopupMenu();
    410410
    411411    /** this menu listener hides unnecessary JSeparators in a menu list but does not remove them.
    … …  
    941941
    942942    static class PresetsMenuEnabler implements MapView.LayerChangeListener {
    943         private JMenu presetsMenu;
     943        private final JMenu presetsMenu;
    944944
    945945        PresetsMenuEnabler(JMenu presetsMenu) {

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

    r9059 r9078  
    493493    private final class SideToolbarPopupMenu extends JPopupMenu {
    494494        private static final int staticMenuEntryCount = 2;
    495         private JCheckBoxMenuItem doNotHide = new JCheckBoxMenuItem(new AbstractAction(tr("Do not hide toolbar")) {
     495        private final JCheckBoxMenuItem doNotHide = new JCheckBoxMenuItem(new AbstractAction(tr("Do not hide toolbar")) {
    496496            @Override
    497497            public void actionPerformed(ActionEvent e) {
    … …  
    547547
    548548        private JButton button;
    549         private transient Collection<? extends HideableButton> buttons;
     549        private final transient Collection<? extends HideableButton> buttons;
    550550
    551551        ListAllButtonsAction(Collection<? extends HideableButton> buttons) {

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

    r9059 r9078  
    205205     * It gets destroyed by destroy() when the MapFrame itself is destroyed.
    206206     */
    207     private transient Thread thread;
     207    private final transient Thread thread;
    208208
    209209    private final transient List<StatusTextHistory> statusText = new ArrayList<>();
    … …  
    348348        private Popup popup;
    349349
    350         private MapFrame parent;
     350        private final MapFrame parent;
    351351
    352352        private final BlockingQueue<MouseState> incomingMouseState = new LinkedBlockingQueue<>();
    … …  
    677677    }
    678678
    679     private transient AWTEventListener awtListener = new AWTEventListener() {
     679    private final transient AWTEventListener awtListener = new AWTEventListener() {
    680680         @Override
    681681         public void eventDispatched(AWTEvent event) {
    … …  
    694694    };
    695695
    696     private transient MouseMotionListener mouseMotionListener = new MouseMotionListener() {
     696    private final transient MouseMotionListener mouseMotionListener = new MouseMotionListener() {
    697697        @Override
    698698        public void mouseMoved(MouseEvent e) {
    … …  
    708708    };
    709709
    710     private transient KeyAdapter keyAdapter = new KeyAdapter() {
     710    private final transient KeyAdapter keyAdapter = new KeyAdapter() {
    711711        @Override public void keyPressed(KeyEvent e) {
    712712            synchronized (collector) {

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

    r8925 r9078  
    11071107    }
    11081108
    1109     private transient SelectionChangedListener repaintSelectionChangedListener = new SelectionChangedListener() {
     1109    private final transient SelectionChangedListener repaintSelectionChangedListener = new SelectionChangedListener() {
    11101110        @Override
    11111111        public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {

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

    r8840 r9078  
    443443            implements ChangeListener {
    444444
    445         private MenuScrollTimer timer;
     445        private final MenuScrollTimer timer;
    446446
    447447        MenuScrollItem(MenuIcon icon, int increment) {

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

    r9076 r9078  
    216216    /**
    217217     * Returns the current center of the viewport.
    218      * 
     218     *
    219219     * (Use {@link #zoomTo(EastNorth)} to the change the center.)
    220      * 
     220     *
    221221     * @return the current center of the viewport
    222222     */
    … …  
    227227    /**
    228228     * Returns the current scale.
    229      * 
     229     *
    230230     * In east/north units per pixel.
    231      * 
     231     *
    232232     * @return the current scale
    233233     */
    … …  
    602602    }
    603603
    604     private Stack<ZoomData> zoomUndoBuffer = new Stack<>();
    605     private Stack<ZoomData> zoomRedoBuffer = new Stack<>();
     604    private final Stack<ZoomData> zoomUndoBuffer = new Stack<>();
     605    private final Stack<ZoomData> zoomRedoBuffer = new Stack<>();
    606606    private Date zoomTimestamp = new Date();
    607607

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

    r8426 r9078  
    2222public class NoteInputDialog extends ExtendedDialog {
    2323
    24     private JosmTextArea textArea = new JosmTextArea();
     24    private final JosmTextArea textArea = new JosmTextArea();
    2525
    2626    /**

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

    r7937 r9078  
    2222public class NoteSortDialog extends ExtendedDialog {
    2323
    24     private JRadioButton defaultSort = new JRadioButton(tr("Default (open, closed, new)"));
    25     private JRadioButton userSort = new JRadioButton(tr("Username"));
    26     private JRadioButton dateSort = new JRadioButton(tr("Created date"));
    27     private JRadioButton lastActionSort = new JRadioButton(tr("Last change date"));
     24    private final JRadioButton defaultSort = new JRadioButton(tr("Default (open, closed, new)"));
     25    private final JRadioButton userSort = new JRadioButton(tr("Username"));
     26    private final JRadioButton dateSort = new JRadioButton(tr("Created date"));
     27    private final JRadioButton lastActionSort = new JRadioButton(tr("Last change date"));
    2828
    2929    /**

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

    r9073 r9078  
    5555class NotificationManager {
    5656
    57     private Timer hideTimer; // started when message is shown, responsible for hiding the message
    58     private Timer pauseTimer; // makes sure, there is a small pause between two consecutive messages
    59     private Timer unfreezeDelayTimer; // tiny delay before resuming the timer when mouse cursor is moved off the panel
     57    private final Timer hideTimer; // started when message is shown, responsible for hiding the message
     58    private final Timer pauseTimer; // makes sure, there is a small pause between two consecutive messages
     59    private final Timer unfreezeDelayTimer; // tiny delay before resuming the timer when mouse cursor is moved off the panel
    6060    private boolean running;
    6161

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

    r8958 r9078  
    2828 */
    2929public class OsmPrimitivRenderer implements ListCellRenderer<OsmPrimitive>, TableCellRenderer {
    30     private DefaultNameFormatter formatter = DefaultNameFormatter.getInstance();
     30    private final DefaultNameFormatter formatter = DefaultNameFormatter.getInstance();
    3131
    3232    /**
    3333     * Default list cell renderer - delegate for ListCellRenderer operation
    3434     */
    35     private DefaultListCellRenderer defaultListCellRenderer = new DefaultListCellRenderer();
     35    private final DefaultListCellRenderer defaultListCellRenderer = new DefaultListCellRenderer();
    3636
    3737    /**
    3838     * Default table cell renderer - delegate for TableCellRenderer operation
    3939     */
    40     private DefaultTableCellRenderer defaultTableCellRenderer = new DefaultTableCellRenderer();
     40    private final DefaultTableCellRenderer defaultTableCellRenderer = new DefaultTableCellRenderer();
    4141
    4242    /**

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

    r8840 r9078  
    3939
    4040    private class ScrollViewPortMouseListener extends MouseAdapter {
    41         private int direction;
     41        private final int direction;
    4242
    4343        ScrollViewPortMouseListener(int direction) {
    … …  
    6565    }
    6666
    67     private JViewport vp = new JViewport();
     67    private final JViewport vp = new JViewport();
    6868    private JComponent component;
    6969
    70     private List<JButton> buttons = new ArrayList<>();
    71 
    72     private Timer timer = new Timer(100, new ActionListener() {
     70    private final List<JButton> buttons = new ArrayList<>();
     71
     72    private final Timer timer = new Timer(100, new ActionListener() {
    7373        @Override
    7474        public void actionPerformed(ActionEvent arg0) {

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

    r9059 r9078  
    127127    private final NavigatableComponent nc;
    128128    /**
    129      * Whether the selection rectangle must obtain the aspect ratio of the
    130      * drawComponent.
    131      */
    132     private boolean aspectRatio;
     129     * Whether the selection rectangle must obtain the aspect ratio of the drawComponent.
     130     */
     131    private final boolean aspectRatio;
    133132
    134133    /**
    … …  
    139138     * The polygon to store the selection outline if {@link #lassoMode} is used.
    140139     */
    141     private Polygon lasso = new Polygon();
     140    private final Polygon lasso = new Polygon();
    142141
    143142    /**

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

    r8840 r9078  
    2323    private int y;
    2424
    25     private ImageIcon enlargeImage;
    26     private ImageIcon shrinkImage;
     25    private final ImageIcon enlargeImage;
     26    private final ImageIcon shrinkImage;
    2727    private boolean isEnlarged;
    2828    private final SlippyMapBBoxChooser slippyMapBBoxChooser;

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

    r8855 r9078  
    119119    public static final String RESIZE_PROP = SlippyMapBBoxChooser.class.getName() + ".resize";
    120120
    121     private transient TileLoader cachedLoader;
    122     private transient OsmTileLoader uncachedLoader;
     121    private final transient TileLoader cachedLoader;
     122    private final transient OsmTileLoader uncachedLoader;
    123123
    124124    private final SizeButton iSizeButton;

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

    r8846 r9078  
    170170    private class MoveXAction extends AbstractAction {
    171171
    172         private int direction;
     172        private final int direction;
    173173
    174174        MoveXAction(int direction) {
    … …  
    184184    private class MoveYAction extends AbstractAction {
    185185
    186         private int direction;
     186        private final int direction;
    187187
    188188        MoveYAction(int direction) {

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

    r9059 r9078  
    229229        private transient TileCoordinateValidator valMinX;
    230230        private JSpinner spZoomLevel;
    231         private transient TileBoundsBuilder tileBoundsBuilder = new TileBoundsBuilder();
     231        private final transient TileBoundsBuilder tileBoundsBuilder = new TileBoundsBuilder();
    232232        private boolean doFireTileBoundChanged = true;
    233233

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java

    r8840 r9078  
    2323 */
    2424public  class RelationMemberTableCellRenderer extends JLabel implements TableCellRenderer {
    25     private transient Border rowNumberBorder;
     25    private final transient Border rowNumberBorder;
    2626
    2727    /**

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

    r8840 r9078  
    1717public class TagMergeItem {
    1818
    19     private String key;
    20     private String myTagValue;
    21     private String theirTagValue;
     19    private final String key;
     20    private final String myTagValue;
     21    private final String theirTagValue;
    2222    private MergeDecisionType mergeDecision = MergeDecisionType.UNDECIDED;
    2323

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

    r9059 r9078  
    5050
    5151    /** the combo box used as editor */
    52     private JosmComboBox<Object> editor;
    53     private DefaultComboBoxModel<Object> editorModel;
    54     private CopyOnWriteArrayList<NavigationListener> listeners;
     52    private final JosmComboBox<Object> editor;
     53    private final DefaultComboBoxModel<Object> editorModel;
     54    private final CopyOnWriteArrayList<NavigationListener> listeners;
    5555
    5656    /**

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

    r8510 r9078  
    2525public class MultiValueCellRenderer extends JLabel implements TableCellRenderer {
    2626
    27     private ImageIcon iconDecided;
    28     private ImageIcon iconUndecided;
    29     private DefaultComboBoxModel<Object> model;
    30     private JosmComboBox<Object> cbDecisionRenderer;
     27    private final ImageIcon iconDecided;
     28    private final ImageIcon iconUndecided;
     29    private final DefaultComboBoxModel<Object> model;
     30    private final JosmComboBox<Object> cbDecisionRenderer;
    3131
    3232    /**

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

    r8510 r9078  
    2626    private MultiValueDecisionType type;
    2727    /** the collection of tags for which a decision is needed */
    28     private TagCollection tags;
     28    private final TagCollection tags;
    2929    /** the selected value if {@link #type} is {@link MultiValueDecisionType#KEEP_ONE} */
    3030    private String value;

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

    r8849 r9078  
    402402    private static final class StatisticsTableModel extends DefaultTableModel {
    403403        private static final String[] HEADERS = new String[] {tr("Paste ..."), tr("From ..."), tr("To ...") };
    404         private transient List<StatisticsInfo> data;
     404        private final transient List<StatisticsInfo> data;
    405405
    406406        private StatisticsTableModel() {

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

    r8880 r9078  
    1212public class RelationMemberConflictDecision {
    1313
    14     private Relation relation;
    15     private int pos;
    16     private OsmPrimitive originalPrimitive;
     14    private final Relation relation;
     15    private final int pos;
     16    private final OsmPrimitive originalPrimitive;
    1717    private String role;
    1818    private RelationMemberConflictDecisionType decision;

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

    r8510 r9078  
    1717implements TableCellRenderer, ListCellRenderer<RelationMemberConflictDecisionType> {
    1818
    19     private JosmComboBox<RelationMemberConflictDecisionType> cbDecisionTypes;
     19    private final JosmComboBox<RelationMemberConflictDecisionType> cbDecisionTypes;
    2020
    2121    protected void resetTableRenderer() {

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

    r8510 r9078  
    2727
    2828    /** the model for the tag conflict resolver */
    29     private TagConflictResolverModel model;
     29    private final TagConflictResolverModel model;
    3030    /** selects whether only tags with conflicts are displayed */
    3131    private JCheckBox cbShowTagsWithConflictsOnly;

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

    r8840 r9078  
    2727    private transient Map<String, MultiValueResolutionDecision> decisions;
    2828    private int numConflicts;
    29     private PropertyChangeSupport support;
     29    private final PropertyChangeSupport support;
    3030    private boolean showTagsWithConflictsOnly;
    3131    private boolean showTagsWithMultiValuesOnly;

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

    r9059 r9078  
    6363    private final JTree redoTree = new JTree(redoTreeModel);
    6464
    65     private transient UndoRedoSelectionListener undoSelectionListener;
    66     private transient UndoRedoSelectionListener redoSelectionListener;
    67 
    68     private JScrollPane scrollPane;
    69     private JSeparator separator = new JSeparator();
     65    private final transient UndoRedoSelectionListener undoSelectionListener;
     66    private final transient UndoRedoSelectionListener redoSelectionListener;
     67
     68    private final JScrollPane scrollPane;
     69    private final JSeparator separator = new JSeparator();
    7070    // only visible, if separator is the top most component
    71     private Component spacer = Box.createRigidArea(new Dimension(0, 3));
     71    private final Component spacer = Box.createRigidArea(new Dimension(0, 3));
    7272
    7373    // last operation is remembered to select the next undo/redo entry in the list
    … …  
    7676
    7777    // Actions for context menu and Enter key
    78     private SelectAction selectAction = new SelectAction();
    79     private SelectAndZoomAction selectAndZoomAction = new SelectAndZoomAction();
     78    private final SelectAction selectAction = new SelectAction();
     79    private final SelectAndZoomAction selectAndZoomAction = new SelectAndZoomAction();
    8080
    8181    /**
    … …  
    167167     */
    168168    private class UndoRedoSelectionListener implements TreeSelectionListener {
    169         private JTree source;
     169        private final JTree source;
    170170
    171171        UndoRedoSelectionListener(JTree source) {
    … …  
    247247     * Simple listener setup to update the button enabled state when the side dialog shows.
    248248     */
    249     private transient Set<IEnabledStateUpdating> showNotifyListener = new LinkedHashSet<>();
     249    private final transient Set<IEnabledStateUpdating> showNotifyListener = new LinkedHashSet<>();
    250250
    251251    private void addShowNotifyListener(IEnabledStateUpdating listener) {
    … …  
    431431     */
    432432    protected class UndoRedoAction extends AbstractAction implements IEnabledStateUpdating {
    433         private UndoRedoType type;
    434         private JTree tree;
     433        private final UndoRedoType type;
     434        private final JTree tree;
    435435
    436436        /**
    … …  
    439439         */
    440440        public UndoRedoAction(UndoRedoType type) {
    441             super();
    442441            this.type = type;
    443             switch (type) {
    444             case UNDO:
     442            if (UndoRedoType.UNDO == type) {
    445443                tree = undoTree;
    446444                putValue(NAME, tr("Undo"));
    447445                putValue(SHORT_DESCRIPTION, tr("Undo the selected and all later commands"));
    448446                putValue(SMALL_ICON, ImageProvider.get("undo"));
    449                 break;
    450             case REDO:
     447            } else {
    451448                tree = redoTree;
    452449                putValue(NAME, tr("Redo"));
    453450                putValue(SHORT_DESCRIPTION, tr("Redo the selected and all earlier commands"));
    454451                putValue(SMALL_ICON, ImageProvider.get("redo"));
    455                 break;
    456452            }
    457453        }

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

    r9059 r9078  
    188188     */
    189189    public static class RelationMemberTableModel extends DefaultTableModel {
    190         private transient List<RelationToChildReference> data;
     190        private final transient List<RelationToChildReference> data;
    191191
    192192        /**

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

    r9059 r9078  
    2626     * Panels that are added to the multisplitpane.
    2727     */
    28     private List<JPanel> panels = new ArrayList<>();
     28    private final List<JPanel> panels = new ArrayList<>();
    2929
    3030    private final JSplitPane parent;

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

    r9059 r9078  
    5858
    5959    private JTable userTable;
    60     private FilterTableModel filterModel = new FilterTableModel();
    61 
    62     private EnableFilterAction enableFilterAction;
    63     private HidingFilterAction hidingFilterAction;
     60    private final FilterTableModel filterModel = new FilterTableModel();
     61
     62    private final EnableFilterAction enableFilterAction;
     63    private final HidingFilterAction hidingFilterAction;
    6464
    6565    /**

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

    r8836 r9078  
    366366    }
    367367
    368     private OSDLabel lblOSD = new OSDLabel("");
     368    private final OSDLabel lblOSD = new OSDLabel("");
    369369
    370370    public void drawOSDText(Graphics2D g) {

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

    r8870 r9078  
    133133        private static final char NL = '\n';
    134134
    135         private StringBuilder s = new StringBuilder();
     135        private final StringBuilder s = new StringBuilder();
    136136
    137137        private DataText add(String title, String... values) {

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

    r9059 r9078  
    109109
    110110    /** the model for the layer list */
    111     private LayerListModel model;
     111    private final LayerListModel model;
    112112
    113113    /** the list of layers (technically its a JTable, but appears like a list) */
    114     private LayerList layerList;
    115 
    116     private SideButton opacityButton;
    117     private SideButton gammaButton;
    118 
    119     private ActivateLayerAction activateLayerAction;
    120     private ShowHideLayerAction showHideLayerAction;
     114    private final LayerList layerList;
     115
     116    private final SideButton opacityButton;
     117    private final SideButton gammaButton;
     118
     119    private final ActivateLayerAction activateLayerAction;
     120    private final ShowHideLayerAction showHideLayerAction;
    121121
    122122    //TODO This duplicates ShowHide actions functionality
    123123    /** stores which layer index to toggle and executes the ShowHide action if the layer is present */
    124124    private final class ToggleLayerIndexVisibility extends AbstractAction {
    125         private int layerIndex = -1;
     125        private final int layerIndex;
    126126
    127127        ToggleLayerIndexVisibility(int layerIndex) {
    … …  
    440440
    441441        private transient WeakReference<Layer> lastLayer;
    442         private transient Shortcut multikeyShortcut;
     442        private final transient Shortcut multikeyShortcut;
    443443
    444444        /**
    … …  
    12261226    public final class LayerListModel extends AbstractTableModel implements MapView.LayerChangeListener, PropertyChangeListener {
    12271227        /** manages list selection state*/
    1228         private DefaultListSelectionModel selectionModel;
    1229         private CopyOnWriteArrayList<LayerListModelListener> listeners;
     1228        private final DefaultListSelectionModel selectionModel;
     1229        private final CopyOnWriteArrayList<LayerListModelListener> listeners;
    12301230
    12311231        /**

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

    r8846 r9078  
    487487
    488488        private class SaveToFileTask extends PleaseWaitRunnable {
    489             private StyleSource s;
    490             private File file;
     489            private final StyleSource s;
     490            private final File file;
    491491
    492492            private boolean canceled;

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

    r9070 r9078  
    232232    private static class NoteRenderer implements ListCellRenderer<Note> {
    233233
    234         private DefaultListCellRenderer defaultListCellRenderer = new DefaultListCellRenderer();
     234        private final DefaultListCellRenderer defaultListCellRenderer = new DefaultListCellRenderer();
    235235        private final DateFormat dateFormat = DateUtils.getDateTimeFormat(DateFormat.MEDIUM, DateFormat.SHORT);
    236236
    … …  
    264264
    265265    class NoteTableModel extends AbstractListModel<Note> {
    266         private transient List<Note> data;
     266        private final transient List<Note> data;
    267267
    268268        /**

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

    r9059 r9078  
    117117
    118118    private final transient HighlightHelper highlightHelper = new HighlightHelper();
    119     private boolean highlightEnabled = Main.pref.getBoolean("draw.target-highlight", true);
     119    private final boolean highlightEnabled = Main.pref.getBoolean("draw.target-highlight", true);
    120120
    121121    /**
    … …  
    372372        private final transient List<Relation> relations = new ArrayList<>();
    373373        private transient List<Relation> filteredRelations;
    374         private DefaultListSelectionModel selectionModel;
     374        private final DefaultListSelectionModel selectionModel;
    375375        private transient SearchCompiler.Match filter;
    376376

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

    r8836 r9078  
    198198    class MouseEventHandler extends PopupMenuLauncher {
    199199        private final HighlightHelper helper = new HighlightHelper();
    200         private boolean highlightEnabled = Main.pref.getBoolean("draw.target-highlight", true);
     200        private final boolean highlightEnabled = Main.pref.getBoolean("draw.target-highlight", true);
    201201
    202202        MouseEventHandler() {
    … …  
    480480        private LinkedList<Collection<? extends OsmPrimitive>> history;
    481481        private final transient List<OsmPrimitive> selection = new ArrayList<>();
    482         private DefaultListSelectionModel selectionModel;
     482        private final DefaultListSelectionModel selectionModel;
    483483
    484484        /**

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

    r9074 r9078  
    153153    protected JToggleButton button;
    154154    private JPanel buttonsPanel;
    155     private transient List<javax.swing.Action> buttonActions = new ArrayList<>();
     155    private final transient List<javax.swing.Action> buttonActions = new ArrayList<>();
    156156
    157157    /** holds the menu entry in the windows menu. Required to properly

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

    r9059 r9078  
    288288     */
    289289    static class UserTableModel extends DefaultTableModel {
    290         private transient List<UserInfo> data;
     290        private final transient List<UserInfo> data;
    291291
    292292        UserTableModel() {

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

    r8840 r9078  
    7272
    7373    /** The fix button */
    74     private SideButton fixButton;
     74    private final SideButton fixButton;
    7575    /** The ignore button */
    76     private SideButton ignoreButton;
     76    private final SideButton ignoreButton;
    7777    /** The select button */
    78     private SideButton selectButton;
     78    private final SideButton selectButton;
    7979    /** The lookup button */
    80     private SideButton lookupButton;
     80    private final SideButton lookupButton;
    8181
    8282    private final JPopupMenu popupMenu = new JPopupMenu();
    … …  
    586586     */
    587587    class FixTask extends PleaseWaitRunnable {
    588         private Collection<TestError> testErrors;
     588        private final Collection<TestError> testErrors;
    589589        private boolean canceled;
    590590

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java

    r9059 r9078  
    3131
    3232    private final transient List<Changeset> data = new ArrayList<>();
    33     private DefaultListSelectionModel selectionModel;
     33    private final DefaultListSelectionModel selectionModel;
    3434    private transient Changeset changesetInDetailView;
    3535    private final PropertyChangeSupport support = new PropertyChangeSupport(this);

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java

    r9059 r9078  
    2525
    2626    private final transient List<ChangesetContentEntry> data = new ArrayList<>();
    27     private DefaultListSelectionModel selectionModel;
     27    private final DefaultListSelectionModel selectionModel;
    2828
    2929    public ChangesetContentTableModel(DefaultListSelectionModel selectionModel) {

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java

    r8510 r9078  
    2424    private final transient List<Changeset> data = new ArrayList<>();
    2525    private final transient Storage<Changeset> shownChangesets = new Storage<>(true);
    26     private DefaultListSelectionModel selectionModel;
     26    private final DefaultListSelectionModel selectionModel;
    2727
    2828    public ChangesetListModel(DefaultListSelectionModel selectionModel) {

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

    r9073 r9078  
    864864
    865865    static class MemberInfo {
    866         private List<RelationMember> role = new ArrayList<>();
     866        private final List<RelationMember> role = new ArrayList<>();
    867867        private Set<OsmPrimitive> members = new HashSet<>();
    868868        private List<Integer> position = new ArrayList<>();

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

    r8870 r9078  
    9595    private String objKey;
    9696
    97     private Comparator<AutoCompletionListItem> defaultACItemComparator = new Comparator<AutoCompletionListItem>() {
     97    private final Comparator<AutoCompletionListItem> defaultACItemComparator = new Comparator<AutoCompletionListItem>() {
    9898        @Override
    9999        public int compare(AutoCompletionListItem o1, AutoCompletionListItem o2) {
    … …  
    244244        private final transient Map<String, Integer> m;
    245245
    246         private transient Comparator<AutoCompletionListItem> usedValuesAwareComparator = new Comparator<AutoCompletionListItem>() {
     246        private final transient Comparator<AutoCompletionListItem> usedValuesAwareComparator = new Comparator<AutoCompletionListItem>() {
    247247                @Override
    248248                public int compare(AutoCompletionListItem o1, AutoCompletionListItem o2) {
    … …  
    536536
    537537    class AddTagsDialog extends AbstractTagsDialog {
    538         private List<JosmAction> recentTagsActions = new ArrayList<>();
     538        private final List<JosmAction> recentTagsActions = new ArrayList<>();
    539539
    540540        // Counter of added commands for possible undo

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

    r8510 r9078  
    3535    private Exception lastException;
    3636    private final Set<Relation> parents = new HashSet<>();
    37     private Collection<OsmPrimitive> children;
    38     private OsmDataLayer curLayer;
     37    private final Collection<OsmPrimitive> children;
     38    private final OsmDataLayer curLayer;
    3939    private MultiFetchServerObjectReader objectReader;
    4040

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

    r8510 r9078  
    3030    private boolean canceled;
    3131    private Exception lastException;
    32     private Collection<Relation> relations;
    33     private OsmDataLayer layer;
     32    private final Collection<Relation> relations;
     33    private final OsmDataLayer layer;
    3434    private OsmServerObjectReader objectReader;
    3535

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

    r9073 r9078  
    9898public class GenericRelationEditor extends RelationEditor  {
    9999    /** the tag table and its model */
    100     private TagEditorPanel tagEditorPanel;
    101     private ReferringRelationsBrowser referrerBrowser;
    102     private ReferringRelationsBrowserModel referrerModel;
     100    private final TagEditorPanel tagEditorPanel;
     101    private final ReferringRelationsBrowser referrerBrowser;
     102    private final ReferringRelationsBrowserModel referrerModel;
    103103
    104104    /** the member table */
    105105    private MemberTable memberTable;
    106     private MemberTableModel memberTableModel;
     106    private final MemberTableModel memberTableModel;
    107107
    108108    /** the model for the selection table */
    109109    private SelectionTable selectionTable;
    110     private SelectionTableModel selectionTableModel;
     110    private final SelectionTableModel selectionTableModel;
    111111
    112112    private AutoCompletingTextField tfRole;

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

    r8958 r9078  
    1515
    1616public class MemberRoleCellEditor extends AbstractCellEditor implements TableCellEditor {
    17     private AutoCompletingTextField editor;
     17    private final 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;
     22    private final AutoCompletionList autoCompletionList;
    2323
    2424    /**

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

    r9059 r9078  
    4545    /** the additional actions in popup menu */
    4646    private ZoomToGapAction zoomToGap;
    47     private transient HighlightHelper highlightHelper = new HighlightHelper();
     47    private final transient HighlightHelper highlightHelper = new HighlightHelper();
    4848    private boolean highlightEnabled;
    4949

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

    r9020 r9078  
    5151     * data of the table model: The list of members and the cached WayConnectionType of each member.
    5252     **/
    53     private transient List<RelationMember> members;
     53    private final transient List<RelationMember> members;
    5454    private transient List<WayConnectionType> connectionType;
    5555

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

    r9059 r9078  
    5555    private Exception lastException;
    5656    private DataSet referrers;
    57     private boolean full;
    58     private OsmDataLayer layer;
    59     private Relation child;
    60     private List<Relation> parents;
     57    private final boolean full;
     58    private final OsmDataLayer layer;
     59    private final Relation child;
     60    private final List<Relation> parents;
    6161    private Runnable continuation;
    6262

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

    r8836 r9078  
    3737    /** the list of relations */
    3838    private JList<Relation> referrers;
    39     private ReferringRelationsBrowserModel model;
    40     private transient OsmDataLayer layer;
     39    private final ReferringRelationsBrowserModel model;
     40    private final transient OsmDataLayer layer;
    4141    private JCheckBox cbReadFull;
    4242    private EditAction editAction;

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

    r9059 r9078  
    5959
    6060    /** the data layer the relation belongs to */
    61     private transient OsmDataLayer layer;
     61    private final transient OsmDataLayer layer;
    6262
    6363    /**

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

    r9075 r9078  
    105105        private boolean canceled;
    106106        private Exception lastException;
    107         private Relation relation;
     107        private final Relation relation;
    108108        private DataSet ds;
    109         private TreePath path;
     109        private final TreePath path;
    110110
    111111        RelationLoader(Dialog dialog, Relation relation, TreePath path) {

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

    r8510 r9078  
    2323
    2424    /** the relation icon */
    25     private ImageIcon icon;
     25    private final ImageIcon icon;
    2626
    2727    /**

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

    r8444 r9078  
    1414public class SelectionTable extends JTable {
    1515
    16     private SelectionTableModel model;
     16    private final SelectionTableModel model;
    1717    private MemberTableModel memberTableModel;
    1818

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

    r9059 r9078  
    1919
    2020    /** this selection table model only displays selected primitives in this layer */
    21     private transient OsmDataLayer layer;
    22     private transient List<OsmPrimitive> cache;
     21    private final transient OsmDataLayer layer;
     22    private final transient List<OsmPrimitive> cache;
    2323
    2424    /**

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

    r9075 r9078  
    176176    }
    177177
    178     private Border errorBorder = BorderFactory.createLineBorder(Color.RED, 1);
     178    private final Border errorBorder = BorderFactory.createLineBorder(Color.RED, 1);
    179179
    180180    protected void setErrorMessage(JosmTextField tf, String msg) {
    … …  
    189189
    190190    class LatValueChecker extends FocusAdapter implements ActionListener {
    191         private JosmTextField tfLatValue;
     191        private final JosmTextField tfLatValue;
    192192
    193193        LatValueChecker(JosmTextField tfLatValue) {
    … …  
    222222
    223223    class LonValueChecker extends FocusAdapter implements ActionListener {
    224         private JosmTextField tfLonValue;
     224        private final JosmTextField tfLonValue;
    225225
    226226        LonValueChecker(JosmTextField tfLonValue) {
    … …  
    255255
    256256    static class SelectAllOnFocusHandler extends FocusAdapter {
    257         private JTextComponent tfTarget;
     257        private final JTextComponent tfTarget;
    258258
    259259        SelectAllOnFocusHandler(JTextComponent tfTarget) {

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

    r8851 r9078  
    201201        private StringBuilder description;
    202202        private int depth;
    203         private List<SearchResult> data = new LinkedList<>();
     203        private final List<SearchResult> data = new LinkedList<>();
    204204
    205205        /**
    … …  
    327327    class NameQueryTask extends PleaseWaitRunnable {
    328328
    329         private String searchExpression;
     329        private final String searchExpression;
    330330        private HttpURLConnection connection;
    331331        private List<SearchResult> data;
    332332        private boolean canceled;
    333         private Server useserver;
     333        private final Server useserver;
    334334        private Exception lastException;
    335335
    … …  
    411411    static class NamedResultTableModel extends DefaultTableModel {
    412412        private transient List<SearchResult> data;
    413         private transient ListSelectionModel selectionModel;
     413        private final transient ListSelectionModel selectionModel;
    414414
    415415        NamedResultTableModel(ListSelectionModel selectionModel) {

  • trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java

    r8846 r9078  
    119119    private String url;
    120120
    121     private transient HelpContentReader reader;
     121    private final transient HelpContentReader reader;
    122122
    123123    private static final JosmAction focusAction = new JosmAction(tr("JOSM Help Browser"), "help", "", null, false, false) {
    … …  
    486486
    487487    static class BackAction extends AbstractAction implements Observer {
    488         private transient HelpBrowserHistory history;
     488        private final transient HelpBrowserHistory history;
    489489
    490490        BackAction(HelpBrowserHistory history) {
    … …  
    508508
    509509    static class ForwardAction extends AbstractAction implements Observer {
    510         private transient HelpBrowserHistory history;
     510        private final transient HelpBrowserHistory history;
    511511
    512512        ForwardAction(HelpBrowserHistory history) {

  • trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java

    r8840 r9078  
    88
    99public class HelpBrowserHistory extends Observable {
    10     private HelpBrowser browser;
     10    private final HelpBrowser browser;
    1111    private List<String> history;
    1212    private int historyPos;

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

    r9059 r9078  
    171171        private JLabel lblLat;
    172172        private JLabel lblLon;
    173         private transient HistoryBrowserModel model;
    174         private PointInTimeType role;
     173        private final transient HistoryBrowserModel model;
     174        private final PointInTimeType role;
    175175
    176176        protected LatLon coord;

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

    r8633 r9078  
    5050    }
    5151
    52     private Map<Long, HistoryBrowserDialog> dialogs;
     52    private final Map<Long, HistoryBrowserDialog> dialogs;
    5353
    5454    protected HistoryBrowserDialogManager() {

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

    r8870 r9078  
    531531
    532532        private List<String> keys;
    533         private PointInTimeType pointInTimeType;
     533        private final PointInTimeType pointInTimeType;
    534534
    535535        protected void initKeyList() {

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

    r8840 r9078  
    5252    private boolean canceled;
    5353    private Exception lastException;
    54     private Set<PrimitiveId> toLoad;
     54    private final Set<PrimitiveId> toLoad;
    5555    private HistoryDataSet loadedData;
    5656    private OsmServerHistoryReader reader;

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

    r8510 r9078  
    1919    public static final Color BGCOLOR_SELECTED = new Color(143, 170, 255);
    2020
    21     private ImageIcon nodeIcon;
     21    private final ImageIcon nodeIcon;
    2222
    2323    /**

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

    r8840 r9078  
    332332
    333333    static class DoubleClickAdapter extends MouseAdapter {
    334         private JTable table;
    335         private ShowHistoryAction showHistoryAction;
     334        private final JTable table;
     335        private final ShowHistoryAction showHistoryAction;
    336336
    337337        DoubleClickAdapter(JTable table) {

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

    r8855 r9078  
    3030    public static final Color BGCOLOR_SELECTED = new Color(143, 170, 255);
    3131
    32     private transient Map<OsmPrimitiveType, ImageIcon> icons;
     32    private final transient Map<OsmPrimitiveType, ImageIcon> icons;
    3333
    3434    /**

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

    r8976 r9078  
    6060    public List<Item> referenceDiff;
    6161    public List<Item> currentDiff;
    62     private Object[] reference;
    63     private Object[] current;
     62    private final Object[] reference;
     63    private final Object[] current;
    6464    boolean referenceReversed;
    6565

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

    r9059 r9078  
    4545 */
    4646public class VersionInfoPanel extends JPanel implements Observer {
    47     private PointInTimeType pointInTimeType;
    48     private transient HistoryBrowserModel model;
     47    private final PointInTimeType pointInTimeType;
     48    private final transient HistoryBrowserModel model;
    4949    private JMultilineLabel lblInfo;
    5050    private UrlLabel lblUser;

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

    r9059 r9078  
    265265    public static class RadioButtonEditor extends DefaultCellEditor implements ItemListener {
    266266
    267         private JRadioButton btn;
     267        private final JRadioButton btn;
    268268
    269269        /**

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

    r8836 r9078  
    4040    private final transient CellEditorSupport cellEditorSupport = new CellEditorSupport(this);
    4141
    42     private transient ActionListener al = new ActionListener() {
     42    private final transient ActionListener al = new ActionListener() {
    4343        @Override
    4444        public void actionPerformed(ActionEvent e) {

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

    r8509 r9078  
    2323 */
    2424public class ChangesetCellRenderer extends JLabel implements ListCellRenderer<Changeset> {
    25     private ImageIcon icon;
     25    private final ImageIcon icon;
    2626
    2727    /**

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

    r9059 r9078  
    5656    private JCheckBox cbCloseAfterUpload;
    5757    private OpenChangesetComboBoxModel model;
    58     private transient ChangesetCommentModel changesetCommentModel;
     58    private final transient ChangesetCommentModel changesetCommentModel;
    5959
    6060    /**

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

    r8510 r9078  
    2626    private boolean canceled;
    2727    private Exception lastException;
    28     private Collection<Changeset> changesets;
    29     private List<Changeset> closedChangesets;
     28    private final Collection<Changeset> changesets;
     29    private final List<Changeset> closedChangesets;
    3030
    3131    /**

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

    r9059 r9078  
    6666    private boolean canceled;
    6767    protected CredentialPanel pnlCredentials;
    68     private String saveUsernameAndPasswordCheckboxText;
     68    private final String saveUsernameAndPasswordCheckboxText;
    6969
    7070    public boolean isCanceled() {
    … …  
    286286    private static class OtherHostCredentialsPanel extends CredentialPanel {
    287287
    288         private String host;
     288        private final String host;
    289289
    290290        @Override

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

    r8510 r9078  
    3434    private List<Changeset> changesets;
    3535    private Exception lastException;
    36     private Component parent;
     36    private final Component parent;
    3737
    3838    /**

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

    r8840 r9078  
    1818 */
    1919public class OpenChangesetComboBoxModel extends DefaultComboBoxModel<Changeset> implements ChangesetCacheListener {
    20     private transient List<Changeset> changesets;
     20    private final transient List<Changeset> changesets;
    2121    private transient Changeset selectedChangeset;
    2222

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

    r8836 r9078  
    1515
    1616    /** the modifiable layer */
    17     private AbstractModifiableLayer layer;
     17    private final AbstractModifiableLayer layer;
    1818    private boolean doCheckSaveConditions;
    1919    private boolean doSaveToFile;

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

    r8734 r9078  
    2727 */
    2828public class SaveLayerTask extends AbstractIOTask {
    29     private SaveLayerInfo layerInfo;
    30     private ProgressMonitor parentMonitor;
     29    private final SaveLayerInfo layerInfo;
     30    private final ProgressMonitor parentMonitor;
    3131
    3232    /**

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

    r8510 r9078  
    2525    private transient List<SaveLayerInfo> layerInfo;
    2626    private Mode mode;
    27     private PropertyChangeSupport support;
     27    private final PropertyChangeSupport support;
    2828
    2929    // keep in sync with how the columns are ordered in SaveLayersTableColumnModel#build

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

    r8510 r9078  
    3434    private boolean canceled;
    3535    private Exception lastException;
    36     private Collection<? extends OsmPrimitive> toUpdate;
    37     private OsmDataLayer layer;
     36    private final Collection<? extends OsmPrimitive> toUpdate;
     37    private final OsmDataLayer layer;
    3838    private MultiFetchServerObjectReader multiObjectReader;
    3939    private OsmServerObjectReader objectReader;

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

    r8734 r9078  
    4242public class UploadLayerTask extends AbstractIOTask implements Runnable {
    4343    private OsmServerWriter writer;
    44     private OsmDataLayer layer;
    45     private ProgressMonitor monitor;
    46     private Changeset changeset;
     44    private final OsmDataLayer layer;
     45    private final ProgressMonitor monitor;
     46    private final Changeset changeset;
    4747    private Collection<OsmPrimitive> toUpload;
    48     private Set<IPrimitive> processedPrimitives;
    49     private UploadStrategySpecification strategy;
     48    private final Set<IPrimitive> processedPrimitives;
     49    private final UploadStrategySpecification strategy;
    5050
    5151    /**

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

    r8840 r9078  
    4545    private boolean uploadCanceled;
    4646    private Exception lastException;
    47     private APIDataSet toUpload;
     47    private final APIDataSet toUpload;
    4848    private OsmServerWriter writer;
    49     private OsmDataLayer layer;
     49    private final OsmDataLayer layer;
    5050    private Changeset changeset;
    51     private Set<IPrimitive> processedPrimitives;
    52     private UploadStrategySpecification strategy;
     51    private final Set<IPrimitive> processedPrimitives;
     52    private final UploadStrategySpecification strategy;
    5353
    5454    /**

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

    r9059 r9078  
    124124    private boolean needRedraw;
    125125
    126     private AttributionSupport attribution = new AttributionSupport();
     126    private final AttributionSupport attribution = new AttributionSupport();
    127127
    128128    // needed public access for session exporter
    … …  
    481481
    482482    private class BooleanButtonModel extends DefaultButtonModel {
    483         private Field field;
     483        private final Field field;
    484484
    485485        BooleanButtonModel(Field field) {
    … …  
    16271627        private final ProgressMonitor progressMonitor;
    16281628        private int totalCount;
    1629         private AtomicInteger processedCount = new AtomicInteger(0);
     1629        private final AtomicInteger processedCount = new AtomicInteger(0);
    16301630        private final TileLoader tileLoader;
    16311631

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

    r9070 r9078  
    175175
    176176    class ApplyOffsetAction extends AbstractAction {
    177         private transient OffsetBookmark b;
     177        private final transient OffsetBookmark b;
    178178
    179179        ApplyOffsetAction(OffsetBookmark b) {
    … …  
    261261        private double gamma = 1;
    262262        final short[] gammaChange = new short[256];
    263         private LookupOp op3 = new LookupOp(new ShortLookupTable(0, new short[][]{gammaChange, gammaChange, gammaChange}), null);
    264         private LookupOp op4 = new LookupOp(new ShortLookupTable(0, new short[][]{gammaChange, gammaChange, gammaChange, gammaChange}), null);
     263        private final LookupOp op3 = new LookupOp(
     264                new ShortLookupTable(0, new short[][]{gammaChange, gammaChange, gammaChange}), null);
     265        private final LookupOp op4 = new LookupOp(
     266                new ShortLookupTable(0, new short[][]{gammaChange, gammaChange, gammaChange, gammaChange}), null);
    265267
    266268        /**

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

    r8956 r9078  
    232232     * the collection of conflicts detected in this layer
    233233     */
    234     private ConflictCollection conflicts;
     234    private final ConflictCollection conflicts;
    235235
    236236    /**

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

    r8906 r9078  
    4949    private static final String CACHE_REGION_NAME = "WMS";
    5050
    51     private Set<String> supportedProjections;
     51    private final Set<String> supportedProjections;
    5252
    5353    /**

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

    r8870 r9078  
    9292    private static List<GpxData> loadedGpxData = new ArrayList<>();
    9393
    94     private transient GeoImageLayer yLayer;
     94    private final transient GeoImageLayer yLayer;
    9595    private double timezone;
    9696    private long delta;
    … …  
    209209
    210210    private static class GpxDataWrapper {
    211         private String name;
    212         private GpxData data;
    213         private File file;
     211        private final String name;
     212        private final GpxData data;
     213        private final File file;
    214214
    215215        GpxDataWrapper(String name, GpxData data, File file) {
    … …  
    226226
    227227    private ExtendedDialog syncDialog;
    228     private transient List<GpxDataWrapper> gpxLst = new ArrayList<>();
     228    private final transient List<GpxDataWrapper> gpxLst = new ArrayList<>();
    229229    private JPanel outerPanel;
    230230    private JosmComboBox<GpxDataWrapper> cbGpx;
    … …  
    773773    }
    774774
    775     private transient StatusBarUpdater statusBarUpdater = new StatusBarUpdater(false);
    776     private transient StatusBarUpdater statusBarUpdaterWithRepaint = new StatusBarUpdater(true);
     775    private final transient StatusBarUpdater statusBarUpdater = new StatusBarUpdater(false);
     776    private final transient StatusBarUpdater statusBarUpdaterWithRepaint = new StatusBarUpdater(true);
    777777
    778778    private class StatusBarUpdater implements  DocumentListener, ItemListener, ActionListener {
    779         private boolean doRepaint;
     779        private final boolean doRepaint;
    780780
    781781        StatusBarUpdater(boolean doRepaint) {
    … …  
    850850    }
    851851
    852     private transient RepaintTheMapListener repaintTheMap = new RepaintTheMapListener();
     852    private final transient RepaintTheMapListener repaintTheMap = new RepaintTheMapListener();
    853853
    854854    private class RepaintTheMapListener implements FocusListener {

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

    r8870 r9078  
    8888    GpxLayer gpxLayer;
    8989
    90     private Icon icon = ImageProvider.get("dialogs/geoimage/photo-marker");
    91     private Icon selectedIcon = ImageProvider.get("dialogs/geoimage/photo-marker-selected");
     90    private final Icon icon = ImageProvider.get("dialogs/geoimage/photo-marker");
     91    private final Icon selectedIcon = ImageProvider.get("dialogs/geoimage/photo-marker-selected");
    9292
    9393    private int currentPhoto = -1;
    9494
    9595    boolean useThumbs;
    96     private ExecutorService thumbsLoaderExecutor =
     96    private final ExecutorService thumbsLoaderExecutor =
    9797            Executors.newSingleThreadExecutor(Utils.newThreadFactory("thumbnail-loader-%d", Thread.MIN_PRIORITY));
    9898    private ThumbsLoader thumbsloader;
    … …  
    111111        private boolean canceled;
    112112        private GeoImageLayer layer;
    113         private Collection<File> selection;
    114         private Set<String> loadedDirectories = new HashSet<>();
    115         private Set<String> errorMessages;
    116         private GpxLayer gpxLayer;
     113        private final Collection<File> selection;
     114        private final Set<String> loadedDirectories = new HashSet<>();
     115        private final Set<String> errorMessages;
     116        private final GpxLayer gpxLayer;
    117117
    118118        protected void rememberError(String message) {

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

    r9075 r9078  
    4949
    5050    /** The tracker to load the images */
    51     private MediaTracker tracker = new MediaTracker(this);
     51    private final MediaTracker tracker = new MediaTracker(this);
    5252
    5353    private String osdText;
    … …  
    5959    private class LoadImageRunnable implements Runnable {
    6060
    61         private File file;
    62         private int orientation;
     61        private final File file;
     62        private final int orientation;
    6363
    6464        LoadImageRunnable(File file, Integer orientation) {

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

    r8840 r9078  
    4545    private static final String COMMAND_COPY_PATH = "copypath";
    4646
    47     private ImageDisplay imgDisplay = new ImageDisplay();
     47    private final ImageDisplay imgDisplay = new ImageDisplay();
    4848    private boolean centerView;
    4949

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

    r8905 r9078  
    2727    public static final int minSize = 22;
    2828    public volatile boolean stop;
    29     private List<ImageEntry> data;
    30     private GeoImageLayer layer;
     29    private final List<ImageEntry> data;
     30    private final GeoImageLayer layer;
    3131    private MediaTracker tracker;
    3232    private ICacheAccess<String, BufferedImageCacheEntry> cache;
    33     private boolean cacheOff = Main.pref.getBoolean("geoimage.noThumbnailCache", false);
     33    private final boolean cacheOff = Main.pref.getBoolean("geoimage.noThumbnailCache", false);
    3434
    3535    public ThumbsLoader(GeoImageLayer layer) {

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

    r8840 r9078  
    6767     */
    6868    private static final class TrackLength {
    69         private double value;
     69        private final double value;
    7070
    7171        /**

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

    r8836 r9078  
    2323
    2424public class DateFilterPanel extends JPanel {
    25     private DateEditorWithSlider dateFrom = new DateEditorWithSlider(tr("From"));
    26     private DateEditorWithSlider dateTo = new DateEditorWithSlider(tr("To"));
    27     private JCheckBox noTimestampCb  = new JCheckBox(tr("No timestamp"));
    28     private transient GpxLayer layer;
     25    private final DateEditorWithSlider dateFrom = new DateEditorWithSlider(tr("From"));
     26    private final DateEditorWithSlider dateTo = new DateEditorWithSlider(tr("To"));
     27    private final JCheckBox noTimestampCb  = new JCheckBox(tr("No timestamp"));
     28    private final transient GpxLayer layer;
    2929
    3030    private transient ActionListener filterAppliedListener;
    … …  
    6767    }
    6868
    69     private transient ChangeListener changeListener = new ChangeListener() {
     69    private final transient ChangeListener changeListener = new ChangeListener() {
    7070        @Override public void stateChanged(ChangeEvent e) {
    7171            if (isEnabled()) applyFilterWithDelay();
    … …  
    7373    };
    7474
    75     private Timer t = new Timer(200, new ActionListener() {
     75    private final Timer t = new Timer(200, new ActionListener() {
    7676        @Override  public void actionPerformed(ActionEvent e) {
    7777            applyFilter();

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

    r8840 r9078  
    101101        class CalculateDownloadArea extends PleaseWaitRunnable {
    102102
    103             private Area a = new Area();
     103            private final Area a = new Area();
    104104            private boolean cancel;
    105105            private int ticks;
    106             private Rectangle2D r = new Rectangle2D.Double();
     106            private final Rectangle2D r = new Rectangle2D.Double();
    107107
    108108            CalculateDownloadArea() {

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

    r9073 r9078  
    2828 */
    2929public class GpxDrawHelper {
    30     private GpxData data;
     30    private final GpxData data;
    3131
    3232    // draw lines between points belonging to different segments

  • trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java

    r8840 r9078  
    2222public class AudioMarker extends ButtonMarker {
    2323
    24     private URL audioUrl;
     24    private final URL audioUrl;
    2525    private static volatile AudioMarker recentlyPlayedMarker;
    2626    public double syncOffset;

  • trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java

    r8540 r9078  
    2424public class ButtonMarker extends Marker {
    2525
    26     private Rectangle buttonRectangle;
     26    private final Rectangle buttonRectangle;
    2727
    2828    public ButtonMarker(LatLon ll, String buttonImage, MarkerLayer parentLayer, double time, double offset) {

  • trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java

    r8846 r9078  
    139139        }
    140140
    141         private TemplateEntryProperty parent;
     141        private final TemplateEntryProperty parent;
    142142
    143143        private TemplateEntryProperty(String key, String defaultValue, TemplateEntryProperty parent) {

  • trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java

    r8840 r9078  
    4040    private MapMode oldMode;
    4141    private LatLon oldCoor;
    42     private boolean enabled;
     42    private final boolean enabled;
    4343    private boolean wasPlaying;
    4444    private int dropTolerance; /* pixels */

  • trunk/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java

    r8958 r9078  
    2626
    2727    public static class BoxProviderResult {
    28         private Rectangle box;
    29         private boolean temporary;
     28        private final Rectangle box;
     29        private final boolean temporary;
    3030
    3131        public BoxProviderResult(Rectangle box, boolean temporary) {
    … …  
    5252
    5353    public static class SimpleBoxProvider implements BoxProvider {
    54         private Rectangle box;
     54        private final Rectangle box;
    5555
    5656        /**

  • trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java

    r8855 r9078  
    2424
    2525public class ElemStyles {
    26     private List<StyleSource> styleSources;
     26    private final List<StyleSource> styleSources;
    2727    private boolean drawMultipolygon;
    2828

  • trunk/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java

    r8973 r9078  
    4848
    4949    public static class StaticLabelCompositionStrategy extends LabelCompositionStrategy {
    50         private String defaultLabel;
     50        private final String defaultLabel;
    5151
    5252        public StaticLabelCompositionStrategy(String defaultLabel) {
    … …  
    9696    public static class TagLookupCompositionStrategy extends LabelCompositionStrategy {
    9797
    98         private String defaultLabelTag;
     98        private final String defaultLabelTag;
    9999
    100100        public TagLookupCompositionStrategy(String defaultLabelTag) {

  • trunk/src/org/openstreetmap/josm/gui/mappaint/LineTextElemStyle.java

    r8846 r9078  
    1212public class LineTextElemStyle extends ElemStyle {
    1313
    14     private TextElement text;
     14    private final TextElement text;
    1515
    1616    protected LineTextElemStyle(Cascade c, TextElement text) {

  • trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java

    r8870 r9078  
    3131
    3232        private transient StyleSource style;
    33         private JCheckBoxMenuItem button;
     33        private final JCheckBoxMenuItem button;
    3434
    3535        MapPaintAction(StyleSource style) {

  • trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

    r8937 r9078  
    343343    public static class MapPaintStyleLoader extends PleaseWaitRunnable {
    344344        private boolean canceled;
    345         private Collection<StyleSource> sources;
     345        private final Collection<StyleSource> sources;
    346346
    347347        public MapPaintStyleLoader(Collection<StyleSource> sources) {

  • trunk/src/org/openstreetmap/josm/gui/mappaint/MultiCascade.java

    r8846 r9078  
    1616public class MultiCascade implements StyleKeys {
    1717
    18     private Map<String, Cascade> layers;
     18    private final Map<String, Cascade> layers;
    1919    public Range range;
    2020

  • trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java

    r8575 r9078  
    4747     */
    4848    public static class StyleList implements Iterable<ElemStyle> {
    49         private List<ElemStyle> lst;
     49        private final List<ElemStyle> lst;
    5050
    5151        /**

  • trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java

    r8419 r9078  
    3333public abstract class StyleSource extends SourceEntry {
    3434
    35     private List<Throwable> errors = new ArrayList<>();
     35    private final List<Throwable> errors = new ArrayList<>();
    3636    public File zipIcons;
    3737

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

    r9059 r9078  
    967967    public static class CondOperator implements Expression {
    968968
    969         private Expression condition, firstOption, secondOption;
     969        private final Expression condition, firstOption, secondOption;
    970970
    971971        /**
    … …  
    996996    public static class AndOperator implements Expression {
    997997
    998         private List<Expression> args;
     998        private final List<Expression> args;
    999999
    10001000        /**
    … …  
    10231023    public static class OrOperator implements Expression {
    10241024
    1025         private List<Expression> args;
     1025        private final List<Expression> args;
    10261026
    10271027        /**
    … …  
    10551055    public static class LengthFunction implements Expression {
    10561056
    1057         private Expression arg;
     1057        private final Expression arg;
    10581058
    10591059        /**

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

    r9059 r9078  
    122122         */
    123123        private class MatchingReferrerFinder extends AbstractVisitor {
    124             private Environment e;
     124            private final Environment e;
    125125
    126126            /**

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

    r8846 r9078  
    1717    private boolean inDoc, inRule, inCondition, inLine, inLineMod, inIcon, inArea, inScaleMax, inScaleMin;
    1818    private boolean hadLine, hadLineMod, hadIcon, hadArea;
    19     private RuleElem rule = new RuleElem();
    20 
    21     private XmlStyleSource style;
     19    private final RuleElem rule = new RuleElem();
     20
     21    private final XmlStyleSource style;
    2222
    2323    static class RuleElem {
    24         private XmlCondition cond = new XmlCondition();
     24        private final XmlCondition cond = new XmlCondition();
    2525        private Collection<XmlCondition> conditions;
    2626        private double scaleMax;
    2727        private double scaleMin;
    28         private LinePrototype line = new LinePrototype();
    29         private LinemodPrototype linemod = new LinemodPrototype();
    30         private AreaPrototype area = new AreaPrototype();
     28        private final LinePrototype line = new LinePrototype();
     29        private final LinemodPrototype linemod = new LinemodPrototype();
     30        private final AreaPrototype area = new AreaPrototype();
    3131        private IconPrototype icon = new IconPrototype();
    3232        public void init() {

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

    r8510 r9078  
    2828    private boolean canceled;
    2929    private OAuthToken accessToken;
    30     private OAuthParameters parameters;
     30    private final OAuthParameters parameters;
    3131    private OsmOAuthAuthorizationClient client;
    32     private OAuthToken requestToken;
    33     private Component parent;
     32    private final OAuthToken requestToken;
     33    private final Component parent;
    3434
    3535    /**

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

    r8510 r9078  
    2727    private boolean canceled;
    2828    private OAuthToken requestToken;
    29     private OAuthParameters parameters;
     29    private final OAuthParameters parameters;
    3030    private OsmOAuthAuthorizationClient client;
    31     private Component parent;
     31    private final Component parent;
    3232
    3333    /**

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

    r8510 r9078  
    1212import javax.xml.parsers.DocumentBuilderFactory;
    1313import javax.xml.parsers.ParserConfigurationException;
    14 
    15 import oauth.signpost.OAuthConsumer;
    16 import oauth.signpost.exception.OAuthException;
    1714
    1815import org.openstreetmap.josm.Main;
    … …  
    3330import org.xml.sax.SAXException;
    3431
     32import oauth.signpost.OAuthConsumer;
     33import oauth.signpost.exception.OAuthException;
     34
    3535/**
    3636 * Checks whether an OSM API server can be accessed with a specific Access Token.
    … …  
    4141 */
    4242public class TestAccessTokenTask extends PleaseWaitRunnable {
    43     private OAuthToken token;
    44     private OAuthParameters oauthParameters;
     43    private final OAuthToken token;
     44    private final OAuthParameters oauthParameters;
    4545    private boolean canceled;
    46     private Component parent;
    47     private String apiUrl;
     46    private final Component parent;
     47    private final String apiUrl;
    4848    private HttpURLConnection connection;
    4949

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

    r9074 r9078  
    481481
    482482    protected static class AvailableSourcesListModel extends DefaultListModel<ExtendedSourceEntry> {
    483         private transient List<ExtendedSourceEntry> data;
    484         private DefaultListSelectionModel selectionModel;
     483        private final transient List<ExtendedSourceEntry> data;
     484        private final DefaultListSelectionModel selectionModel;
    485485
    486486        public AvailableSourcesListModel(DefaultListSelectionModel selectionModel) {
    … …  
    534534    protected class ActiveSourcesModel extends AbstractTableModel {
    535535        private transient List<SourceEntry> data;
    536         private DefaultListSelectionModel selectionModel;
     536        private final DefaultListSelectionModel selectionModel;
    537537
    538538        public ActiveSourcesModel(DefaultListSelectionModel selectionModel) {
    … …  
    764764    protected class EditSourceEntryDialog extends ExtendedDialog {
    765765
    766         private JosmTextField tfTitle;
    767         private JosmTextField tfURL;
     766        private final JosmTextField tfTitle;
     767        private final JosmTextField tfURL;
    768768        private JCheckBox cbActive;
    769769
    … …  
    10911091
    10921092    protected static class IconPathTableModel extends AbstractTableModel {
    1093         private List<String> data;
    1094         private DefaultListSelectionModel selectionModel;
     1093        private final List<String> data;
     1094        private final DefaultListSelectionModel selectionModel;
    10951095
    10961096        public IconPathTableModel(DefaultListSelectionModel selectionModel) {
    … …  
    14511451    class FileOrUrlCellEditor extends JPanel implements TableCellEditor {
    14521452        private JosmTextField tfFileName;
    1453         private CopyOnWriteArrayList<CellEditorListener> listeners;
     1453        private final CopyOnWriteArrayList<CellEditorListener> listeners;
    14541454        private String value;
    1455         private boolean isFile;
     1455        private final boolean isFile;
    14561456
    14571457        /**

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

    r9073 r9078  
    408408        }
    409409
    410         private JMenuItem remove = new JMenuItem(new AbstractAction(tr("Remove from toolbar")) {
     410        private final JMenuItem remove = new JMenuItem(new AbstractAction(tr("Remove from toolbar")) {
    411411            @Override
    412412            public void actionPerformed(ActionEvent e) {
    … …  
    422422        });
    423423
    424         private JMenuItem configure = new JMenuItem(new AbstractAction(tr("Configure toolbar")) {
     424        private final JMenuItem configure = new JMenuItem(new AbstractAction(tr("Configure toolbar")) {
    425425            @Override
    426426            public void actionPerformed(ActionEvent e) {
    … …  
    431431        });
    432432
    433         private JMenuItem shortcutEdit = new JMenuItem(new AbstractAction(tr("Edit shortcut")) {
     433        private final JMenuItem shortcutEdit = new JMenuItem(new AbstractAction(tr("Edit shortcut")) {
    434434            @Override
    435435            public void actionPerformed(ActionEvent e) {
    … …  
    443443        });
    444444
    445         private JCheckBoxMenuItem doNotHide = new JCheckBoxMenuItem(new AbstractAction(tr("Do not hide toolbar and menu")) {
     445        private final JCheckBoxMenuItem doNotHide = new JCheckBoxMenuItem(new AbstractAction(tr("Do not hide toolbar and menu")) {
    446446            @Override
    447447            public void actionPerformed(ActionEvent e) {
    … …  
    474474    }
    475475
    476     private ToolbarPopupMenu popupMenu = new ToolbarPopupMenu();
     476    private final ToolbarPopupMenu popupMenu = new ToolbarPopupMenu();
    477477
    478478    /**

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

    r8870 r9078  
    6868
    6969    private List<PrefEntry> allData;
    70     private List<PrefEntry> displayData = new ArrayList<>();
     70    private final List<PrefEntry> displayData = new ArrayList<>();
    7171    private JosmTextField txtFilter;
    7272    private PreferencesTable table;
    … …  
    277277    }
    278278
    279     private Comparator<PrefEntry> customComparator = new Comparator<PrefEntry>() {
     279    private final Comparator<PrefEntry> customComparator = new Comparator<PrefEntry>() {
    280280        @Override
    281281        public int compare(PrefEntry o1, PrefEntry o2) {
    … …  
    321321    }
    322322
    323     private Map<String, String> profileTypes = new LinkedHashMap<>();
     323    private final Map<String, String> profileTypes = new LinkedHashMap<>();
    324324
    325325    private JPopupMenu buildPopupMenu() {

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

    r8510 r9078  
    3131
    3232    private List<String> data;
    33     private transient PrefEntry entry;
     33    private final transient PrefEntry entry;
    3434
    3535    /**

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

    r8836 r9078  
    3939
    4040    private EntryListModel entryModel;
    41     private List<List<String>> data;
    42     private transient PrefEntry entry;
     41    private final List<List<String>> data;
     42    private final transient PrefEntry entry;
    4343
    4444    private JList<String> entryList;

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

    r8836 r9078  
    4343
    4444    private EntryListModel entryModel;
    45     private transient PrefEntry entry;
     45    private final transient PrefEntry entry;
    4646
    4747    private JList<String> entryList;
    … …  
    4949    private MapTableModel tableModel;
    5050
    51     private List<List<String>> dataKeys;
    52     private List<List<String>> dataValues;
     51    private final List<List<String>> dataKeys;
     52    private final List<List<String>> dataValues;
    5353    private Integer entryIdx;
    5454

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

    r8382 r9078  
    1010 */
    1111public class PrefEntry implements Comparable<PrefEntry> {
    12     private String key;
     12    private final String key;
    1313    private Setting<?> value;
    14     private Setting<?> defaultValue;
     14    private final Setting<?> defaultValue;
    1515    private boolean isDefault;
    1616    private boolean changed;

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

    r8836 r9078  
    4242 */
    4343public class PreferencesTable extends JTable {
    44     private AllSettingsTableModel model;
     44    private final AllSettingsTableModel model;
    4545    private final transient List<PrefEntry> displayData;
    4646
    … …  
    298298
    299299    private static class SettingCellRenderer extends DefaultTableCellRenderer {
    300         private Color backgroundColor = Main.pref.getUIColor("Table.background");
    301         private Color changedColor = Main.pref.getColor(
     300        private final Color backgroundColor = Main.pref.getUIColor("Table.background");
     301        private final Color changedColor = Main.pref.getColor(
    302302                         marktr("Advanced Background: Changed"),
    303303                         new Color(200, 255, 200));
    304         private Color foregroundColor = Main.pref.getUIColor("Table.foreground");
    305         private Color nonDefaultColor = Main.pref.getColor(
     304        private final Color foregroundColor = Main.pref.getUIColor("Table.foreground");
     305        private final Color nonDefaultColor = Main.pref.getColor(
    306306                            marktr("Advanced Background: NonDefault"),
    307307                            new Color(255, 255, 200));

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

    r8510 r9078  
    2020public class StringEditor extends ExtendedDialog {
    2121
    22     private transient PrefEntry entry;
     22    private final transient PrefEntry entry;
    2323    private JosmTextField tvalue;
    2424

  • trunk/src/org/openstreetmap/josm/gui/preferences/audio/AudioPreference.java

    r8510 r9078  
    3838    }
    3939
    40     private JCheckBox audioMenuVisible = new JCheckBox(tr("Display the Audio menu."));
    41     private JCheckBox markerButtonLabels = new JCheckBox(tr("Label audio (and image and web) markers."));
    42     private JCheckBox markerAudioTraceVisible = new JCheckBox(tr("Display live audio trace."));
     40    private final JCheckBox audioMenuVisible = new JCheckBox(tr("Display the Audio menu."));
     41    private final JCheckBox markerButtonLabels = new JCheckBox(tr("Label audio (and image and web) markers."));
     42    private final JCheckBox markerAudioTraceVisible = new JCheckBox(tr("Display live audio trace."));
    4343
    4444    // various methods of making markers on import audio
    45     private JCheckBox audioMarkersFromExplicitWaypoints = new JCheckBox(tr("Explicit waypoints with valid timestamps."));
    46     private JCheckBox audioMarkersFromUntimedWaypoints = new JCheckBox(tr("Explicit waypoints with time estimated from track position."));
    47     private JCheckBox audioMarkersFromNamedTrackpoints = new JCheckBox(tr("Named trackpoints."));
    48     private JCheckBox audioMarkersFromWavTimestamps = new JCheckBox(tr("Modified times (time stamps) of audio files."));
    49     private JCheckBox audioMarkersFromStart = new JCheckBox(tr("Start of track (will always do this if no other markers available)."));
     45    private final JCheckBox audioMarkersFromExplicitWaypoints = new JCheckBox(tr("Explicit waypoints with valid timestamps."));
     46    private final JCheckBox audioMarkersFromUntimedWaypoints = new JCheckBox(tr("Explicit waypoints with time estimated from track position."));
     47    private final JCheckBox audioMarkersFromNamedTrackpoints = new JCheckBox(tr("Named trackpoints."));
     48    private final JCheckBox audioMarkersFromWavTimestamps = new JCheckBox(tr("Modified times (time stamps) of audio files."));
     49    private final JCheckBox audioMarkersFromStart = new JCheckBox(tr("Start of track (will always do this if no other markers available)."));
    5050
    51     private JosmTextField audioLeadIn = new JosmTextField(8);
    52     private JosmTextField audioForwardBackAmount = new JosmTextField(8);
    53     private JosmTextField audioFastForwardMultiplier = new JosmTextField(8);
    54     private JosmTextField audioCalibration = new JosmTextField(8);
     51    private final JosmTextField audioLeadIn = new JosmTextField(8);
     52    private final JosmTextField audioForwardBackAmount = new JosmTextField(8);
     53    private final JosmTextField audioFastForwardMultiplier = new JosmTextField(8);
     54    private final JosmTextField audioCalibration = new JosmTextField(8);
    5555
    5656    @Override

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

    r8870 r9078  
    6767    private DefaultTableModel tableModel;
    6868    private JTable colors;
    69     private List<String> del = new ArrayList<>();
     69    private final List<String> del = new ArrayList<>();
    7070
    7171    private JButton colorEdit;

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

    r8510 r9078  
    4040
    4141    private GPXSettingsPanel gpxPanel;
    42     private JCheckBox directionHint = new JCheckBox(tr("Draw Direction Arrows"));
    43     private JCheckBox headArrow = new JCheckBox(tr("Only on the head of a way."));
    44     private JCheckBox onewayArrow = new JCheckBox(tr("Draw oneway arrows."));
    45     private JCheckBox segmentOrderNumber = new JCheckBox(tr("Draw segment order numbers"));
    46     private JCheckBox sourceBounds = new JCheckBox(tr("Draw boundaries of downloaded data"));
    47     private JCheckBox virtualNodes = new JCheckBox(tr("Draw virtual nodes in select mode"));
    48     private JCheckBox inactive = new JCheckBox(tr("Draw inactive layers in other color"));
    49     private JCheckBox discardableKeys = new JCheckBox(tr("Display discardable keys"));
     42    private final JCheckBox directionHint = new JCheckBox(tr("Draw Direction Arrows"));
     43    private final JCheckBox headArrow = new JCheckBox(tr("Only on the head of a way."));
     44    private final JCheckBox onewayArrow = new JCheckBox(tr("Draw oneway arrows."));
     45    private final JCheckBox segmentOrderNumber = new JCheckBox(tr("Draw segment order numbers"));
     46    private final JCheckBox sourceBounds = new JCheckBox(tr("Draw boundaries of downloaded data"));
     47    private final JCheckBox virtualNodes = new JCheckBox(tr("Draw virtual nodes in select mode"));
     48    private final JCheckBox inactive = new JCheckBox(tr("Draw inactive layers in other color"));
     49    private final JCheckBox discardableKeys = new JCheckBox(tr("Display discardable keys"));
    5050
    5151    // Options that affect performance
    52     private JCheckBox useHighlighting = new JCheckBox(tr("Highlight target ways and nodes"));
    53     private JCheckBox drawHelperLine = new JCheckBox(tr("Draw rubber-band helper line"));
    54     private JCheckBox useAntialiasing = new JCheckBox(tr("Smooth map graphics (antialiasing)"));
    55     private JCheckBox useWireframeAntialiasing = new JCheckBox(tr("Smooth map graphics in wireframe mode (antialiasing)"));
    56     private JCheckBox outlineOnly = new JCheckBox(tr("Draw only outlines of areas"));
     52    private final JCheckBox useHighlighting = new JCheckBox(tr("Highlight target ways and nodes"));
     53    private final JCheckBox drawHelperLine = new JCheckBox(tr("Draw rubber-band helper line"));
     54    private final JCheckBox useAntialiasing = new JCheckBox(tr("Smooth map graphics (antialiasing)"));
     55    private final JCheckBox useWireframeAntialiasing = new JCheckBox(tr("Smooth map graphics in wireframe mode (antialiasing)"));
     56    private final JCheckBox outlineOnly = new JCheckBox(tr("Draw only outlines of areas"));
    5757
    5858    @Override

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

    r8540 r9078  
    4444
    4545
    46     private JRadioButton drawRawGpsLinesGlobal = new JRadioButton(tr("Use global settings"));
    47     private JRadioButton drawRawGpsLinesAll = new JRadioButton(tr("All"));
    48     private JRadioButton drawRawGpsLinesLocal = new JRadioButton(tr("Local files"));
    49     private JRadioButton drawRawGpsLinesNone = new JRadioButton(tr("None"));
     46    private final JRadioButton drawRawGpsLinesGlobal = new JRadioButton(tr("Use global settings"));
     47    private final JRadioButton drawRawGpsLinesAll = new JRadioButton(tr("All"));
     48    private final JRadioButton drawRawGpsLinesLocal = new JRadioButton(tr("Local files"));
     49    private final JRadioButton drawRawGpsLinesNone = new JRadioButton(tr("None"));
    5050    private transient ActionListener drawRawGpsLinesActionListener;
    51     private JosmTextField drawRawGpsMaxLineLength = new JosmTextField(8);
    52     private JosmTextField drawRawGpsMaxLineLengthLocal = new JosmTextField(8);
    53     private JosmTextField drawLineWidth = new JosmTextField(2);
    54     private JCheckBox forceRawGpsLines = new JCheckBox(tr("Force lines if no segments imported"));
    55     private JCheckBox largeGpsPoints = new JCheckBox(tr("Draw large GPS points"));
    56     private JCheckBox hdopCircleGpsPoints = new JCheckBox(tr("Draw a circle from HDOP value"));
    57     private JRadioButton colorTypeVelocity = new JRadioButton(tr("Velocity (red = slow, green = fast)"));
    58     private JRadioButton colorTypeDirection = new JRadioButton(tr("Direction (red = west, yellow = north, green = east, blue = south)"));
    59     private JRadioButton colorTypeDilution = new JRadioButton(tr("Dilution of Position (red = high, green = low, if available)"));
    60     private JRadioButton colorTypeTime = new JRadioButton(tr("Track date"));
    61     private JRadioButton colorTypeNone = new JRadioButton(tr("Single Color (can be customized for named layers)"));
    62     private JRadioButton colorTypeGlobal  = new JRadioButton(tr("Use global settings"));
    63     private JosmComboBox<String> colorTypeVelocityTune = new JosmComboBox<>(new String[] {tr("Car"), tr("Bicycle"), tr("Foot")});
    64     private JCheckBox makeAutoMarkers = new JCheckBox(tr("Create markers when reading GPX"));
    65     private JCheckBox drawGpsArrows = new JCheckBox(tr("Draw Direction Arrows"));
    66     private JCheckBox drawGpsArrowsFast = new JCheckBox(tr("Fast drawing (looks uglier)"));
    67     private JosmTextField drawGpsArrowsMinDist = new JosmTextField(8);
    68     private JCheckBox colorDynamic = new JCheckBox(tr("Dynamic color range based on data limits"));
    69     private JosmComboBox<String> waypointLabel = new JosmComboBox<>(LABEL_PATTERN_DESC);
    70     private JosmTextField waypointLabelPattern = new JosmTextField();
    71     private JosmComboBox<String> audioWaypointLabel = new JosmComboBox<>(LABEL_PATTERN_DESC);
    72     private JosmTextField audioWaypointLabelPattern = new JosmTextField();
    73     private JCheckBox useGpsAntialiasing = new JCheckBox(tr("Smooth GPX graphics (antialiasing)"));
     51    private final JosmTextField drawRawGpsMaxLineLength = new JosmTextField(8);
     52    private final JosmTextField drawRawGpsMaxLineLengthLocal = new JosmTextField(8);
     53    private final JosmTextField drawLineWidth = new JosmTextField(2);
     54    private final JCheckBox forceRawGpsLines = new JCheckBox(tr("Force lines if no segments imported"));
     55    private final JCheckBox largeGpsPoints = new JCheckBox(tr("Draw large GPS points"));
     56    private final JCheckBox hdopCircleGpsPoints = new JCheckBox(tr("Draw a circle from HDOP value"));
     57    private final JRadioButton colorTypeVelocity = new JRadioButton(tr("Velocity (red = slow, green = fast)"));
     58    private final JRadioButton colorTypeDirection = new JRadioButton(tr("Direction (red = west, yellow = north, green = east, blue = south)"));
     59    private final JRadioButton colorTypeDilution = new JRadioButton(tr("Dilution of Position (red = high, green = low, if available)"));
     60    private final JRadioButton colorTypeTime = new JRadioButton(tr("Track date"));
     61    private final JRadioButton colorTypeNone = new JRadioButton(tr("Single Color (can be customized for named layers)"));
     62    private final JRadioButton colorTypeGlobal  = new JRadioButton(tr("Use global settings"));
     63    private final JosmComboBox<String> colorTypeVelocityTune = new JosmComboBox<>(new String[] {tr("Car"), tr("Bicycle"), tr("Foot")});
     64    private final JCheckBox makeAutoMarkers = new JCheckBox(tr("Create markers when reading GPX"));
     65    private final JCheckBox drawGpsArrows = new JCheckBox(tr("Draw Direction Arrows"));
     66    private final JCheckBox drawGpsArrowsFast = new JCheckBox(tr("Fast drawing (looks uglier)"));
     67    private final JosmTextField drawGpsArrowsMinDist = new JosmTextField(8);
     68    private final JCheckBox colorDynamic = new JCheckBox(tr("Dynamic color range based on data limits"));
     69    private final JosmComboBox<String> waypointLabel = new JosmComboBox<>(LABEL_PATTERN_DESC);
     70    private final JosmTextField waypointLabelPattern = new JosmTextField();
     71    private final JosmComboBox<String> audioWaypointLabel = new JosmComboBox<>(LABEL_PATTERN_DESC);
     72    private final JosmTextField audioWaypointLabelPattern = new JosmTextField();
     73    private final JCheckBox useGpsAntialiasing = new JCheckBox(tr("Smooth GPX graphics (antialiasing)"));
    7474
    7575    private String layerName;

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

    r8510 r9078  
    5555    private JosmComboBox<LookAndFeelInfo> lafCombo;
    5656    JPanel panel;
    57     private JCheckBox showSplashScreen = new JCheckBox(tr("Show splash screen at startup"));
    58     private JCheckBox showID = new JCheckBox(tr("Show object ID in selection lists"));
    59     private JCheckBox showLocalizedName = new JCheckBox(tr("Show localized name in selection lists"));
    60     private JCheckBox modeless = new JCheckBox(tr("Modeless working (Potlatch style)"));
    61     private JCheckBox dynamicButtons = new JCheckBox(tr("Dynamic buttons in side menus"));
    62     private JCheckBox isoDates = new JCheckBox(tr("Display ISO dates"));
    63     private JCheckBox nativeFileChoosers = new JCheckBox(tr("Use native file choosers (nicer, but do not support file filters)"));
     57    private final JCheckBox showSplashScreen = new JCheckBox(tr("Show splash screen at startup"));
     58    private final JCheckBox showID = new JCheckBox(tr("Show object ID in selection lists"));
     59    private final JCheckBox showLocalizedName = new JCheckBox(tr("Show localized name in selection lists"));
     60    private final JCheckBox modeless = new JCheckBox(tr("Modeless working (Potlatch style)"));
     61    private final JCheckBox dynamicButtons = new JCheckBox(tr("Dynamic buttons in side menus"));
     62    private final JCheckBox isoDates = new JCheckBox(tr("Display ISO dates"));
     63    private final JCheckBox nativeFileChoosers = new JCheckBox(tr("Use native file choosers (nicer, but do not support file filters)"));
    6464
    6565    @Override

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

    r8870 r9078  
    6868        private final Action action;
    6969        private final JButton renderButton;
    70         private JButton editButton;
     70        private final JButton editButton;
    7171        private Object editorValue;
    7272

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

    r8870 r9078  
    237237        private static class ImageryURLTableCellRenderer extends DefaultTableCellRenderer {
    238238
    239             private transient List<ImageryInfo> layers;
     239            private final transient List<ImageryInfo> layers;
    240240
    241241            ImageryURLTableCellRenderer(List<ImageryInfo> layers) {
    … …  
    807807
    808808    static class OffsetBookmarksPanel extends JPanel {
    809         private transient List<OffsetBookmark> bookmarks = OffsetBookmark.allBookmarks;
    810         private OffsetsBookmarksModel model = new OffsetsBookmarksModel();
     809        private final transient List<OffsetBookmark> bookmarks = OffsetBookmark.allBookmarks;
     810        private final OffsetsBookmarksModel model = new OffsetsBookmarksModel();
    811811
    812812        /**

  • trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java

    r8846 r9078  
    3333    private final Map<PluginInformation, Boolean> selectedPluginsMap = new HashMap<>();
    3434    // plugins that still require an update/download
    35     private Set<String> pendingDownloads = new HashSet<>();
     35    private final Set<String> pendingDownloads = new HashSet<>();
    3636
    3737    /**

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

    r8836 r9078  
    5050        private ProjectionCodeListModel model;
    5151        public JList<String> selectionList;
    52         private List<String> data;
    53         private List<String> filteredData;
     52        private final List<String> data;
     53        private final List<String> filteredData;
    5454        private static final String DEFAULT_CODE = "EPSG:3857";
    5555        private String lastCode = DEFAULT_CODE;
    56         private transient ActionListener listener;
     56        private final transient ActionListener listener;
    5757
    5858        CodeSelectionPanel(String initialCode, ActionListener listener) {

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

    r8870 r9078  
    272272     */
    273273    private JPanel projSubPrefPanel;
    274     private JPanel projSubPrefPanelWrapper = new JPanel(new GridBagLayout());
     274    private final JPanel projSubPrefPanelWrapper = new JPanel(new GridBagLayout());
    275275
    276276    private JLabel projectionCodeLabel;
    277277    private Component projectionCodeGlue;
    278     private JLabel projectionCode = new JLabel();
     278    private final JLabel projectionCode = new JLabel();
    279279    private JLabel projectionNameLabel;
    280280    private Component projectionNameGlue;
    281     private JLabel projectionName = new JLabel();
    282     private JLabel bounds = new JLabel();
     281    private final JLabel projectionName = new JLabel();
     282    private final JLabel bounds = new JLabel();
    283283
    284284    /**

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

    r8836 r9078  
    5555
    5656    // table of shortcuts
    57     private AbstractTableModel model;
     57    private final AbstractTableModel model;
    5858    // this are the display(!) texts for the checkboxes. Let the JVM do the i18n for us <g>.
    5959    // Ok, there's a real reason for this: The JVM should know best how the keys are labelled
    … …  
    9595    }
    9696
    97     private JCheckBox cbAlt = new JCheckBox();
    98     private JCheckBox cbCtrl = new JCheckBox();
    99     private JCheckBox cbMeta = new JCheckBox();
    100     private JCheckBox cbShift = new JCheckBox();
    101     private JCheckBox cbDefault = new JCheckBox();
    102     private JCheckBox cbDisable = new JCheckBox();
    103     private JosmComboBox<String> tfKey = new JosmComboBox<>();
    104 
    105     private JTable shortcutTable = new JTable();
    106 
    107     private JosmTextField filterField = new JosmTextField();
     97    private final JCheckBox cbAlt = new JCheckBox();
     98    private final JCheckBox cbCtrl = new JCheckBox();
     99    private final JCheckBox cbMeta = new JCheckBox();
     100    private final JCheckBox cbShift = new JCheckBox();
     101    private final JCheckBox cbDefault = new JCheckBox();
     102    private final JCheckBox cbDisable = new JCheckBox();
     103    private final JosmComboBox<String> tfKey = new JosmComboBox<>();
     104
     105    private final JTable shortcutTable = new JTable();
     106
     107    private final JosmTextField filterField = new JosmTextField();
    108108
    109109    /** Creates new form prefJPanel */
    … …  
    123123    private static class ScListModel extends AbstractTableModel {
    124124        private final String[] columnNames = new String[]{tr("Action"), tr("Shortcut")};
    125         private transient List<Shortcut> data;
     125        private final transient List<Shortcut> data;
    126126
    127127        /**
    … …  
    155155    private class ShortcutTableCellRenderer extends DefaultTableCellRenderer {
    156156
    157         private boolean name;
     157        private final boolean name;
    158158
    159159        ShortcutTableCellRenderer(boolean name) {
    … …  
    286286    // more expirience with GUI coding than I have.
    287287    private class CbAction extends AbstractAction implements ListSelectionListener {
    288         private PrefJPanel panel;
     288        private final PrefJPanel panel;
    289289
    290290        CbAction(PrefJPanel panel) {

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

    r9059 r9078  
    4444    private boolean intermediateTask;
    4545
    46     private Queue<Request> requests = new LinkedList<>();
     46    private final Queue<Request> requests = new LinkedList<>();
    4747    private AbstractProgressMonitor currentChild;
    4848    private Request requestedState = new Request();

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

    r7005 r9078  
    1010
    1111    private boolean isCanceled;
    12     private List<CancelListener> listeners = new ArrayList<>();
     12    private final List<CancelListener> listeners = new ArrayList<>();
    1313
    1414    public synchronized void cancel() {

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

    r8939 r9078  
    135135    }
    136136
    137     private ActionListener cancelListener = new ActionListener() {
     137    private final ActionListener cancelListener = new ActionListener() {
    138138        @Override
    139139        public void actionPerformed(ActionEvent e) {
    … …  
    142142    };
    143143
    144     private ActionListener inBackgroundListener = new ActionListener() {
     144    private final ActionListener inBackgroundListener = new ActionListener() {
    145145        @Override
    146146        public void actionPerformed(ActionEvent e) {
    … …  
    154154    };
    155155
    156     private WindowListener windowListener = new WindowAdapter() {
     156    private final WindowListener windowListener = new WindowAdapter() {
    157157        @Override public void windowClosing(WindowEvent e) {
    158158            cancel();

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

    r8840 r9078  
    1717    private static final int PROGRESS_BAR_MAX = 100;
    1818    private int currentProgressValue;
    19     private ProgressRenderer delegate;
     19    private final ProgressRenderer delegate;
    2020
    2121    /**

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

    r8855 r9078  
    2020 */
    2121public class TagCellRenderer extends JLabel implements TableCellRenderer  {
    22     private Font fontStandard;
    23     private Font fontItalic;
     22    private final Font fontStandard;
     23    private final Font fontItalic;
    2424
    2525    /**

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

    r9059 r9078  
    4141    private final PropertyChangeSupport propChangeSupport = new PropertyChangeSupport(this);
    4242
    43     private DefaultListSelectionModel rowSelectionModel;
    44     private DefaultListSelectionModel colSelectionModel;
     43    private final DefaultListSelectionModel rowSelectionModel;
     44    private final DefaultListSelectionModel colSelectionModel;
    4545
    4646    /**
    … …  
    609609
    610610    class SelectionStateMemento {
    611         private int rowMin;
    612         private int rowMax;
    613         private int colMin;
    614         private int colMax;
     611        private final int rowMin;
     612        private final int rowMax;
     613        private final int colMin;
     614        private final int colMax;
    615615
    616616        SelectionStateMemento() {

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

    r9073 r9078  
    615615     */
    616616    class CellEditorRemover implements PropertyChangeListener {
    617         private KeyboardFocusManager focusManager;
     617        private final KeyboardFocusManager focusManager;
    618618
    619619        CellEditorRemover(KeyboardFocusManager fm) {

  • trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java

    r8855 r9078  
    3333
    3434    /** the bare list of AutoCompletionItems */
    35     private transient List<AutoCompletionListItem> list;
     35    private final transient List<AutoCompletionListItem> list;
    3636    /**  the filtered list of AutoCompletionItems */
    37     private transient ArrayList<AutoCompletionListItem> filtered;
     37    private final transient ArrayList<AutoCompletionListItem> filtered;
    3838    /** the filter expression */
    3939    private String filter;
    4040    /** map from value to priority */
    41     private transient Map<String, AutoCompletionListItem> valutToItemMap;
     41    private final transient Map<String, AutoCompletionListItem> valutToItemMap;
    4242
    4343    /**

  • trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSearchDialog.java

    r8863 r9078  
    1919    private static TaggingPresetSearchDialog instance;
    2020
    21     private TaggingPresetSelector selector;
     21    private final TaggingPresetSelector selector;
    2222
    2323    /**

  • trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSearchPrimitiveDialog.java

    r8863 r9078  
    2525    private static TaggingPresetSearchPrimitiveDialog instance;
    2626
    27     private TaggingPresetSelector selector;
     27    private final TaggingPresetSelector selector;
    2828
    2929    /**

  • trunk/src/org/openstreetmap/josm/gui/widgets/ComboBoxHistory.java

    r8510 r9078  
    1212public class ComboBoxHistory extends DefaultComboBoxModel<AutoCompletionListItem> implements Iterable<AutoCompletionListItem> {
    1313
    14     private int maxSize = 10;
     14    private final int maxSize;
    1515
    16     private transient List<HistoryChangedListener> listeners = new ArrayList<>();
     16    private final transient List<HistoryChangedListener> listeners = new ArrayList<>();
    1717
    1818    public ComboBoxHistory(int size) {

  • trunk/src/org/openstreetmap/josm/gui/widgets/DateEditorWithSlider.java

    r8510 r9078  
    2828 */
    2929public class DateEditorWithSlider extends JPanel {
    30     private JSpinner spinner;
    31     private JSlider slider;
     30    private final JSpinner spinner;
     31    private final JSlider slider;
    3232    private Date dateMin;
    3333    private Date dateMax;
    … …  
    3535    private boolean watchSlider = true;
    3636
    37     private transient List<ChangeListener> listeners = new ArrayList<>();
     37    private final transient List<ChangeListener> listeners = new ArrayList<>();
    3838
    3939    /**

  • trunk/src/org/openstreetmap/josm/gui/widgets/HistoryComboBox.java

    r8510 r9078  
    1010
    1111public class HistoryComboBox extends AutoCompletingComboBox {
    12     private ComboBoxHistory model;
     12    private final ComboBoxHistory model;
    1313
    1414    public static final int DEFAULT_SEARCH_HISTORY_SIZE = 15;

  • trunk/src/org/openstreetmap/josm/gui/widgets/ImageLabel.java

    r8510 r9078  
    1818 */
    1919public class ImageLabel extends JPanel {
    20     private JLabel tf;
    21     private int charCount;
     20    private final JLabel tf;
     21    private final int charCount;
    2222
    2323    /**

  • trunk/src/org/openstreetmap/josm/gui/widgets/ListPopupMenu.java

    r7001 r9078  
    1414public class ListPopupMenu extends JPopupMenu {
    1515
    16     private JList<?>[] lists;
     16    private final JList<?>[] lists;
    1717
    1818    public ListPopupMenu(JList<?> ... lists) {

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

    r9059 r9078  
    7575    public static final long DAYS = 24*60*60; // factor to get caching time in days
    7676
    77     private Map<String, String> httpHeaders = new ConcurrentHashMap<>();
     77    private final Map<String, String> httpHeaders = new ConcurrentHashMap<>();
    7878
    7979    /**

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

    r8840 r9078  
    6565    private InetSocketAddress httpProxySocketAddress;
    6666    private InetSocketAddress socksProxySocketAddress;
    67     private ProxySelector delegate;
     67    private final ProxySelector delegate;
    6868
    6969    private final Set<String> errorResources = new HashSet<>();

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

    r8510 r9078  
    4343     * replied by the server
    4444     */
    45     private Map<PrimitiveId, DiffResultEntry> diffResults = new HashMap<>();
     45    private final Map<PrimitiveId, DiffResultEntry> diffResults = new HashMap<>();
    4646    /**
    4747     * the set of processed primitives *after* the new id, the new version and the new changeset id is set
    4848     */
    49     private Set<OsmPrimitive> processed;
     49    private final Set<OsmPrimitive> processed;
    5050    /**
    5151     * the collection of primitives being uploaded
    5252     */
    53     private Collection<? extends OsmPrimitive> primitives;
     53    private final Collection<? extends OsmPrimitive> primitives;
    5454
    5555    /**

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

    r8895 r9078  
    3838         * The imported GPX layer. May be null if no GPX data.
    3939         */
    40         private GpxLayer gpxLayer;
     40        private final GpxLayer gpxLayer;
    4141        /**
    4242         * The imported marker layer. May be null if no marker.
    4343         */
    44         private MarkerLayer markerLayer;
     44        private final MarkerLayer markerLayer;
    4545        /**
    4646         * The task to run after GPX and/or marker layer has been added to MapView.
    4747         */
    48         private Runnable postLayerTask;
     48        private final Runnable postLayerTask;
    4949
    5050        public GpxImporterData(GpxLayer gpxLayer, MarkerLayer markerLayer, Runnable postLayerTask) {

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

    r9059 r9078  
    6161    /** The resulting gpx data */
    6262    private GpxData gpxData;
    63     private InputSource inputSource;
     63    private final InputSource inputSource;
    6464
    6565    private class Parser extends DefaultHandler {

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

    r8882 r9078  
    2020public class InvalidXmlCharacterFilter extends Reader {
    2121
    22     private Reader reader;
     22    private final Reader reader;
    2323
    2424    private static boolean firstWarning = true;

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

    r9059 r9078  
    6565    private static final int MAX_IDS_PER_REQUEST = 200;
    6666
    67     private Set<Long> nodes;
    68     private Set<Long> ways;
    69     private Set<Long> relations;
     67    private final Set<Long> nodes;
     68    private final Set<Long> ways;
     69    private final Set<Long> relations;
    7070    private Set<PrimitiveId> missingPrimitives;
    71     private DataSet outputDataSet;
     71    private final DataSet outputDataSet;
    7272
    7373    /**

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

    r9070 r9078  
    3232public class NoteReader {
    3333
    34     private InputSource inputSource;
     34    private final InputSource inputSource;
    3535    private List<Note> parsedNotes;
    3636
    … …  
    5252
    5353        private NoteParseMode parseMode;
    54         private StringBuilder buffer = new StringBuilder();
     54        private final StringBuilder buffer = new StringBuilder();
    5555        private Note thisNote;
    5656        private long commentUid;

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

    r8926 r9078  
    114114
    115115    /** Server URL */
    116     private String serverUrl;
     116    private final String serverUrl;
    117117
    118118    /** Object describing current changeset */
    … …  
    165165        private static final String CAPABILITIES = "capabilities";
    166166
    167         private ProgressMonitor monitor;
    168         private boolean fastFail;
     167        private final ProgressMonitor monitor;
     168        private final boolean fastFail;
    169169
    170170        CapabilitiesCache(ProgressMonitor monitor, boolean fastFail) {

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

    r8540 r9078  
    3131public class OsmChangesetContentParser {
    3232
    33     private InputSource source;
     33    private final InputSource source;
    3434    private final ChangesetDataSet data = new ChangesetDataSet();
    3535

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

    r8510 r9078  
    1919public class OsmServerHistoryReader extends OsmServerReader {
    2020
    21     private OsmPrimitiveType primitiveType;
    22     private long id;
     21    private final OsmPrimitiveType primitiveType;
     22    private final long id;
    2323
    2424    /**

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

    r8870 r9078  
    3535 */
    3636public abstract class OsmServerReader extends OsmConnection {
    37     private OsmApi api = OsmApi.getOsmApi();
     37    private final OsmApi api = OsmApi.getOsmApi();
    3838    private boolean doAuthenticate;
    3939    protected boolean gpxParsedProperly;

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

    r8848 r9078  
    5151    }
    5252
    53     private OsmApi api = OsmApi.getOsmApi();
     53    private final OsmApi api = OsmApi.getOsmApi();
    5454    private boolean canceled;
    5555

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

    r8846 r9078  
    3939    public static final String DEFAULT_API_VERSION = "0.6";
    4040
    41     private boolean osmConform;
     41    private final boolean osmConform;
    4242    private boolean withBody = true;
    4343    private boolean isOsmChange;

  • trunk/src/org/openstreetmap/josm/io/auth/CredentialsManager.java

    r8510 r9078  
    6262     * The credentials agent doing the real stuff
    6363     */
    64     private CredentialsAgent delegate;
     64    private final CredentialsAgent delegate;
    6565
    6666    /**

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

    r8856 r9078  
    3030public class ImageryReader {
    3131
    32     private String source;
     32    private final String source;
    3333
    3434    private enum State {

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

    r8836 r9078  
    5757     */
    5858    static class DeleteTagMarker {
    59         private int num;
     59        private final int num;
    6060
    6161        DeleteTagMarker(int num) {

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

    r8966 r9078  
    2020
    2121    /** The server socket */
    22     private ServerSocket server;
     22    private final ServerSocket server;
    2323
    2424    /** The server instance for IPv4 */
    … …  
    101101                Socket request = server.accept();
    102102                RequestProcessor.processRequest(request);
    103             } catch (SocketException se) { 
     103            } catch (SocketException se) {
    104104                if (!server.isClosed()) {
    105105                    Main.error(se);

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

    r8926 r9078  
    7272
    7373    /** The server socket */
    74     private ServerSocket server;
     74    private final ServerSocket server;
    7575
    7676    /** The server instance for IPv4 */

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

    r8870 r9078  
    5656
    5757    /** The socket this processor listens on */
    58     private Socket request;
     58    private final Socket request;
    5959
    6060    /**

  • trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java

    r8870 r9078  
    2222public class GeoImageSessionExporter implements SessionLayerExporter {
    2323
    24     private GeoImageLayer layer;
     24    private final GeoImageLayer layer;
    2525
    2626    public GeoImageSessionExporter(GeoImageLayer layer) {

  • trunk/src/org/openstreetmap/josm/io/session/GpxTracksSessionExporter.java

    r8510 r9078  
    4343public class GpxTracksSessionExporter implements SessionLayerExporter {
    4444
    45     private GpxLayer layer;
     45    private final GpxLayer layer;
    4646    private JRadioButton link, include;
    4747    private JCheckBox export;

  • trunk/src/org/openstreetmap/josm/io/session/MarkerSessionExporter.java

    r8510 r9078  
    3030public class MarkerSessionExporter implements SessionLayerExporter {
    3131
    32     private MarkerLayer layer;
     32    private final MarkerLayer layer;
    3333    private JCheckBox export;
    3434

  • trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java

    r8836 r9078  
    4848public class OsmDataSessionExporter implements SessionLayerExporter {
    4949
    50     private OsmDataLayer layer;
     50    private final OsmDataLayer layer;
    5151    private JRadioButton link, include;
    5252    private JCheckBox export;

  • trunk/src/org/openstreetmap/josm/io/session/SessionReader.java

    r8929 r9078  
    9090    private List<Layer> layers = new ArrayList<>();
    9191    private int active = -1;
    92     private List<Runnable> postLoadTasks = new ArrayList<>();
     92    private final List<Runnable> postLoadTasks = new ArrayList<>();
    9393    private ViewportData viewport;
    9494
    … …  
    126126    public class ImportSupport {
    127127
    128         private String layerName;
    129         private int layerIndex;
    130         private List<LayerDependency> layerDependencies;
     128        private final String layerName;
     129        private final int layerIndex;
     130        private final List<LayerDependency> layerDependencies;
    131131
    132132        public ImportSupport(String layerName, int layerIndex, List<LayerDependency> layerDependencies) {
    … …  
    273273
    274274    public static class LayerDependency {
    275         private Integer index;
    276         private Layer layer;
    277         private SessionLayerImporter importer;
     275        private final Integer index;
     276        private final Layer layer;
     277        private final SessionLayerImporter importer;
    278278
    279279        public LayerDependency(Integer index, Layer layer, SessionLayerImporter importer) {

  • trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java

    r8926 r9078  
    112112     */
    113113    public class ExportSupport {
    114         private Document doc;
    115         private int layerIndex;
     114        private final Document doc;
     115        private final int layerIndex;
    116116
    117117        public ExportSupport(Document doc, int layerIndex) {

  • trunk/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java

    r8510 r9078  
    3535 */
    3636public class ReadLocalPluginInformationTask extends PleaseWaitRunnable {
    37     private Map<String, PluginInformation> availablePlugins;
     37    private final Map<String, PluginInformation> availablePlugins;
    3838    private boolean canceled;
    3939

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

    r8928 r9078  
    3636    private State state;
    3737    private URL playingUrl;
    38     private double leadIn; // seconds
    39     private double calibration; // ratio of purported duration of samples to true duration
     38    private final double leadIn; // seconds
     39    private final double calibration; // ratio of purported duration of samples to true duration
    4040    private double position; // seconds
    4141    private double bytesPerSecond;
    … …  
    114114    }
    115115
    116     private Execute command;
     116    private final Execute command;
    117117
    118118    /**

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

    r8510 r9078  
    1313 */
    1414public class CompositeList<T> extends AbstractList<T> {
    15     private List<? extends T> a, b;
     15    private final List<? extends T> a, b;
    1616
    1717    /**

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

    r8723 r9078  
    11// License: GPL. For details, see LICENSE file.
    22package org.openstreetmap.josm.tools;
    3 
    4 import org.openstreetmap.josm.gui.layer.ImageProcessor;
    53
    64import java.awt.Dimension;
    … …  
    86
    97import javax.swing.ImageIcon;
     8
     9import org.openstreetmap.josm.gui.layer.ImageProcessor;
    1010
    1111/** class to describe how image overlay
    … …  
    1616    public ImageProvider image;
    1717    /** offset of the image from left border, values between 0 and 1 */
    18     private double offsetLeft;
     18    private final double offsetLeft;
    1919    /** offset of the image from top border, values between 0 and 1 */
    20     private double offsetRight;
     20    private final double offsetRight;
    2121    /** offset of the image from right border, values between 0 and 1*/
    22     private double offsetTop;
     22    private final double offsetTop;
    2323    /** offset of the image from bottom border, values between 0 and 1 */
    24     private double offsetBottom;
     24    private final double offsetBottom;
    2525
    2626    /**

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

    r8840 r9078  
    2828     * Caches the image data for resized versions of the same image.
    2929     */
    30     private Map<Dimension, Image> imgCache = new HashMap<>();
     30    private final Map<Dimension, Image> imgCache = new HashMap<>();
    3131    /**
    3232     * SVG diagram information in case of SVG vector image.

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

    r8870 r9078  
    3232    private static final String STATUS_BAR_ID = "multikeyShortcut";
    3333
    34     private Map<MultikeyShortcutAction, MyAction> myActions = new HashMap<>();
     34    private final Map<MultikeyShortcutAction, MyAction> myActions = new HashMap<>();
    3535
    3636    private final class ShowLayersPopupWorker implements Runnable {
    … …  
    188188    private long lastTimestamp;
    189189    private MyAction lastAction;
    190     private Timer timer;
     190    private final Timer timer;
    191191
    192192    private MultikeyActionsHandler() {

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

    r9073 r9078  
    4242        private boolean quotesStarted;
    4343        private boolean esc;
    44         private StringBuilder s = new StringBuilder(200);
     44        private final StringBuilder s = new StringBuilder(200);
    4545        private int pos;
    46         private String data;
    47         private int n;
     46        private final String data;
     47        private final int n;
    4848
    4949        public TextAnalyzer(String text) {

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

    r8856 r9078  
    6464
    6565    private class Parser extends DefaultHandler {
    66         private Stack<Object> current = new Stack<>();
     66        private final Stack<Object> current = new Stack<>();
    6767        private StringBuilder characters = new StringBuilder(64);
    6868
    … …  
    182182
    183183    private static class Entry {
    184         private Class<?> klass;
    185         private boolean onStart;
    186         private boolean both;
     184        private final Class<?> klass;
     185        private final boolean onStart;
     186        private final boolean both;
    187187        private final Map<String, Field> fields = new HashMap<>();
    188188        private final Map<String, Method> methods = new HashMap<>();
    … …  
    225225    }
    226226
    227     private Map<String, Entry> mapping = new HashMap<>();
    228     private DefaultHandler parser;
     227    private final Map<String, Entry> mapping = new HashMap<>();
     228    private final DefaultHandler parser;
    229229
    230230    /**
    231231     * The queue of already parsed items from the parsing thread.
    232232     */
    233     private List<Object> queue = new LinkedList<>();
     233    private final List<Object> queue = new LinkedList<>();
    234234    private Iterator<Object> queueIterator;
    235235

  • trunk/src/org/openstreetmap/josm/tools/date/FallbackDateParser.java

    r8836 r9078  
    3636    };
    3737
    38     private List<DateFormat> dateParsers;
     38    private final List<DateFormat> dateParsers;
    3939    private int activeDateParser;
    4040

  • trunk/src/org/openstreetmap/josm/tools/date/PrimaryDateParser.java

    r9062 r9078  
    2020public class PrimaryDateParser {
    2121    private DatatypeFactory datatypeFactory;
    22     private FallbackDateParser fallbackDateParser;
    23     private Calendar calendar;
     22    private final FallbackDateParser fallbackDateParser;
     23    private final Calendar calendar;
    2424
    2525    /**

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

    r8846 r9078  
    5050    private int index;
    5151    private Token currentToken;
    52     private StringBuilder text = new StringBuilder();
     52    private final StringBuilder text = new StringBuilder();
    5353
    5454    public Tokenizer(String template) {
Note: See TracChangeset for help on using the changeset viewer.