Index: /trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java (revision 9078) @@ -107,7 +107,7 @@ private static class DefaultAction extends AbstractAction { - private JDialog dialog; - private JOptionPane pane; - private int value; + private final JDialog dialog; + private final JOptionPane pane; + private final int value; DefaultAction(JDialog dialog, JOptionPane pane, int value) { Index: /trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java (revision 9078) @@ -59,5 +59,5 @@ }; - private transient Action offsetAction = new JosmAction( + private final transient Action offsetAction = new JosmAction( tr("Imagery offset"), "mapmode/adjustimg", tr("Adjust imagery offset"), null, false, false) { { @@ -258,5 +258,5 @@ * @since 5803 */ - private List dynamicItems = new ArrayList<>(20); + private final List dynamicItems = new ArrayList<>(20); /** Index: /trunk/src/org/openstreetmap/josm/gui/MainMenu.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MainMenu.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/MainMenu.java (revision 9078) @@ -407,5 +407,5 @@ * Popup menu to display menu items search result. */ - private JPopupMenu searchResultsMenu = new JPopupMenu(); + private final JPopupMenu searchResultsMenu = new JPopupMenu(); /** this menu listener hides unnecessary JSeparators in a menu list but does not remove them. @@ -941,5 +941,5 @@ static class PresetsMenuEnabler implements MapView.LayerChangeListener { - private JMenu presetsMenu; + private final JMenu presetsMenu; PresetsMenuEnabler(JMenu presetsMenu) { Index: /trunk/src/org/openstreetmap/josm/gui/MapFrame.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MapFrame.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/MapFrame.java (revision 9078) @@ -493,5 +493,5 @@ private final class SideToolbarPopupMenu extends JPopupMenu { private static final int staticMenuEntryCount = 2; - private JCheckBoxMenuItem doNotHide = new JCheckBoxMenuItem(new AbstractAction(tr("Do not hide toolbar")) { + private final JCheckBoxMenuItem doNotHide = new JCheckBoxMenuItem(new AbstractAction(tr("Do not hide toolbar")) { @Override public void actionPerformed(ActionEvent e) { @@ -547,5 +547,5 @@ private JButton button; - private transient Collection buttons; + private final transient Collection buttons; ListAllButtonsAction(Collection buttons) { Index: /trunk/src/org/openstreetmap/josm/gui/MapStatus.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 9078) @@ -205,5 +205,5 @@ * It gets destroyed by destroy() when the MapFrame itself is destroyed. */ - private transient Thread thread; + private final transient Thread thread; private final transient List statusText = new ArrayList<>(); @@ -348,5 +348,5 @@ private Popup popup; - private MapFrame parent; + private final MapFrame parent; private final BlockingQueue incomingMouseState = new LinkedBlockingQueue<>(); @@ -677,5 +677,5 @@ } - private transient AWTEventListener awtListener = new AWTEventListener() { + private final transient AWTEventListener awtListener = new AWTEventListener() { @Override public void eventDispatched(AWTEvent event) { @@ -694,5 +694,5 @@ }; - private transient MouseMotionListener mouseMotionListener = new MouseMotionListener() { + private final transient MouseMotionListener mouseMotionListener = new MouseMotionListener() { @Override public void mouseMoved(MouseEvent e) { @@ -708,5 +708,5 @@ }; - private transient KeyAdapter keyAdapter = new KeyAdapter() { + private final transient KeyAdapter keyAdapter = new KeyAdapter() { @Override public void keyPressed(KeyEvent e) { synchronized (collector) { Index: /trunk/src/org/openstreetmap/josm/gui/MapView.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MapView.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/MapView.java (revision 9078) @@ -1107,5 +1107,5 @@ } - private transient SelectionChangedListener repaintSelectionChangedListener = new SelectionChangedListener() { + private final transient SelectionChangedListener repaintSelectionChangedListener = new SelectionChangedListener() { @Override public void selectionChanged(Collection newSelection) { Index: /trunk/src/org/openstreetmap/josm/gui/MenuScroller.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MenuScroller.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/MenuScroller.java (revision 9078) @@ -443,5 +443,5 @@ implements ChangeListener { - private MenuScrollTimer timer; + private final MenuScrollTimer timer; MenuScrollItem(MenuIcon icon, int increment) { Index: /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (revision 9078) @@ -216,7 +216,7 @@ /** * Returns the current center of the viewport. - * + * * (Use {@link #zoomTo(EastNorth)} to the change the center.) - * + * * @return the current center of the viewport */ @@ -227,7 +227,7 @@ /** * Returns the current scale. - * + * * In east/north units per pixel. - * + * * @return the current scale */ @@ -602,6 +602,6 @@ } - private Stack zoomUndoBuffer = new Stack<>(); - private Stack zoomRedoBuffer = new Stack<>(); + private final Stack zoomUndoBuffer = new Stack<>(); + private final Stack zoomRedoBuffer = new Stack<>(); private Date zoomTimestamp = new Date(); Index: /trunk/src/org/openstreetmap/josm/gui/NoteInputDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/NoteInputDialog.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/NoteInputDialog.java (revision 9078) @@ -22,5 +22,5 @@ public class NoteInputDialog extends ExtendedDialog { - private JosmTextArea textArea = new JosmTextArea(); + private final JosmTextArea textArea = new JosmTextArea(); /** Index: /trunk/src/org/openstreetmap/josm/gui/NoteSortDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/NoteSortDialog.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/NoteSortDialog.java (revision 9078) @@ -22,8 +22,8 @@ public class NoteSortDialog extends ExtendedDialog { - private JRadioButton defaultSort = new JRadioButton(tr("Default (open, closed, new)")); - private JRadioButton userSort = new JRadioButton(tr("Username")); - private JRadioButton dateSort = new JRadioButton(tr("Created date")); - private JRadioButton lastActionSort = new JRadioButton(tr("Last change date")); + private final JRadioButton defaultSort = new JRadioButton(tr("Default (open, closed, new)")); + private final JRadioButton userSort = new JRadioButton(tr("Username")); + private final JRadioButton dateSort = new JRadioButton(tr("Created date")); + private final JRadioButton lastActionSort = new JRadioButton(tr("Last change date")); /** Index: /trunk/src/org/openstreetmap/josm/gui/NotificationManager.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/NotificationManager.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/NotificationManager.java (revision 9078) @@ -55,7 +55,7 @@ class NotificationManager { - private Timer hideTimer; // started when message is shown, responsible for hiding the message - private Timer pauseTimer; // makes sure, there is a small pause between two consecutive messages - private Timer unfreezeDelayTimer; // tiny delay before resuming the timer when mouse cursor is moved off the panel + private final Timer hideTimer; // started when message is shown, responsible for hiding the message + private final Timer pauseTimer; // makes sure, there is a small pause between two consecutive messages + private final Timer unfreezeDelayTimer; // tiny delay before resuming the timer when mouse cursor is moved off the panel private boolean running; Index: /trunk/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java (revision 9078) @@ -28,15 +28,15 @@ */ public class OsmPrimitivRenderer implements ListCellRenderer, TableCellRenderer { - private DefaultNameFormatter formatter = DefaultNameFormatter.getInstance(); + private final DefaultNameFormatter formatter = DefaultNameFormatter.getInstance(); /** * Default list cell renderer - delegate for ListCellRenderer operation */ - private DefaultListCellRenderer defaultListCellRenderer = new DefaultListCellRenderer(); + private final DefaultListCellRenderer defaultListCellRenderer = new DefaultListCellRenderer(); /** * Default table cell renderer - delegate for TableCellRenderer operation */ - private DefaultTableCellRenderer defaultTableCellRenderer = new DefaultTableCellRenderer(); + private final DefaultTableCellRenderer defaultTableCellRenderer = new DefaultTableCellRenderer(); /** Index: /trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java (revision 9078) @@ -39,5 +39,5 @@ private class ScrollViewPortMouseListener extends MouseAdapter { - private int direction; + private final int direction; ScrollViewPortMouseListener(int direction) { @@ -65,10 +65,10 @@ } - private JViewport vp = new JViewport(); + private final JViewport vp = new JViewport(); private JComponent component; - private List buttons = new ArrayList<>(); - - private Timer timer = new Timer(100, new ActionListener() { + private final List buttons = new ArrayList<>(); + + private final Timer timer = new Timer(100, new ActionListener() { @Override public void actionPerformed(ActionEvent arg0) { Index: /trunk/src/org/openstreetmap/josm/gui/SelectionManager.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/SelectionManager.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/SelectionManager.java (revision 9078) @@ -127,8 +127,7 @@ private final NavigatableComponent nc; /** - * Whether the selection rectangle must obtain the aspect ratio of the - * drawComponent. - */ - private boolean aspectRatio; + * Whether the selection rectangle must obtain the aspect ratio of the drawComponent. + */ + private final boolean aspectRatio; /** @@ -139,5 +138,5 @@ * The polygon to store the selection outline if {@link #lassoMode} is used. */ - private Polygon lasso = new Polygon(); + private final Polygon lasso = new Polygon(); /** Index: /trunk/src/org/openstreetmap/josm/gui/bbox/SizeButton.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/bbox/SizeButton.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/bbox/SizeButton.java (revision 9078) @@ -23,6 +23,6 @@ private int y; - private ImageIcon enlargeImage; - private ImageIcon shrinkImage; + private final ImageIcon enlargeImage; + private final ImageIcon shrinkImage; private boolean isEnlarged; private final SlippyMapBBoxChooser slippyMapBBoxChooser; Index: /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java (revision 9078) @@ -119,6 +119,6 @@ public static final String RESIZE_PROP = SlippyMapBBoxChooser.class.getName() + ".resize"; - private transient TileLoader cachedLoader; - private transient OsmTileLoader uncachedLoader; + private final transient TileLoader cachedLoader; + private final transient OsmTileLoader uncachedLoader; private final SizeButton iSizeButton; Index: /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java (revision 9078) @@ -170,5 +170,5 @@ private class MoveXAction extends AbstractAction { - private int direction; + private final int direction; MoveXAction(int direction) { @@ -184,5 +184,5 @@ private class MoveYAction extends AbstractAction { - private int direction; + private final int direction; MoveYAction(int direction) { Index: /trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java (revision 9078) @@ -229,5 +229,5 @@ private transient TileCoordinateValidator valMinX; private JSpinner spZoomLevel; - private transient TileBoundsBuilder tileBoundsBuilder = new TileBoundsBuilder(); + private final transient TileBoundsBuilder tileBoundsBuilder = new TileBoundsBuilder(); private boolean doFireTileBoundChanged = true; Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java (revision 9078) @@ -23,5 +23,5 @@ */ public class RelationMemberTableCellRenderer extends JLabel implements TableCellRenderer { - private transient Border rowNumberBorder; + private final transient Border rowNumberBorder; /** Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java (revision 9078) @@ -17,7 +17,7 @@ public class TagMergeItem { - private String key; - private String myTagValue; - private String theirTagValue; + private final String key; + private final String myTagValue; + private final String theirTagValue; private MergeDecisionType mergeDecision = MergeDecisionType.UNDECIDED; Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java (revision 9078) @@ -50,7 +50,7 @@ /** the combo box used as editor */ - private JosmComboBox editor; - private DefaultComboBoxModel editorModel; - private CopyOnWriteArrayList listeners; + private final JosmComboBox editor; + private final DefaultComboBoxModel editorModel; + private final CopyOnWriteArrayList listeners; /** Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java (revision 9078) @@ -25,8 +25,8 @@ public class MultiValueCellRenderer extends JLabel implements TableCellRenderer { - private ImageIcon iconDecided; - private ImageIcon iconUndecided; - private DefaultComboBoxModel model; - private JosmComboBox cbDecisionRenderer; + private final ImageIcon iconDecided; + private final ImageIcon iconUndecided; + private final DefaultComboBoxModel model; + private final JosmComboBox cbDecisionRenderer; /** Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java (revision 9078) @@ -26,5 +26,5 @@ private MultiValueDecisionType type; /** the collection of tags for which a decision is needed */ - private TagCollection tags; + private final TagCollection tags; /** the selected value if {@link #type} is {@link MultiValueDecisionType#KEEP_ONE} */ private String value; Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java (revision 9078) @@ -402,5 +402,5 @@ private static final class StatisticsTableModel extends DefaultTableModel { private static final String[] HEADERS = new String[] {tr("Paste ..."), tr("From ..."), tr("To ...") }; - private transient List data; + private final transient List data; private StatisticsTableModel() { Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java (revision 9078) @@ -12,7 +12,7 @@ public class RelationMemberConflictDecision { - private Relation relation; - private int pos; - private OsmPrimitive originalPrimitive; + private final Relation relation; + private final int pos; + private final OsmPrimitive originalPrimitive; private String role; private RelationMemberConflictDecisionType decision; Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java (revision 9078) @@ -17,5 +17,5 @@ implements TableCellRenderer, ListCellRenderer { - private JosmComboBox cbDecisionTypes; + private final JosmComboBox cbDecisionTypes; protected void resetTableRenderer() { Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java (revision 9078) @@ -27,5 +27,5 @@ /** the model for the tag conflict resolver */ - private TagConflictResolverModel model; + private final TagConflictResolverModel model; /** selects whether only tags with conflicts are displayed */ private JCheckBox cbShowTagsWithConflictsOnly; Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java (revision 9078) @@ -27,5 +27,5 @@ private transient Map decisions; private int numConflicts; - private PropertyChangeSupport support; + private final PropertyChangeSupport support; private boolean showTagsWithConflictsOnly; private boolean showTagsWithMultiValuesOnly; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (revision 9078) @@ -63,11 +63,11 @@ private final JTree redoTree = new JTree(redoTreeModel); - private transient UndoRedoSelectionListener undoSelectionListener; - private transient UndoRedoSelectionListener redoSelectionListener; - - private JScrollPane scrollPane; - private JSeparator separator = new JSeparator(); + private final transient UndoRedoSelectionListener undoSelectionListener; + private final transient UndoRedoSelectionListener redoSelectionListener; + + private final JScrollPane scrollPane; + private final JSeparator separator = new JSeparator(); // only visible, if separator is the top most component - private Component spacer = Box.createRigidArea(new Dimension(0, 3)); + private final Component spacer = Box.createRigidArea(new Dimension(0, 3)); // last operation is remembered to select the next undo/redo entry in the list @@ -76,6 +76,6 @@ // Actions for context menu and Enter key - private SelectAction selectAction = new SelectAction(); - private SelectAndZoomAction selectAndZoomAction = new SelectAndZoomAction(); + private final SelectAction selectAction = new SelectAction(); + private final SelectAndZoomAction selectAndZoomAction = new SelectAndZoomAction(); /** @@ -167,5 +167,5 @@ */ private class UndoRedoSelectionListener implements TreeSelectionListener { - private JTree source; + private final JTree source; UndoRedoSelectionListener(JTree source) { @@ -247,5 +247,5 @@ * Simple listener setup to update the button enabled state when the side dialog shows. */ - private transient Set showNotifyListener = new LinkedHashSet<>(); + private final transient Set showNotifyListener = new LinkedHashSet<>(); private void addShowNotifyListener(IEnabledStateUpdating listener) { @@ -431,6 +431,6 @@ */ protected class UndoRedoAction extends AbstractAction implements IEnabledStateUpdating { - private UndoRedoType type; - private JTree tree; + private final UndoRedoType type; + private final JTree tree; /** @@ -439,19 +439,15 @@ */ public UndoRedoAction(UndoRedoType type) { - super(); this.type = type; - switch (type) { - case UNDO: + if (UndoRedoType.UNDO == type) { tree = undoTree; putValue(NAME, tr("Undo")); putValue(SHORT_DESCRIPTION, tr("Undo the selected and all later commands")); putValue(SMALL_ICON, ImageProvider.get("undo")); - break; - case REDO: + } else { tree = redoTree; putValue(NAME, tr("Redo")); putValue(SHORT_DESCRIPTION, tr("Redo the selected and all earlier commands")); putValue(SMALL_ICON, ImageProvider.get("redo")); - break; } } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java (revision 9078) @@ -188,5 +188,5 @@ */ public static class RelationMemberTableModel extends DefaultTableModel { - private transient List data; + private final transient List data; /** Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java (revision 9078) @@ -26,5 +26,5 @@ * Panels that are added to the multisplitpane. */ - private List panels = new ArrayList<>(); + private final List panels = new ArrayList<>(); private final JSplitPane parent; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java (revision 9078) @@ -58,8 +58,8 @@ private JTable userTable; - private FilterTableModel filterModel = new FilterTableModel(); - - private EnableFilterAction enableFilterAction; - private HidingFilterAction hidingFilterAction; + private final FilterTableModel filterModel = new FilterTableModel(); + + private final EnableFilterAction enableFilterAction; + private final HidingFilterAction hidingFilterAction; /** Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java (revision 9078) @@ -366,5 +366,5 @@ } - private OSDLabel lblOSD = new OSDLabel(""); + private final OSDLabel lblOSD = new OSDLabel(""); public void drawOSDText(Graphics2D g) { Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java (revision 9078) @@ -133,5 +133,5 @@ private static final char NL = '\n'; - private StringBuilder s = new StringBuilder(); + private final StringBuilder s = new StringBuilder(); private DataText add(String title, String... values) { Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 9078) @@ -109,19 +109,19 @@ /** the model for the layer list */ - private LayerListModel model; + private final LayerListModel model; /** the list of layers (technically its a JTable, but appears like a list) */ - private LayerList layerList; - - private SideButton opacityButton; - private SideButton gammaButton; - - private ActivateLayerAction activateLayerAction; - private ShowHideLayerAction showHideLayerAction; + private final LayerList layerList; + + private final SideButton opacityButton; + private final SideButton gammaButton; + + private final ActivateLayerAction activateLayerAction; + private final ShowHideLayerAction showHideLayerAction; //TODO This duplicates ShowHide actions functionality /** stores which layer index to toggle and executes the ShowHide action if the layer is present */ private final class ToggleLayerIndexVisibility extends AbstractAction { - private int layerIndex = -1; + private final int layerIndex; ToggleLayerIndexVisibility(int layerIndex) { @@ -440,5 +440,5 @@ private transient WeakReference lastLayer; - private transient Shortcut multikeyShortcut; + private final transient Shortcut multikeyShortcut; /** @@ -1226,6 +1226,6 @@ public final class LayerListModel extends AbstractTableModel implements MapView.LayerChangeListener, PropertyChangeListener { /** manages list selection state*/ - private DefaultListSelectionModel selectionModel; - private CopyOnWriteArrayList listeners; + private final DefaultListSelectionModel selectionModel; + private final CopyOnWriteArrayList listeners; /** Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java (revision 9078) @@ -487,6 +487,6 @@ private class SaveToFileTask extends PleaseWaitRunnable { - private StyleSource s; - private File file; + private final StyleSource s; + private final File file; private boolean canceled; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java (revision 9078) @@ -232,5 +232,5 @@ private static class NoteRenderer implements ListCellRenderer { - private DefaultListCellRenderer defaultListCellRenderer = new DefaultListCellRenderer(); + private final DefaultListCellRenderer defaultListCellRenderer = new DefaultListCellRenderer(); private final DateFormat dateFormat = DateUtils.getDateTimeFormat(DateFormat.MEDIUM, DateFormat.SHORT); @@ -264,5 +264,5 @@ class NoteTableModel extends AbstractListModel { - private transient List data; + private final transient List data; /** Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 9078) @@ -117,5 +117,5 @@ private final transient HighlightHelper highlightHelper = new HighlightHelper(); - private boolean highlightEnabled = Main.pref.getBoolean("draw.target-highlight", true); + private final boolean highlightEnabled = Main.pref.getBoolean("draw.target-highlight", true); /** @@ -372,5 +372,5 @@ private final transient List relations = new ArrayList<>(); private transient List filteredRelations; - private DefaultListSelectionModel selectionModel; + private final DefaultListSelectionModel selectionModel; private transient SearchCompiler.Match filter; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (revision 9078) @@ -198,5 +198,5 @@ class MouseEventHandler extends PopupMenuLauncher { private final HighlightHelper helper = new HighlightHelper(); - private boolean highlightEnabled = Main.pref.getBoolean("draw.target-highlight", true); + private final boolean highlightEnabled = Main.pref.getBoolean("draw.target-highlight", true); MouseEventHandler() { @@ -480,5 +480,5 @@ private LinkedList> history; private final transient List selection = new ArrayList<>(); - private DefaultListSelectionModel selectionModel; + private final DefaultListSelectionModel selectionModel; /** Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 9078) @@ -153,5 +153,5 @@ protected JToggleButton button; private JPanel buttonsPanel; - private transient List buttonActions = new ArrayList<>(); + private final transient List buttonActions = new ArrayList<>(); /** holds the menu entry in the windows menu. Required to properly Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java (revision 9078) @@ -288,5 +288,5 @@ */ static class UserTableModel extends DefaultTableModel { - private transient List data; + private final transient List data; UserTableModel() { Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java (revision 9078) @@ -72,11 +72,11 @@ /** The fix button */ - private SideButton fixButton; + private final SideButton fixButton; /** The ignore button */ - private SideButton ignoreButton; + private final SideButton ignoreButton; /** The select button */ - private SideButton selectButton; + private final SideButton selectButton; /** The lookup button */ - private SideButton lookupButton; + private final SideButton lookupButton; private final JPopupMenu popupMenu = new JPopupMenu(); @@ -586,5 +586,5 @@ */ class FixTask extends PleaseWaitRunnable { - private Collection testErrors; + private final Collection testErrors; private boolean canceled; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java (revision 9078) @@ -31,5 +31,5 @@ private final transient List data = new ArrayList<>(); - private DefaultListSelectionModel selectionModel; + private final DefaultListSelectionModel selectionModel; private transient Changeset changesetInDetailView; private final PropertyChangeSupport support = new PropertyChangeSupport(this); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java (revision 9078) @@ -25,5 +25,5 @@ private final transient List data = new ArrayList<>(); - private DefaultListSelectionModel selectionModel; + private final DefaultListSelectionModel selectionModel; public ChangesetContentTableModel(DefaultListSelectionModel selectionModel) { Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java (revision 9078) @@ -24,5 +24,5 @@ private final transient List data = new ArrayList<>(); private final transient Storage shownChangesets = new Storage<>(true); - private DefaultListSelectionModel selectionModel; + private final DefaultListSelectionModel selectionModel; public ChangesetListModel(DefaultListSelectionModel selectionModel) { Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 9078) @@ -864,5 +864,5 @@ static class MemberInfo { - private List role = new ArrayList<>(); + private final List role = new ArrayList<>(); private Set members = new HashSet<>(); private List position = new ArrayList<>(); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 9078) @@ -95,5 +95,5 @@ private String objKey; - private Comparator defaultACItemComparator = new Comparator() { + private final Comparator defaultACItemComparator = new Comparator() { @Override public int compare(AutoCompletionListItem o1, AutoCompletionListItem o2) { @@ -244,5 +244,5 @@ private final transient Map m; - private transient Comparator usedValuesAwareComparator = new Comparator() { + private final transient Comparator usedValuesAwareComparator = new Comparator() { @Override public int compare(AutoCompletionListItem o1, AutoCompletionListItem o2) { @@ -536,5 +536,5 @@ class AddTagsDialog extends AbstractTagsDialog { - private List recentTagsActions = new ArrayList<>(); + private final List recentTagsActions = new ArrayList<>(); // Counter of added commands for possible undo Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java (revision 9078) @@ -35,6 +35,6 @@ private Exception lastException; private final Set parents = new HashSet<>(); - private Collection children; - private OsmDataLayer curLayer; + private final Collection children; + private final OsmDataLayer curLayer; private MultiFetchServerObjectReader objectReader; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java (revision 9078) @@ -30,6 +30,6 @@ private boolean canceled; private Exception lastException; - private Collection relations; - private OsmDataLayer layer; + private final Collection relations; + private final OsmDataLayer layer; private OsmServerObjectReader objectReader; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 9078) @@ -98,15 +98,15 @@ public class GenericRelationEditor extends RelationEditor { /** the tag table and its model */ - private TagEditorPanel tagEditorPanel; - private ReferringRelationsBrowser referrerBrowser; - private ReferringRelationsBrowserModel referrerModel; + private final TagEditorPanel tagEditorPanel; + private final ReferringRelationsBrowser referrerBrowser; + private final ReferringRelationsBrowserModel referrerModel; /** the member table */ private MemberTable memberTable; - private MemberTableModel memberTableModel; + private final MemberTableModel memberTableModel; /** the model for the selection table */ private SelectionTable selectionTable; - private SelectionTableModel selectionTableModel; + private final SelectionTableModel selectionTableModel; private AutoCompletingTextField tfRole; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java (revision 9078) @@ -15,10 +15,10 @@ public class MemberRoleCellEditor extends AbstractCellEditor implements TableCellEditor { - private AutoCompletingTextField editor; + private final AutoCompletingTextField editor; private final transient DataSet ds; private final transient Relation relation; /** user input is matched against this list of auto completion items */ - private AutoCompletionList autoCompletionList; + private final AutoCompletionList autoCompletionList; /** Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java (revision 9078) @@ -45,5 +45,5 @@ /** the additional actions in popup menu */ private ZoomToGapAction zoomToGap; - private transient HighlightHelper highlightHelper = new HighlightHelper(); + private final transient HighlightHelper highlightHelper = new HighlightHelper(); private boolean highlightEnabled; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (revision 9078) @@ -51,5 +51,5 @@ * data of the table model: The list of members and the cached WayConnectionType of each member. **/ - private transient List members; + private final transient List members; private transient List connectionType; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java (revision 9078) @@ -55,8 +55,8 @@ private Exception lastException; private DataSet referrers; - private boolean full; - private OsmDataLayer layer; - private Relation child; - private List parents; + private final boolean full; + private final OsmDataLayer layer; + private final Relation child; + private final List parents; private Runnable continuation; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java (revision 9078) @@ -37,6 +37,6 @@ /** the list of relations */ private JList referrers; - private ReferringRelationsBrowserModel model; - private transient OsmDataLayer layer; + private final ReferringRelationsBrowserModel model; + private final transient OsmDataLayer layer; private JCheckBox cbReadFull; private EditAction editAction; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (revision 9078) @@ -59,5 +59,5 @@ /** the data layer the relation belongs to */ - private transient OsmDataLayer layer; + private final transient OsmDataLayer layer; /** Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java (revision 9078) @@ -105,7 +105,7 @@ private boolean canceled; private Exception lastException; - private Relation relation; + private final Relation relation; private DataSet ds; - private TreePath path; + private final TreePath path; RelationLoader(Dialog dialog, Relation relation, TreePath path) { Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeCellRenderer.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeCellRenderer.java (revision 9078) @@ -23,5 +23,5 @@ /** the relation icon */ - private ImageIcon icon; + private final ImageIcon icon; /** Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTable.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTable.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTable.java (revision 9078) @@ -14,5 +14,5 @@ public class SelectionTable extends JTable { - private SelectionTableModel model; + private final SelectionTableModel model; private MemberTableModel memberTableModel; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java (revision 9078) @@ -19,6 +19,6 @@ /** this selection table model only displays selected primitives in this layer */ - private transient OsmDataLayer layer; - private transient List cache; + private final transient OsmDataLayer layer; + private final transient List cache; /** Index: /trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java (revision 9078) @@ -176,5 +176,5 @@ } - private Border errorBorder = BorderFactory.createLineBorder(Color.RED, 1); + private final Border errorBorder = BorderFactory.createLineBorder(Color.RED, 1); protected void setErrorMessage(JosmTextField tf, String msg) { @@ -189,5 +189,5 @@ class LatValueChecker extends FocusAdapter implements ActionListener { - private JosmTextField tfLatValue; + private final JosmTextField tfLatValue; LatValueChecker(JosmTextField tfLatValue) { @@ -222,5 +222,5 @@ class LonValueChecker extends FocusAdapter implements ActionListener { - private JosmTextField tfLonValue; + private final JosmTextField tfLonValue; LonValueChecker(JosmTextField tfLonValue) { @@ -255,5 +255,5 @@ static class SelectAllOnFocusHandler extends FocusAdapter { - private JTextComponent tfTarget; + private final JTextComponent tfTarget; SelectAllOnFocusHandler(JTextComponent tfTarget) { Index: /trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (revision 9078) @@ -201,5 +201,5 @@ private StringBuilder description; private int depth; - private List data = new LinkedList<>(); + private final List data = new LinkedList<>(); /** @@ -327,9 +327,9 @@ class NameQueryTask extends PleaseWaitRunnable { - private String searchExpression; + private final String searchExpression; private HttpURLConnection connection; private List data; private boolean canceled; - private Server useserver; + private final Server useserver; private Exception lastException; @@ -411,5 +411,5 @@ static class NamedResultTableModel extends DefaultTableModel { private transient List data; - private transient ListSelectionModel selectionModel; + private final transient ListSelectionModel selectionModel; NamedResultTableModel(ListSelectionModel selectionModel) { Index: /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (revision 9078) @@ -119,5 +119,5 @@ private String url; - private transient HelpContentReader reader; + private final transient HelpContentReader reader; private static final JosmAction focusAction = new JosmAction(tr("JOSM Help Browser"), "help", "", null, false, false) { @@ -486,5 +486,5 @@ static class BackAction extends AbstractAction implements Observer { - private transient HelpBrowserHistory history; + private final transient HelpBrowserHistory history; BackAction(HelpBrowserHistory history) { @@ -508,5 +508,5 @@ static class ForwardAction extends AbstractAction implements Observer { - private transient HelpBrowserHistory history; + private final transient HelpBrowserHistory history; ForwardAction(HelpBrowserHistory history) { Index: /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java (revision 9078) @@ -8,5 +8,5 @@ public class HelpBrowserHistory extends Observable { - private HelpBrowser browser; + private final HelpBrowser browser; private List history; private int historyPos; Index: /trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java (revision 9078) @@ -171,6 +171,6 @@ private JLabel lblLat; private JLabel lblLon; - private transient HistoryBrowserModel model; - private PointInTimeType role; + private final transient HistoryBrowserModel model; + private final PointInTimeType role; protected LatLon coord; Index: /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java (revision 9078) @@ -50,5 +50,5 @@ } - private Map dialogs; + private final Map dialogs; protected HistoryBrowserDialogManager() { Index: /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (revision 9078) @@ -531,5 +531,5 @@ private List keys; - private PointInTimeType pointInTimeType; + private final PointInTimeType pointInTimeType; protected void initKeyList() { Index: /trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java (revision 9078) @@ -52,5 +52,5 @@ private boolean canceled; private Exception lastException; - private Set toLoad; + private final Set toLoad; private HistoryDataSet loadedData; private OsmServerHistoryReader reader; Index: /trunk/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java (revision 9078) @@ -19,5 +19,5 @@ public static final Color BGCOLOR_SELECTED = new Color(143, 170, 255); - private ImageIcon nodeIcon; + private final ImageIcon nodeIcon; /** Index: /trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java (revision 9078) @@ -332,6 +332,6 @@ static class DoubleClickAdapter extends MouseAdapter { - private JTable table; - private ShowHistoryAction showHistoryAction; + private final JTable table; + private final ShowHistoryAction showHistoryAction; DoubleClickAdapter(JTable table) { Index: /trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java (revision 9078) @@ -30,5 +30,5 @@ public static final Color BGCOLOR_SELECTED = new Color(143, 170, 255); - private transient Map icons; + private final transient Map icons; /** Index: /trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java (revision 9078) @@ -60,6 +60,6 @@ public List referenceDiff; public List currentDiff; - private Object[] reference; - private Object[] current; + private final Object[] reference; + private final Object[] current; boolean referenceReversed; Index: /trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (revision 9078) @@ -45,6 +45,6 @@ */ public class VersionInfoPanel extends JPanel implements Observer { - private PointInTimeType pointInTimeType; - private transient HistoryBrowserModel model; + private final PointInTimeType pointInTimeType; + private final transient HistoryBrowserModel model; private JMultilineLabel lblInfo; private UrlLabel lblUser; Index: /trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java (revision 9078) @@ -265,5 +265,5 @@ public static class RadioButtonEditor extends DefaultCellEditor implements ItemListener { - private JRadioButton btn; + private final JRadioButton btn; /** Index: /trunk/src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java (revision 9078) @@ -40,5 +40,5 @@ private final transient CellEditorSupport cellEditorSupport = new CellEditorSupport(this); - private transient ActionListener al = new ActionListener() { + private final transient ActionListener al = new ActionListener() { @Override public void actionPerformed(ActionEvent e) { Index: /trunk/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java (revision 9078) @@ -23,5 +23,5 @@ */ public class ChangesetCellRenderer extends JLabel implements ListCellRenderer { - private ImageIcon icon; + private final ImageIcon icon; /** Index: /trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java (revision 9078) @@ -56,5 +56,5 @@ private JCheckBox cbCloseAfterUpload; private OpenChangesetComboBoxModel model; - private transient ChangesetCommentModel changesetCommentModel; + private final transient ChangesetCommentModel changesetCommentModel; /** Index: /trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java (revision 9078) @@ -26,6 +26,6 @@ private boolean canceled; private Exception lastException; - private Collection changesets; - private List closedChangesets; + private final Collection changesets; + private final List closedChangesets; /** Index: /trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java (revision 9078) @@ -66,5 +66,5 @@ private boolean canceled; protected CredentialPanel pnlCredentials; - private String saveUsernameAndPasswordCheckboxText; + private final String saveUsernameAndPasswordCheckboxText; public boolean isCanceled() { @@ -286,5 +286,5 @@ private static class OtherHostCredentialsPanel extends CredentialPanel { - private String host; + private final String host; @Override Index: /trunk/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java (revision 9078) @@ -34,5 +34,5 @@ private List changesets; private Exception lastException; - private Component parent; + private final Component parent; /** Index: /trunk/src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java (revision 9078) @@ -18,5 +18,5 @@ */ public class OpenChangesetComboBoxModel extends DefaultComboBoxModel implements ChangesetCacheListener { - private transient List changesets; + private final transient List changesets; private transient Changeset selectedChangeset; Index: /trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java (revision 9078) @@ -15,5 +15,5 @@ /** the modifiable layer */ - private AbstractModifiableLayer layer; + private final AbstractModifiableLayer layer; private boolean doCheckSaveConditions; private boolean doSaveToFile; Index: /trunk/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java (revision 9078) @@ -27,6 +27,6 @@ */ public class SaveLayerTask extends AbstractIOTask { - private SaveLayerInfo layerInfo; - private ProgressMonitor parentMonitor; + private final SaveLayerInfo layerInfo; + private final ProgressMonitor parentMonitor; /** Index: /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java (revision 9078) @@ -25,5 +25,5 @@ private transient List layerInfo; private Mode mode; - private PropertyChangeSupport support; + private final PropertyChangeSupport support; // keep in sync with how the columns are ordered in SaveLayersTableColumnModel#build Index: /trunk/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java (revision 9078) @@ -34,6 +34,6 @@ private boolean canceled; private Exception lastException; - private Collection toUpdate; - private OsmDataLayer layer; + private final Collection toUpdate; + private final OsmDataLayer layer; private MultiFetchServerObjectReader multiObjectReader; private OsmServerObjectReader objectReader; Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java (revision 9078) @@ -42,10 +42,10 @@ public class UploadLayerTask extends AbstractIOTask implements Runnable { private OsmServerWriter writer; - private OsmDataLayer layer; - private ProgressMonitor monitor; - private Changeset changeset; + private final OsmDataLayer layer; + private final ProgressMonitor monitor; + private final Changeset changeset; private Collection toUpload; - private Set processedPrimitives; - private UploadStrategySpecification strategy; + private final Set processedPrimitives; + private final UploadStrategySpecification strategy; /** Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (revision 9078) @@ -45,10 +45,10 @@ private boolean uploadCanceled; private Exception lastException; - private APIDataSet toUpload; + private final APIDataSet toUpload; private OsmServerWriter writer; - private OsmDataLayer layer; + private final OsmDataLayer layer; private Changeset changeset; - private Set processedPrimitives; - private UploadStrategySpecification strategy; + private final Set processedPrimitives; + private final UploadStrategySpecification strategy; /** Index: /trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (revision 9078) @@ -124,5 +124,5 @@ private boolean needRedraw; - private AttributionSupport attribution = new AttributionSupport(); + private final AttributionSupport attribution = new AttributionSupport(); // needed public access for session exporter @@ -481,5 +481,5 @@ private class BooleanButtonModel extends DefaultButtonModel { - private Field field; + private final Field field; BooleanButtonModel(Field field) { @@ -1627,5 +1627,5 @@ private final ProgressMonitor progressMonitor; private int totalCount; - private AtomicInteger processedCount = new AtomicInteger(0); + private final AtomicInteger processedCount = new AtomicInteger(0); private final TileLoader tileLoader; Index: /trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java (revision 9078) @@ -175,5 +175,5 @@ class ApplyOffsetAction extends AbstractAction { - private transient OffsetBookmark b; + private final transient OffsetBookmark b; ApplyOffsetAction(OffsetBookmark b) { @@ -261,6 +261,8 @@ private double gamma = 1; final short[] gammaChange = new short[256]; - private LookupOp op3 = new LookupOp(new ShortLookupTable(0, new short[][]{gammaChange, gammaChange, gammaChange}), null); - private LookupOp op4 = new LookupOp(new ShortLookupTable(0, new short[][]{gammaChange, gammaChange, gammaChange, gammaChange}), null); + private final LookupOp op3 = new LookupOp( + new ShortLookupTable(0, new short[][]{gammaChange, gammaChange, gammaChange}), null); + private final LookupOp op4 = new LookupOp( + new ShortLookupTable(0, new short[][]{gammaChange, gammaChange, gammaChange, gammaChange}), null); /** Index: /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 9078) @@ -232,5 +232,5 @@ * the collection of conflicts detected in this layer */ - private ConflictCollection conflicts; + private final ConflictCollection conflicts; /** Index: /trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java (revision 9078) @@ -49,5 +49,5 @@ private static final String CACHE_REGION_NAME = "WMS"; - private Set supportedProjections; + private final Set supportedProjections; /** Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 9078) @@ -92,5 +92,5 @@ private static List loadedGpxData = new ArrayList<>(); - private transient GeoImageLayer yLayer; + private final transient GeoImageLayer yLayer; private double timezone; private long delta; @@ -209,7 +209,7 @@ private static class GpxDataWrapper { - private String name; - private GpxData data; - private File file; + private final String name; + private final GpxData data; + private final File file; GpxDataWrapper(String name, GpxData data, File file) { @@ -226,5 +226,5 @@ private ExtendedDialog syncDialog; - private transient List gpxLst = new ArrayList<>(); + private final transient List gpxLst = new ArrayList<>(); private JPanel outerPanel; private JosmComboBox cbGpx; @@ -773,9 +773,9 @@ } - private transient StatusBarUpdater statusBarUpdater = new StatusBarUpdater(false); - private transient StatusBarUpdater statusBarUpdaterWithRepaint = new StatusBarUpdater(true); + private final transient StatusBarUpdater statusBarUpdater = new StatusBarUpdater(false); + private final transient StatusBarUpdater statusBarUpdaterWithRepaint = new StatusBarUpdater(true); private class StatusBarUpdater implements DocumentListener, ItemListener, ActionListener { - private boolean doRepaint; + private final boolean doRepaint; StatusBarUpdater(boolean doRepaint) { @@ -850,5 +850,5 @@ } - private transient RepaintTheMapListener repaintTheMap = new RepaintTheMapListener(); + private final transient RepaintTheMapListener repaintTheMap = new RepaintTheMapListener(); private class RepaintTheMapListener implements FocusListener { Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 9078) @@ -88,11 +88,11 @@ GpxLayer gpxLayer; - private Icon icon = ImageProvider.get("dialogs/geoimage/photo-marker"); - private Icon selectedIcon = ImageProvider.get("dialogs/geoimage/photo-marker-selected"); + private final Icon icon = ImageProvider.get("dialogs/geoimage/photo-marker"); + private final Icon selectedIcon = ImageProvider.get("dialogs/geoimage/photo-marker-selected"); private int currentPhoto = -1; boolean useThumbs; - private ExecutorService thumbsLoaderExecutor = + private final ExecutorService thumbsLoaderExecutor = Executors.newSingleThreadExecutor(Utils.newThreadFactory("thumbnail-loader-%d", Thread.MIN_PRIORITY)); private ThumbsLoader thumbsloader; @@ -111,8 +111,8 @@ private boolean canceled; private GeoImageLayer layer; - private Collection selection; - private Set loadedDirectories = new HashSet<>(); - private Set errorMessages; - private GpxLayer gpxLayer; + private final Collection selection; + private final Set loadedDirectories = new HashSet<>(); + private final Set errorMessages; + private final GpxLayer gpxLayer; protected void rememberError(String message) { Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (revision 9078) @@ -49,5 +49,5 @@ /** The tracker to load the images */ - private MediaTracker tracker = new MediaTracker(this); + private final MediaTracker tracker = new MediaTracker(this); private String osdText; @@ -59,6 +59,6 @@ private class LoadImageRunnable implements Runnable { - private File file; - private int orientation; + private final File file; + private final int orientation; LoadImageRunnable(File file, Integer orientation) { Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (revision 9078) @@ -45,5 +45,5 @@ private static final String COMMAND_COPY_PATH = "copypath"; - private ImageDisplay imgDisplay = new ImageDisplay(); + private final ImageDisplay imgDisplay = new ImageDisplay(); private boolean centerView; Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java (revision 9078) @@ -27,9 +27,9 @@ public static final int minSize = 22; public volatile boolean stop; - private List data; - private GeoImageLayer layer; + private final List data; + private final GeoImageLayer layer; private MediaTracker tracker; private ICacheAccess cache; - private boolean cacheOff = Main.pref.getBoolean("geoimage.noThumbnailCache", false); + private final boolean cacheOff = Main.pref.getBoolean("geoimage.noThumbnailCache", false); public ThumbsLoader(GeoImageLayer layer) { Index: /trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java (revision 9078) @@ -67,5 +67,5 @@ */ private static final class TrackLength { - private double value; + private final double value; /** Index: /trunk/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java (revision 9078) @@ -23,8 +23,8 @@ public class DateFilterPanel extends JPanel { - private DateEditorWithSlider dateFrom = new DateEditorWithSlider(tr("From")); - private DateEditorWithSlider dateTo = new DateEditorWithSlider(tr("To")); - private JCheckBox noTimestampCb = new JCheckBox(tr("No timestamp")); - private transient GpxLayer layer; + private final DateEditorWithSlider dateFrom = new DateEditorWithSlider(tr("From")); + private final DateEditorWithSlider dateTo = new DateEditorWithSlider(tr("To")); + private final JCheckBox noTimestampCb = new JCheckBox(tr("No timestamp")); + private final transient GpxLayer layer; private transient ActionListener filterAppliedListener; @@ -67,5 +67,5 @@ } - private transient ChangeListener changeListener = new ChangeListener() { + private final transient ChangeListener changeListener = new ChangeListener() { @Override public void stateChanged(ChangeEvent e) { if (isEnabled()) applyFilterWithDelay(); @@ -73,5 +73,5 @@ }; - private Timer t = new Timer(200, new ActionListener() { + private final Timer t = new Timer(200, new ActionListener() { @Override public void actionPerformed(ActionEvent e) { applyFilter(); Index: /trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java (revision 9078) @@ -101,8 +101,8 @@ class CalculateDownloadArea extends PleaseWaitRunnable { - private Area a = new Area(); + private final Area a = new Area(); private boolean cancel; private int ticks; - private Rectangle2D r = new Rectangle2D.Double(); + private final Rectangle2D r = new Rectangle2D.Double(); CalculateDownloadArea() { Index: /trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java (revision 9078) @@ -28,5 +28,5 @@ */ public class GpxDrawHelper { - private GpxData data; + private final GpxData data; // draw lines between points belonging to different segments Index: /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java (revision 9078) @@ -22,5 +22,5 @@ public class AudioMarker extends ButtonMarker { - private URL audioUrl; + private final URL audioUrl; private static volatile AudioMarker recentlyPlayedMarker; public double syncOffset; Index: /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java (revision 9078) @@ -24,5 +24,5 @@ public class ButtonMarker extends Marker { - private Rectangle buttonRectangle; + private final Rectangle buttonRectangle; public ButtonMarker(LatLon ll, String buttonImage, MarkerLayer parentLayer, double time, double offset) { Index: /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (revision 9078) @@ -139,5 +139,5 @@ } - private TemplateEntryProperty parent; + private final TemplateEntryProperty parent; private TemplateEntryProperty(String key, String defaultValue, TemplateEntryProperty parent) { Index: /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java (revision 9078) @@ -40,5 +40,5 @@ private MapMode oldMode; private LatLon oldCoor; - private boolean enabled; + private final boolean enabled; private boolean wasPlaying; private int dropTolerance; /* pixels */ Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java (revision 9078) @@ -26,6 +26,6 @@ public static class BoxProviderResult { - private Rectangle box; - private boolean temporary; + private final Rectangle box; + private final boolean temporary; public BoxProviderResult(Rectangle box, boolean temporary) { @@ -52,5 +52,5 @@ public static class SimpleBoxProvider implements BoxProvider { - private Rectangle box; + private final Rectangle box; /** Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (revision 9078) @@ -24,5 +24,5 @@ public class ElemStyles { - private List styleSources; + private final List styleSources; private boolean drawMultipolygon; Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java (revision 9078) @@ -48,5 +48,5 @@ public static class StaticLabelCompositionStrategy extends LabelCompositionStrategy { - private String defaultLabel; + private final String defaultLabel; public StaticLabelCompositionStrategy(String defaultLabel) { @@ -96,5 +96,5 @@ public static class TagLookupCompositionStrategy extends LabelCompositionStrategy { - private String defaultLabelTag; + private final String defaultLabelTag; public TagLookupCompositionStrategy(String defaultLabelTag) { Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/LineTextElemStyle.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/LineTextElemStyle.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/LineTextElemStyle.java (revision 9078) @@ -12,5 +12,5 @@ public class LineTextElemStyle extends ElemStyle { - private TextElement text; + private final TextElement text; protected LineTextElemStyle(Cascade c, TextElement text) { Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java (revision 9078) @@ -31,5 +31,5 @@ private transient StyleSource style; - private JCheckBoxMenuItem button; + private final JCheckBoxMenuItem button; MapPaintAction(StyleSource style) { Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (revision 9078) @@ -343,5 +343,5 @@ public static class MapPaintStyleLoader extends PleaseWaitRunnable { private boolean canceled; - private Collection sources; + private final Collection sources; public MapPaintStyleLoader(Collection sources) { Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/MultiCascade.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/MultiCascade.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/MultiCascade.java (revision 9078) @@ -16,5 +16,5 @@ public class MultiCascade implements StyleKeys { - private Map layers; + private final Map layers; public Range range; Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java (revision 9078) @@ -47,5 +47,5 @@ */ public static class StyleList implements Iterable { - private List lst; + private final List lst; /** Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java (revision 9078) @@ -33,5 +33,5 @@ public abstract class StyleSource extends SourceEntry { - private List errors = new ArrayList<>(); + private final List errors = new ArrayList<>(); public File zipIcons; Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java (revision 9078) @@ -967,5 +967,5 @@ public static class CondOperator implements Expression { - private Expression condition, firstOption, secondOption; + private final Expression condition, firstOption, secondOption; /** @@ -996,5 +996,5 @@ public static class AndOperator implements Expression { - private List args; + private final List args; /** @@ -1023,5 +1023,5 @@ public static class OrOperator implements Expression { - private List args; + private final List args; /** @@ -1055,5 +1055,5 @@ public static class LengthFunction implements Expression { - private Expression arg; + private final Expression arg; /** Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (revision 9078) @@ -122,5 +122,5 @@ */ private class MatchingReferrerFinder extends AbstractVisitor { - private Environment e; + private final Environment e; /** Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSourceHandler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSourceHandler.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSourceHandler.java (revision 9078) @@ -17,16 +17,16 @@ private boolean inDoc, inRule, inCondition, inLine, inLineMod, inIcon, inArea, inScaleMax, inScaleMin; private boolean hadLine, hadLineMod, hadIcon, hadArea; - private RuleElem rule = new RuleElem(); - - private XmlStyleSource style; + private final RuleElem rule = new RuleElem(); + + private final XmlStyleSource style; static class RuleElem { - private XmlCondition cond = new XmlCondition(); + private final XmlCondition cond = new XmlCondition(); private Collection conditions; private double scaleMax; private double scaleMin; - private LinePrototype line = new LinePrototype(); - private LinemodPrototype linemod = new LinemodPrototype(); - private AreaPrototype area = new AreaPrototype(); + private final LinePrototype line = new LinePrototype(); + private final LinemodPrototype linemod = new LinemodPrototype(); + private final AreaPrototype area = new AreaPrototype(); private IconPrototype icon = new IconPrototype(); public void init() { Index: /trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java (revision 9078) @@ -28,8 +28,8 @@ private boolean canceled; private OAuthToken accessToken; - private OAuthParameters parameters; + private final OAuthParameters parameters; private OsmOAuthAuthorizationClient client; - private OAuthToken requestToken; - private Component parent; + private final OAuthToken requestToken; + private final Component parent; /** Index: /trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java (revision 9078) @@ -27,7 +27,7 @@ private boolean canceled; private OAuthToken requestToken; - private OAuthParameters parameters; + private final OAuthParameters parameters; private OsmOAuthAuthorizationClient client; - private Component parent; + private final Component parent; /** Index: /trunk/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java (revision 9078) @@ -12,7 +12,4 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; - -import oauth.signpost.OAuthConsumer; -import oauth.signpost.exception.OAuthException; import org.openstreetmap.josm.Main; @@ -33,4 +30,7 @@ import org.xml.sax.SAXException; +import oauth.signpost.OAuthConsumer; +import oauth.signpost.exception.OAuthException; + /** * Checks whether an OSM API server can be accessed with a specific Access Token. @@ -41,9 +41,9 @@ */ public class TestAccessTokenTask extends PleaseWaitRunnable { - private OAuthToken token; - private OAuthParameters oauthParameters; + private final OAuthToken token; + private final OAuthParameters oauthParameters; private boolean canceled; - private Component parent; - private String apiUrl; + private final Component parent; + private final String apiUrl; private HttpURLConnection connection; Index: /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (revision 9078) @@ -481,6 +481,6 @@ protected static class AvailableSourcesListModel extends DefaultListModel { - private transient List data; - private DefaultListSelectionModel selectionModel; + private final transient List data; + private final DefaultListSelectionModel selectionModel; public AvailableSourcesListModel(DefaultListSelectionModel selectionModel) { @@ -534,5 +534,5 @@ protected class ActiveSourcesModel extends AbstractTableModel { private transient List data; - private DefaultListSelectionModel selectionModel; + private final DefaultListSelectionModel selectionModel; public ActiveSourcesModel(DefaultListSelectionModel selectionModel) { @@ -764,6 +764,6 @@ protected class EditSourceEntryDialog extends ExtendedDialog { - private JosmTextField tfTitle; - private JosmTextField tfURL; + private final JosmTextField tfTitle; + private final JosmTextField tfURL; private JCheckBox cbActive; @@ -1091,6 +1091,6 @@ protected static class IconPathTableModel extends AbstractTableModel { - private List data; - private DefaultListSelectionModel selectionModel; + private final List data; + private final DefaultListSelectionModel selectionModel; public IconPathTableModel(DefaultListSelectionModel selectionModel) { @@ -1451,7 +1451,7 @@ class FileOrUrlCellEditor extends JPanel implements TableCellEditor { private JosmTextField tfFileName; - private CopyOnWriteArrayList listeners; + private final CopyOnWriteArrayList listeners; private String value; - private boolean isFile; + private final boolean isFile; /** Index: /trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (revision 9078) @@ -408,5 +408,5 @@ } - private JMenuItem remove = new JMenuItem(new AbstractAction(tr("Remove from toolbar")) { + private final JMenuItem remove = new JMenuItem(new AbstractAction(tr("Remove from toolbar")) { @Override public void actionPerformed(ActionEvent e) { @@ -422,5 +422,5 @@ }); - private JMenuItem configure = new JMenuItem(new AbstractAction(tr("Configure toolbar")) { + private final JMenuItem configure = new JMenuItem(new AbstractAction(tr("Configure toolbar")) { @Override public void actionPerformed(ActionEvent e) { @@ -431,5 +431,5 @@ }); - private JMenuItem shortcutEdit = new JMenuItem(new AbstractAction(tr("Edit shortcut")) { + private final JMenuItem shortcutEdit = new JMenuItem(new AbstractAction(tr("Edit shortcut")) { @Override public void actionPerformed(ActionEvent e) { @@ -443,5 +443,5 @@ }); - private JCheckBoxMenuItem doNotHide = new JCheckBoxMenuItem(new AbstractAction(tr("Do not hide toolbar and menu")) { + private final JCheckBoxMenuItem doNotHide = new JCheckBoxMenuItem(new AbstractAction(tr("Do not hide toolbar and menu")) { @Override public void actionPerformed(ActionEvent e) { @@ -474,5 +474,5 @@ } - private ToolbarPopupMenu popupMenu = new ToolbarPopupMenu(); + private final ToolbarPopupMenu popupMenu = new ToolbarPopupMenu(); /** Index: /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java (revision 9078) @@ -68,5 +68,5 @@ private List allData; - private List displayData = new ArrayList<>(); + private final List displayData = new ArrayList<>(); private JosmTextField txtFilter; private PreferencesTable table; @@ -277,5 +277,5 @@ } - private Comparator customComparator = new Comparator() { + private final Comparator customComparator = new Comparator() { @Override public int compare(PrefEntry o1, PrefEntry o2) { @@ -321,5 +321,5 @@ } - private Map profileTypes = new LinkedHashMap<>(); + private final Map profileTypes = new LinkedHashMap<>(); private JPopupMenu buildPopupMenu() { Index: /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListEditor.java (revision 9078) @@ -31,5 +31,5 @@ private List data; - private transient PrefEntry entry; + private final transient PrefEntry entry; /** Index: /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java (revision 9078) @@ -39,6 +39,6 @@ private EntryListModel entryModel; - private List> data; - private transient PrefEntry entry; + private final List> data; + private final transient PrefEntry entry; private JList entryList; Index: /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java (revision 9078) @@ -43,5 +43,5 @@ private EntryListModel entryModel; - private transient PrefEntry entry; + private final transient PrefEntry entry; private JList entryList; @@ -49,6 +49,6 @@ private MapTableModel tableModel; - private List> dataKeys; - private List> dataValues; + private final List> dataKeys; + private final List> dataValues; private Integer entryIdx; Index: /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PrefEntry.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PrefEntry.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PrefEntry.java (revision 9078) @@ -10,7 +10,7 @@ */ public class PrefEntry implements Comparable { - private String key; + private final String key; private Setting value; - private Setting defaultValue; + private final Setting defaultValue; private boolean isDefault; private boolean changed; Index: /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java (revision 9078) @@ -42,5 +42,5 @@ */ public class PreferencesTable extends JTable { - private AllSettingsTableModel model; + private final AllSettingsTableModel model; private final transient List displayData; @@ -298,10 +298,10 @@ private static class SettingCellRenderer extends DefaultTableCellRenderer { - private Color backgroundColor = Main.pref.getUIColor("Table.background"); - private Color changedColor = Main.pref.getColor( + private final Color backgroundColor = Main.pref.getUIColor("Table.background"); + private final Color changedColor = Main.pref.getColor( marktr("Advanced Background: Changed"), new Color(200, 255, 200)); - private Color foregroundColor = Main.pref.getUIColor("Table.foreground"); - private Color nonDefaultColor = Main.pref.getColor( + private final Color foregroundColor = Main.pref.getUIColor("Table.foreground"); + private final Color nonDefaultColor = Main.pref.getColor( marktr("Advanced Background: NonDefault"), new Color(255, 255, 200)); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/StringEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/StringEditor.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/StringEditor.java (revision 9078) @@ -20,5 +20,5 @@ public class StringEditor extends ExtendedDialog { - private transient PrefEntry entry; + private final transient PrefEntry entry; private JosmTextField tvalue; Index: /trunk/src/org/openstreetmap/josm/gui/preferences/audio/AudioPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/audio/AudioPreference.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/audio/AudioPreference.java (revision 9078) @@ -38,19 +38,19 @@ } - private JCheckBox audioMenuVisible = new JCheckBox(tr("Display the Audio menu.")); - private JCheckBox markerButtonLabels = new JCheckBox(tr("Label audio (and image and web) markers.")); - private JCheckBox markerAudioTraceVisible = new JCheckBox(tr("Display live audio trace.")); + private final JCheckBox audioMenuVisible = new JCheckBox(tr("Display the Audio menu.")); + private final JCheckBox markerButtonLabels = new JCheckBox(tr("Label audio (and image and web) markers.")); + private final JCheckBox markerAudioTraceVisible = new JCheckBox(tr("Display live audio trace.")); // various methods of making markers on import audio - private JCheckBox audioMarkersFromExplicitWaypoints = new JCheckBox(tr("Explicit waypoints with valid timestamps.")); - private JCheckBox audioMarkersFromUntimedWaypoints = new JCheckBox(tr("Explicit waypoints with time estimated from track position.")); - private JCheckBox audioMarkersFromNamedTrackpoints = new JCheckBox(tr("Named trackpoints.")); - private JCheckBox audioMarkersFromWavTimestamps = new JCheckBox(tr("Modified times (time stamps) of audio files.")); - private JCheckBox audioMarkersFromStart = new JCheckBox(tr("Start of track (will always do this if no other markers available).")); + private final JCheckBox audioMarkersFromExplicitWaypoints = new JCheckBox(tr("Explicit waypoints with valid timestamps.")); + private final JCheckBox audioMarkersFromUntimedWaypoints = new JCheckBox(tr("Explicit waypoints with time estimated from track position.")); + private final JCheckBox audioMarkersFromNamedTrackpoints = new JCheckBox(tr("Named trackpoints.")); + private final JCheckBox audioMarkersFromWavTimestamps = new JCheckBox(tr("Modified times (time stamps) of audio files.")); + private final JCheckBox audioMarkersFromStart = new JCheckBox(tr("Start of track (will always do this if no other markers available).")); - private JosmTextField audioLeadIn = new JosmTextField(8); - private JosmTextField audioForwardBackAmount = new JosmTextField(8); - private JosmTextField audioFastForwardMultiplier = new JosmTextField(8); - private JosmTextField audioCalibration = new JosmTextField(8); + private final JosmTextField audioLeadIn = new JosmTextField(8); + private final JosmTextField audioForwardBackAmount = new JosmTextField(8); + private final JosmTextField audioFastForwardMultiplier = new JosmTextField(8); + private final JosmTextField audioCalibration = new JosmTextField(8); @Override Index: /trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java (revision 9078) @@ -67,5 +67,5 @@ private DefaultTableModel tableModel; private JTable colors; - private List del = new ArrayList<>(); + private final List del = new ArrayList<>(); private JButton colorEdit; Index: /trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java (revision 9078) @@ -40,19 +40,19 @@ private GPXSettingsPanel gpxPanel; - private JCheckBox directionHint = new JCheckBox(tr("Draw Direction Arrows")); - private JCheckBox headArrow = new JCheckBox(tr("Only on the head of a way.")); - private JCheckBox onewayArrow = new JCheckBox(tr("Draw oneway arrows.")); - private JCheckBox segmentOrderNumber = new JCheckBox(tr("Draw segment order numbers")); - private JCheckBox sourceBounds = new JCheckBox(tr("Draw boundaries of downloaded data")); - private JCheckBox virtualNodes = new JCheckBox(tr("Draw virtual nodes in select mode")); - private JCheckBox inactive = new JCheckBox(tr("Draw inactive layers in other color")); - private JCheckBox discardableKeys = new JCheckBox(tr("Display discardable keys")); + private final JCheckBox directionHint = new JCheckBox(tr("Draw Direction Arrows")); + private final JCheckBox headArrow = new JCheckBox(tr("Only on the head of a way.")); + private final JCheckBox onewayArrow = new JCheckBox(tr("Draw oneway arrows.")); + private final JCheckBox segmentOrderNumber = new JCheckBox(tr("Draw segment order numbers")); + private final JCheckBox sourceBounds = new JCheckBox(tr("Draw boundaries of downloaded data")); + private final JCheckBox virtualNodes = new JCheckBox(tr("Draw virtual nodes in select mode")); + private final JCheckBox inactive = new JCheckBox(tr("Draw inactive layers in other color")); + private final JCheckBox discardableKeys = new JCheckBox(tr("Display discardable keys")); // Options that affect performance - private JCheckBox useHighlighting = new JCheckBox(tr("Highlight target ways and nodes")); - private JCheckBox drawHelperLine = new JCheckBox(tr("Draw rubber-band helper line")); - private JCheckBox useAntialiasing = new JCheckBox(tr("Smooth map graphics (antialiasing)")); - private JCheckBox useWireframeAntialiasing = new JCheckBox(tr("Smooth map graphics in wireframe mode (antialiasing)")); - private JCheckBox outlineOnly = new JCheckBox(tr("Draw only outlines of areas")); + private final JCheckBox useHighlighting = new JCheckBox(tr("Highlight target ways and nodes")); + private final JCheckBox drawHelperLine = new JCheckBox(tr("Draw rubber-band helper line")); + private final JCheckBox useAntialiasing = new JCheckBox(tr("Smooth map graphics (antialiasing)")); + private final JCheckBox useWireframeAntialiasing = new JCheckBox(tr("Smooth map graphics in wireframe mode (antialiasing)")); + private final JCheckBox outlineOnly = new JCheckBox(tr("Draw only outlines of areas")); @Override Index: /trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java (revision 9078) @@ -44,32 +44,32 @@ - private JRadioButton drawRawGpsLinesGlobal = new JRadioButton(tr("Use global settings")); - private JRadioButton drawRawGpsLinesAll = new JRadioButton(tr("All")); - private JRadioButton drawRawGpsLinesLocal = new JRadioButton(tr("Local files")); - private JRadioButton drawRawGpsLinesNone = new JRadioButton(tr("None")); + private final JRadioButton drawRawGpsLinesGlobal = new JRadioButton(tr("Use global settings")); + private final JRadioButton drawRawGpsLinesAll = new JRadioButton(tr("All")); + private final JRadioButton drawRawGpsLinesLocal = new JRadioButton(tr("Local files")); + private final JRadioButton drawRawGpsLinesNone = new JRadioButton(tr("None")); private transient ActionListener drawRawGpsLinesActionListener; - private JosmTextField drawRawGpsMaxLineLength = new JosmTextField(8); - private JosmTextField drawRawGpsMaxLineLengthLocal = new JosmTextField(8); - private JosmTextField drawLineWidth = new JosmTextField(2); - private JCheckBox forceRawGpsLines = new JCheckBox(tr("Force lines if no segments imported")); - private JCheckBox largeGpsPoints = new JCheckBox(tr("Draw large GPS points")); - private JCheckBox hdopCircleGpsPoints = new JCheckBox(tr("Draw a circle from HDOP value")); - private JRadioButton colorTypeVelocity = new JRadioButton(tr("Velocity (red = slow, green = fast)")); - private JRadioButton colorTypeDirection = new JRadioButton(tr("Direction (red = west, yellow = north, green = east, blue = south)")); - private JRadioButton colorTypeDilution = new JRadioButton(tr("Dilution of Position (red = high, green = low, if available)")); - private JRadioButton colorTypeTime = new JRadioButton(tr("Track date")); - private JRadioButton colorTypeNone = new JRadioButton(tr("Single Color (can be customized for named layers)")); - private JRadioButton colorTypeGlobal = new JRadioButton(tr("Use global settings")); - private JosmComboBox colorTypeVelocityTune = new JosmComboBox<>(new String[] {tr("Car"), tr("Bicycle"), tr("Foot")}); - private JCheckBox makeAutoMarkers = new JCheckBox(tr("Create markers when reading GPX")); - private JCheckBox drawGpsArrows = new JCheckBox(tr("Draw Direction Arrows")); - private JCheckBox drawGpsArrowsFast = new JCheckBox(tr("Fast drawing (looks uglier)")); - private JosmTextField drawGpsArrowsMinDist = new JosmTextField(8); - private JCheckBox colorDynamic = new JCheckBox(tr("Dynamic color range based on data limits")); - private JosmComboBox waypointLabel = new JosmComboBox<>(LABEL_PATTERN_DESC); - private JosmTextField waypointLabelPattern = new JosmTextField(); - private JosmComboBox audioWaypointLabel = new JosmComboBox<>(LABEL_PATTERN_DESC); - private JosmTextField audioWaypointLabelPattern = new JosmTextField(); - private JCheckBox useGpsAntialiasing = new JCheckBox(tr("Smooth GPX graphics (antialiasing)")); + private final JosmTextField drawRawGpsMaxLineLength = new JosmTextField(8); + private final JosmTextField drawRawGpsMaxLineLengthLocal = new JosmTextField(8); + private final JosmTextField drawLineWidth = new JosmTextField(2); + private final JCheckBox forceRawGpsLines = new JCheckBox(tr("Force lines if no segments imported")); + private final JCheckBox largeGpsPoints = new JCheckBox(tr("Draw large GPS points")); + private final JCheckBox hdopCircleGpsPoints = new JCheckBox(tr("Draw a circle from HDOP value")); + private final JRadioButton colorTypeVelocity = new JRadioButton(tr("Velocity (red = slow, green = fast)")); + private final JRadioButton colorTypeDirection = new JRadioButton(tr("Direction (red = west, yellow = north, green = east, blue = south)")); + private final JRadioButton colorTypeDilution = new JRadioButton(tr("Dilution of Position (red = high, green = low, if available)")); + private final JRadioButton colorTypeTime = new JRadioButton(tr("Track date")); + private final JRadioButton colorTypeNone = new JRadioButton(tr("Single Color (can be customized for named layers)")); + private final JRadioButton colorTypeGlobal = new JRadioButton(tr("Use global settings")); + private final JosmComboBox colorTypeVelocityTune = new JosmComboBox<>(new String[] {tr("Car"), tr("Bicycle"), tr("Foot")}); + private final JCheckBox makeAutoMarkers = new JCheckBox(tr("Create markers when reading GPX")); + private final JCheckBox drawGpsArrows = new JCheckBox(tr("Draw Direction Arrows")); + private final JCheckBox drawGpsArrowsFast = new JCheckBox(tr("Fast drawing (looks uglier)")); + private final JosmTextField drawGpsArrowsMinDist = new JosmTextField(8); + private final JCheckBox colorDynamic = new JCheckBox(tr("Dynamic color range based on data limits")); + private final JosmComboBox waypointLabel = new JosmComboBox<>(LABEL_PATTERN_DESC); + private final JosmTextField waypointLabelPattern = new JosmTextField(); + private final JosmComboBox audioWaypointLabel = new JosmComboBox<>(LABEL_PATTERN_DESC); + private final JosmTextField audioWaypointLabelPattern = new JosmTextField(); + private final JCheckBox useGpsAntialiasing = new JCheckBox(tr("Smooth GPX graphics (antialiasing)")); private String layerName; Index: /trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java (revision 9078) @@ -55,11 +55,11 @@ private JosmComboBox lafCombo; JPanel panel; - private JCheckBox showSplashScreen = new JCheckBox(tr("Show splash screen at startup")); - private JCheckBox showID = new JCheckBox(tr("Show object ID in selection lists")); - private JCheckBox showLocalizedName = new JCheckBox(tr("Show localized name in selection lists")); - private JCheckBox modeless = new JCheckBox(tr("Modeless working (Potlatch style)")); - private JCheckBox dynamicButtons = new JCheckBox(tr("Dynamic buttons in side menus")); - private JCheckBox isoDates = new JCheckBox(tr("Display ISO dates")); - private JCheckBox nativeFileChoosers = new JCheckBox(tr("Use native file choosers (nicer, but do not support file filters)")); + private final JCheckBox showSplashScreen = new JCheckBox(tr("Show splash screen at startup")); + private final JCheckBox showID = new JCheckBox(tr("Show object ID in selection lists")); + private final JCheckBox showLocalizedName = new JCheckBox(tr("Show localized name in selection lists")); + private final JCheckBox modeless = new JCheckBox(tr("Modeless working (Potlatch style)")); + private final JCheckBox dynamicButtons = new JCheckBox(tr("Dynamic buttons in side menus")); + private final JCheckBox isoDates = new JCheckBox(tr("Display ISO dates")); + private final JCheckBox nativeFileChoosers = new JCheckBox(tr("Use native file choosers (nicer, but do not support file filters)")); @Override Index: /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CacheContentsPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CacheContentsPanel.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CacheContentsPanel.java (revision 9078) @@ -68,5 +68,5 @@ private final Action action; private final JButton renderButton; - private JButton editButton; + private final JButton editButton; private Object editorValue; Index: /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (revision 9078) @@ -237,5 +237,5 @@ private static class ImageryURLTableCellRenderer extends DefaultTableCellRenderer { - private transient List layers; + private final transient List layers; ImageryURLTableCellRenderer(List layers) { @@ -807,6 +807,6 @@ static class OffsetBookmarksPanel extends JPanel { - private transient List bookmarks = OffsetBookmark.allBookmarks; - private OffsetsBookmarksModel model = new OffsetsBookmarksModel(); + private final transient List bookmarks = OffsetBookmark.allBookmarks; + private final OffsetsBookmarksModel model = new OffsetsBookmarksModel(); /** Index: /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java (revision 9078) @@ -33,5 +33,5 @@ private final Map selectedPluginsMap = new HashMap<>(); // plugins that still require an update/download - private Set pendingDownloads = new HashSet<>(); + private final Set pendingDownloads = new HashSet<>(); /** Index: /trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java (revision 9078) @@ -50,9 +50,9 @@ private ProjectionCodeListModel model; public JList selectionList; - private List data; - private List filteredData; + private final List data; + private final List filteredData; private static final String DEFAULT_CODE = "EPSG:3857"; private String lastCode = DEFAULT_CODE; - private transient ActionListener listener; + private final transient ActionListener listener; CodeSelectionPanel(String initialCode, ActionListener listener) { Index: /trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java (revision 9078) @@ -272,13 +272,13 @@ */ private JPanel projSubPrefPanel; - private JPanel projSubPrefPanelWrapper = new JPanel(new GridBagLayout()); + private final JPanel projSubPrefPanelWrapper = new JPanel(new GridBagLayout()); private JLabel projectionCodeLabel; private Component projectionCodeGlue; - private JLabel projectionCode = new JLabel(); + private final JLabel projectionCode = new JLabel(); private JLabel projectionNameLabel; private Component projectionNameGlue; - private JLabel projectionName = new JLabel(); - private JLabel bounds = new JLabel(); + private final JLabel projectionName = new JLabel(); + private final JLabel bounds = new JLabel(); /** Index: /trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (revision 9078) @@ -55,5 +55,5 @@ // table of shortcuts - private AbstractTableModel model; + private final AbstractTableModel model; // this are the display(!) texts for the checkboxes. Let the JVM do the i18n for us . // Ok, there's a real reason for this: The JVM should know best how the keys are labelled @@ -95,15 +95,15 @@ } - private JCheckBox cbAlt = new JCheckBox(); - private JCheckBox cbCtrl = new JCheckBox(); - private JCheckBox cbMeta = new JCheckBox(); - private JCheckBox cbShift = new JCheckBox(); - private JCheckBox cbDefault = new JCheckBox(); - private JCheckBox cbDisable = new JCheckBox(); - private JosmComboBox tfKey = new JosmComboBox<>(); - - private JTable shortcutTable = new JTable(); - - private JosmTextField filterField = new JosmTextField(); + private final JCheckBox cbAlt = new JCheckBox(); + private final JCheckBox cbCtrl = new JCheckBox(); + private final JCheckBox cbMeta = new JCheckBox(); + private final JCheckBox cbShift = new JCheckBox(); + private final JCheckBox cbDefault = new JCheckBox(); + private final JCheckBox cbDisable = new JCheckBox(); + private final JosmComboBox tfKey = new JosmComboBox<>(); + + private final JTable shortcutTable = new JTable(); + + private final JosmTextField filterField = new JosmTextField(); /** Creates new form prefJPanel */ @@ -123,5 +123,5 @@ private static class ScListModel extends AbstractTableModel { private final String[] columnNames = new String[]{tr("Action"), tr("Shortcut")}; - private transient List data; + private final transient List data; /** @@ -155,5 +155,5 @@ private class ShortcutTableCellRenderer extends DefaultTableCellRenderer { - private boolean name; + private final boolean name; ShortcutTableCellRenderer(boolean name) { @@ -286,5 +286,5 @@ // more expirience with GUI coding than I have. private class CbAction extends AbstractAction implements ListSelectionListener { - private PrefJPanel panel; + private final PrefJPanel panel; CbAction(PrefJPanel panel) { Index: /trunk/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java (revision 9078) @@ -44,5 +44,5 @@ private boolean intermediateTask; - private Queue requests = new LinkedList<>(); + private final Queue requests = new LinkedList<>(); private AbstractProgressMonitor currentChild; private Request requestedState = new Request(); Index: /trunk/src/org/openstreetmap/josm/gui/progress/CancelHandler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/progress/CancelHandler.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/progress/CancelHandler.java (revision 9078) @@ -10,5 +10,5 @@ private boolean isCanceled; - private List listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(); public synchronized void cancel() { Index: /trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java (revision 9078) @@ -135,5 +135,5 @@ } - private ActionListener cancelListener = new ActionListener() { + private final ActionListener cancelListener = new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -142,5 +142,5 @@ }; - private ActionListener inBackgroundListener = new ActionListener() { + private final ActionListener inBackgroundListener = new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -154,5 +154,5 @@ }; - private WindowListener windowListener = new WindowAdapter() { + private final WindowListener windowListener = new WindowAdapter() { @Override public void windowClosing(WindowEvent e) { cancel(); Index: /trunk/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java (revision 9078) @@ -17,5 +17,5 @@ private static final int PROGRESS_BAR_MAX = 100; private int currentProgressValue; - private ProgressRenderer delegate; + private final ProgressRenderer delegate; /** Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java (revision 9078) @@ -20,6 +20,6 @@ */ public class TagCellRenderer extends JLabel implements TableCellRenderer { - private Font fontStandard; - private Font fontItalic; + private final Font fontStandard; + private final Font fontItalic; /** Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java (revision 9078) @@ -41,6 +41,6 @@ private final PropertyChangeSupport propChangeSupport = new PropertyChangeSupport(this); - private DefaultListSelectionModel rowSelectionModel; - private DefaultListSelectionModel colSelectionModel; + private final DefaultListSelectionModel rowSelectionModel; + private final DefaultListSelectionModel colSelectionModel; /** @@ -609,8 +609,8 @@ class SelectionStateMemento { - private int rowMin; - private int rowMax; - private int colMin; - private int colMax; + private final int rowMin; + private final int rowMax; + private final int colMin; + private final int colMax; SelectionStateMemento() { Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java (revision 9078) @@ -615,5 +615,5 @@ */ class CellEditorRemover implements PropertyChangeListener { - private KeyboardFocusManager focusManager; + private final KeyboardFocusManager focusManager; CellEditorRemover(KeyboardFocusManager fm) { Index: /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java (revision 9078) @@ -33,11 +33,11 @@ /** the bare list of AutoCompletionItems */ - private transient List list; + private final transient List list; /** the filtered list of AutoCompletionItems */ - private transient ArrayList filtered; + private final transient ArrayList filtered; /** the filter expression */ private String filter; /** map from value to priority */ - private transient Map valutToItemMap; + private final transient Map valutToItemMap; /** Index: /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSearchDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSearchDialog.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSearchDialog.java (revision 9078) @@ -19,5 +19,5 @@ private static TaggingPresetSearchDialog instance; - private TaggingPresetSelector selector; + private final TaggingPresetSelector selector; /** Index: /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSearchPrimitiveDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSearchPrimitiveDialog.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSearchPrimitiveDialog.java (revision 9078) @@ -25,5 +25,5 @@ private static TaggingPresetSearchPrimitiveDialog instance; - private TaggingPresetSelector selector; + private final TaggingPresetSelector selector; /** Index: /trunk/src/org/openstreetmap/josm/gui/widgets/ComboBoxHistory.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/widgets/ComboBoxHistory.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/widgets/ComboBoxHistory.java (revision 9078) @@ -12,7 +12,7 @@ public class ComboBoxHistory extends DefaultComboBoxModel implements Iterable { - private int maxSize = 10; + private final int maxSize; - private transient List listeners = new ArrayList<>(); + private final transient List listeners = new ArrayList<>(); public ComboBoxHistory(int size) { Index: /trunk/src/org/openstreetmap/josm/gui/widgets/DateEditorWithSlider.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/widgets/DateEditorWithSlider.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/widgets/DateEditorWithSlider.java (revision 9078) @@ -28,6 +28,6 @@ */ public class DateEditorWithSlider extends JPanel { - private JSpinner spinner; - private JSlider slider; + private final JSpinner spinner; + private final JSlider slider; private Date dateMin; private Date dateMax; @@ -35,5 +35,5 @@ private boolean watchSlider = true; - private transient List listeners = new ArrayList<>(); + private final transient List listeners = new ArrayList<>(); /** Index: /trunk/src/org/openstreetmap/josm/gui/widgets/HistoryComboBox.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/widgets/HistoryComboBox.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/widgets/HistoryComboBox.java (revision 9078) @@ -10,5 +10,5 @@ public class HistoryComboBox extends AutoCompletingComboBox { - private ComboBoxHistory model; + private final ComboBoxHistory model; public static final int DEFAULT_SEARCH_HISTORY_SIZE = 15; Index: /trunk/src/org/openstreetmap/josm/gui/widgets/ImageLabel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/widgets/ImageLabel.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/widgets/ImageLabel.java (revision 9078) @@ -18,6 +18,6 @@ */ public class ImageLabel extends JPanel { - private JLabel tf; - private int charCount; + private final JLabel tf; + private final int charCount; /** Index: /trunk/src/org/openstreetmap/josm/gui/widgets/ListPopupMenu.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/widgets/ListPopupMenu.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/gui/widgets/ListPopupMenu.java (revision 9078) @@ -14,5 +14,5 @@ public class ListPopupMenu extends JPopupMenu { - private JList[] lists; + private final JList[] lists; public ListPopupMenu(JList ... lists) { Index: /trunk/src/org/openstreetmap/josm/io/CachedFile.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/CachedFile.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/io/CachedFile.java (revision 9078) @@ -75,5 +75,5 @@ public static final long DAYS = 24*60*60; // factor to get caching time in days - private Map httpHeaders = new ConcurrentHashMap<>(); + private final Map httpHeaders = new ConcurrentHashMap<>(); /** Index: /trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java (revision 9078) @@ -65,5 +65,5 @@ private InetSocketAddress httpProxySocketAddress; private InetSocketAddress socksProxySocketAddress; - private ProxySelector delegate; + private final ProxySelector delegate; private final Set errorResources = new HashSet<>(); Index: /trunk/src/org/openstreetmap/josm/io/DiffResultProcessor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/DiffResultProcessor.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/io/DiffResultProcessor.java (revision 9078) @@ -43,13 +43,13 @@ * replied by the server */ - private Map diffResults = new HashMap<>(); + private final Map diffResults = new HashMap<>(); /** * the set of processed primitives *after* the new id, the new version and the new changeset id is set */ - private Set processed; + private final Set processed; /** * the collection of primitives being uploaded */ - private Collection primitives; + private final Collection primitives; /** Index: /trunk/src/org/openstreetmap/josm/io/GpxImporter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/GpxImporter.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/io/GpxImporter.java (revision 9078) @@ -38,13 +38,13 @@ * The imported GPX layer. May be null if no GPX data. */ - private GpxLayer gpxLayer; + private final GpxLayer gpxLayer; /** * The imported marker layer. May be null if no marker. */ - private MarkerLayer markerLayer; + private final MarkerLayer markerLayer; /** * The task to run after GPX and/or marker layer has been added to MapView. */ - private Runnable postLayerTask; + private final Runnable postLayerTask; public GpxImporterData(GpxLayer gpxLayer, MarkerLayer markerLayer, Runnable postLayerTask) { Index: /trunk/src/org/openstreetmap/josm/io/GpxReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/GpxReader.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/io/GpxReader.java (revision 9078) @@ -61,5 +61,5 @@ /** The resulting gpx data */ private GpxData gpxData; - private InputSource inputSource; + private final InputSource inputSource; private class Parser extends DefaultHandler { Index: /trunk/src/org/openstreetmap/josm/io/InvalidXmlCharacterFilter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/InvalidXmlCharacterFilter.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/io/InvalidXmlCharacterFilter.java (revision 9078) @@ -20,5 +20,5 @@ public class InvalidXmlCharacterFilter extends Reader { - private Reader reader; + private final Reader reader; private static boolean firstWarning = true; Index: /trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (revision 9078) @@ -65,9 +65,9 @@ private static final int MAX_IDS_PER_REQUEST = 200; - private Set nodes; - private Set ways; - private Set relations; + private final Set nodes; + private final Set ways; + private final Set relations; private Set missingPrimitives; - private DataSet outputDataSet; + private final DataSet outputDataSet; /** Index: /trunk/src/org/openstreetmap/josm/io/NoteReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/NoteReader.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/io/NoteReader.java (revision 9078) @@ -32,5 +32,5 @@ public class NoteReader { - private InputSource inputSource; + private final InputSource inputSource; private List parsedNotes; @@ -52,5 +52,5 @@ private NoteParseMode parseMode; - private StringBuilder buffer = new StringBuilder(); + private final StringBuilder buffer = new StringBuilder(); private Note thisNote; private long commentUid; Index: /trunk/src/org/openstreetmap/josm/io/OsmApi.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 9078) @@ -114,5 +114,5 @@ /** Server URL */ - private String serverUrl; + private final String serverUrl; /** Object describing current changeset */ @@ -165,6 +165,6 @@ private static final String CAPABILITIES = "capabilities"; - private ProgressMonitor monitor; - private boolean fastFail; + private final ProgressMonitor monitor; + private final boolean fastFail; CapabilitiesCache(ProgressMonitor monitor, boolean fastFail) { Index: /trunk/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java (revision 9078) @@ -31,5 +31,5 @@ public class OsmChangesetContentParser { - private InputSource source; + private final InputSource source; private final ChangesetDataSet data = new ChangesetDataSet(); Index: /trunk/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java (revision 9078) @@ -19,6 +19,6 @@ public class OsmServerHistoryReader extends OsmServerReader { - private OsmPrimitiveType primitiveType; - private long id; + private final OsmPrimitiveType primitiveType; + private final long id; /** Index: /trunk/src/org/openstreetmap/josm/io/OsmServerReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmServerReader.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/io/OsmServerReader.java (revision 9078) @@ -35,5 +35,5 @@ */ public abstract class OsmServerReader extends OsmConnection { - private OsmApi api = OsmApi.getOsmApi(); + private final OsmApi api = OsmApi.getOsmApi(); private boolean doAuthenticate; protected boolean gpxParsedProperly; Index: /trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (revision 9078) @@ -51,5 +51,5 @@ } - private OsmApi api = OsmApi.getOsmApi(); + private final OsmApi api = OsmApi.getOsmApi(); private boolean canceled; Index: /trunk/src/org/openstreetmap/josm/io/OsmWriter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmWriter.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/io/OsmWriter.java (revision 9078) @@ -39,5 +39,5 @@ public static final String DEFAULT_API_VERSION = "0.6"; - private boolean osmConform; + private final boolean osmConform; private boolean withBody = true; private boolean isOsmChange; Index: /trunk/src/org/openstreetmap/josm/io/auth/CredentialsManager.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/auth/CredentialsManager.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/io/auth/CredentialsManager.java (revision 9078) @@ -62,5 +62,5 @@ * The credentials agent doing the real stuff */ - private CredentialsAgent delegate; + private final CredentialsAgent delegate; /** Index: /trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java (revision 9078) @@ -30,5 +30,5 @@ public class ImageryReader { - private String source; + private final String source; private enum State { Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (revision 9078) @@ -57,5 +57,5 @@ */ static class DeleteTagMarker { - private int num; + private final int num; DeleteTagMarker(int num) { Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java (revision 9078) @@ -20,5 +20,5 @@ /** The server socket */ - private ServerSocket server; + private final ServerSocket server; /** The server instance for IPv4 */ @@ -101,5 +101,5 @@ Socket request = server.accept(); RequestProcessor.processRequest(request); - } catch (SocketException se) { + } catch (SocketException se) { if (!server.isClosed()) { Main.error(se); Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java (revision 9078) @@ -72,5 +72,5 @@ /** The server socket */ - private ServerSocket server; + private final ServerSocket server; /** The server instance for IPv4 */ Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java (revision 9078) @@ -56,5 +56,5 @@ /** The socket this processor listens on */ - private Socket request; + private final Socket request; /** Index: /trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java (revision 9078) @@ -22,5 +22,5 @@ public class GeoImageSessionExporter implements SessionLayerExporter { - private GeoImageLayer layer; + private final GeoImageLayer layer; public GeoImageSessionExporter(GeoImageLayer layer) { Index: /trunk/src/org/openstreetmap/josm/io/session/GpxTracksSessionExporter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/session/GpxTracksSessionExporter.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/io/session/GpxTracksSessionExporter.java (revision 9078) @@ -43,5 +43,5 @@ public class GpxTracksSessionExporter implements SessionLayerExporter { - private GpxLayer layer; + private final GpxLayer layer; private JRadioButton link, include; private JCheckBox export; Index: /trunk/src/org/openstreetmap/josm/io/session/MarkerSessionExporter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/session/MarkerSessionExporter.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/io/session/MarkerSessionExporter.java (revision 9078) @@ -30,5 +30,5 @@ public class MarkerSessionExporter implements SessionLayerExporter { - private MarkerLayer layer; + private final MarkerLayer layer; private JCheckBox export; Index: /trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java (revision 9078) @@ -48,5 +48,5 @@ public class OsmDataSessionExporter implements SessionLayerExporter { - private OsmDataLayer layer; + private final OsmDataLayer layer; private JRadioButton link, include; private JCheckBox export; Index: /trunk/src/org/openstreetmap/josm/io/session/SessionReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/session/SessionReader.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/io/session/SessionReader.java (revision 9078) @@ -90,5 +90,5 @@ private List layers = new ArrayList<>(); private int active = -1; - private List postLoadTasks = new ArrayList<>(); + private final List postLoadTasks = new ArrayList<>(); private ViewportData viewport; @@ -126,7 +126,7 @@ public class ImportSupport { - private String layerName; - private int layerIndex; - private List layerDependencies; + private final String layerName; + private final int layerIndex; + private final List layerDependencies; public ImportSupport(String layerName, int layerIndex, List layerDependencies) { @@ -273,7 +273,7 @@ public static class LayerDependency { - private Integer index; - private Layer layer; - private SessionLayerImporter importer; + private final Integer index; + private final Layer layer; + private final SessionLayerImporter importer; public LayerDependency(Integer index, Layer layer, SessionLayerImporter importer) { Index: /trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java (revision 9078) @@ -112,6 +112,6 @@ */ public class ExportSupport { - private Document doc; - private int layerIndex; + private final Document doc; + private final int layerIndex; public ExportSupport(Document doc, int layerIndex) { Index: /trunk/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java (revision 9078) @@ -35,5 +35,5 @@ */ public class ReadLocalPluginInformationTask extends PleaseWaitRunnable { - private Map availablePlugins; + private final Map availablePlugins; private boolean canceled; Index: /trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java (revision 9078) @@ -36,6 +36,6 @@ private State state; private URL playingUrl; - private double leadIn; // seconds - private double calibration; // ratio of purported duration of samples to true duration + private final double leadIn; // seconds + private final double calibration; // ratio of purported duration of samples to true duration private double position; // seconds private double bytesPerSecond; @@ -114,5 +114,5 @@ } - private Execute command; + private final Execute command; /** Index: /trunk/src/org/openstreetmap/josm/tools/CompositeList.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/CompositeList.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/tools/CompositeList.java (revision 9078) @@ -13,5 +13,5 @@ */ public class CompositeList extends AbstractList { - private List a, b; + private final List a, b; /** Index: /trunk/src/org/openstreetmap/josm/tools/ImageOverlay.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/ImageOverlay.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/tools/ImageOverlay.java (revision 9078) @@ -1,6 +1,4 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.tools; - -import org.openstreetmap.josm.gui.layer.ImageProcessor; import java.awt.Dimension; @@ -8,4 +6,6 @@ import javax.swing.ImageIcon; + +import org.openstreetmap.josm.gui.layer.ImageProcessor; /** class to describe how image overlay @@ -16,11 +16,11 @@ public ImageProvider image; /** offset of the image from left border, values between 0 and 1 */ - private double offsetLeft; + private final double offsetLeft; /** offset of the image from top border, values between 0 and 1 */ - private double offsetRight; + private final double offsetRight; /** offset of the image from right border, values between 0 and 1*/ - private double offsetTop; + private final double offsetTop; /** offset of the image from bottom border, values between 0 and 1 */ - private double offsetBottom; + private final double offsetBottom; /** Index: /trunk/src/org/openstreetmap/josm/tools/ImageResource.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/ImageResource.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/tools/ImageResource.java (revision 9078) @@ -28,5 +28,5 @@ * Caches the image data for resized versions of the same image. */ - private Map imgCache = new HashMap<>(); + private final Map imgCache = new HashMap<>(); /** * SVG diagram information in case of SVG vector image. Index: /trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java (revision 9078) @@ -32,5 +32,5 @@ private static final String STATUS_BAR_ID = "multikeyShortcut"; - private Map myActions = new HashMap<>(); + private final Map myActions = new HashMap<>(); private final class ShowLayersPopupWorker implements Runnable { @@ -188,5 +188,5 @@ private long lastTimestamp; private MyAction lastAction; - private Timer timer; + private final Timer timer; private MultikeyActionsHandler() { Index: /trunk/src/org/openstreetmap/josm/tools/TextTagParser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/TextTagParser.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/tools/TextTagParser.java (revision 9078) @@ -42,8 +42,8 @@ private boolean quotesStarted; private boolean esc; - private StringBuilder s = new StringBuilder(200); + private final StringBuilder s = new StringBuilder(200); private int pos; - private String data; - private int n; + private final String data; + private final int n; public TextAnalyzer(String text) { Index: /trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java (revision 9078) @@ -64,5 +64,5 @@ private class Parser extends DefaultHandler { - private Stack current = new Stack<>(); + private final Stack current = new Stack<>(); private StringBuilder characters = new StringBuilder(64); @@ -182,7 +182,7 @@ private static class Entry { - private Class klass; - private boolean onStart; - private boolean both; + private final Class klass; + private final boolean onStart; + private final boolean both; private final Map fields = new HashMap<>(); private final Map methods = new HashMap<>(); @@ -225,11 +225,11 @@ } - private Map mapping = new HashMap<>(); - private DefaultHandler parser; + private final Map mapping = new HashMap<>(); + private final DefaultHandler parser; /** * The queue of already parsed items from the parsing thread. */ - private List queue = new LinkedList<>(); + private final List queue = new LinkedList<>(); private Iterator queueIterator; Index: /trunk/src/org/openstreetmap/josm/tools/date/FallbackDateParser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/date/FallbackDateParser.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/tools/date/FallbackDateParser.java (revision 9078) @@ -36,5 +36,5 @@ }; - private List dateParsers; + private final List dateParsers; private int activeDateParser; Index: /trunk/src/org/openstreetmap/josm/tools/date/PrimaryDateParser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/date/PrimaryDateParser.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/tools/date/PrimaryDateParser.java (revision 9078) @@ -20,6 +20,6 @@ public class PrimaryDateParser { private DatatypeFactory datatypeFactory; - private FallbackDateParser fallbackDateParser; - private Calendar calendar; + private final FallbackDateParser fallbackDateParser; + private final Calendar calendar; /** Index: /trunk/src/org/openstreetmap/josm/tools/template_engine/Tokenizer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/template_engine/Tokenizer.java (revision 9077) +++ /trunk/src/org/openstreetmap/josm/tools/template_engine/Tokenizer.java (revision 9078) @@ -50,5 +50,5 @@ private int index; private Token currentToken; - private StringBuilder text = new StringBuilder(); + private final StringBuilder text = new StringBuilder(); public Tokenizer(String template) {