Index: trunk/src/org/openstreetmap/josm/actions/JumpToAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/JumpToAction.java (revision 6266) +++ trunk/src/org/openstreetmap/josm/actions/JumpToAction.java (revision 6267) @@ -40,5 +40,4 @@ private JosmTextField zm = new JosmTextField(); - private double zoomFactor = 0; public void showJumpToDialog() { MapView mv = Main.map.mapView; @@ -50,5 +49,5 @@ double dist = mv.getDist100Pixel(); - zoomFactor = 1/dist; + double zoomFactor = 1/dist; zm.setText(java.lang.Long.toString(Math.round(dist*100)/100)); Index: trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java (revision 6266) +++ trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java (revision 6267) @@ -52,6 +52,4 @@ private MultiMap dependencies; - private boolean zipRequired; - /** * Constructs a new {@code SessionSaveAsAction}. @@ -72,5 +70,5 @@ if (dlg.getValue() != 1) return; - zipRequired = false; + boolean zipRequired = false; for (Layer l : layers) { SessionLayerExporter ex = exporters.get(l); Index: trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java (revision 6266) +++ trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java (revision 6267) @@ -32,7 +32,4 @@ */ public class RelationUploadOrderHook implements UploadHook { - - /** the data to be analyzed */ - private APIDataSet data; /** @@ -99,7 +96,6 @@ @Override public boolean checkUpload(APIDataSet apiDataSet) { - this.data = apiDataSet; try { - data.adjustRelationUploadOrder(); + apiDataSet.adjustRelationUploadOrder(); return true; } catch(CyclicUploadDependencyException e) { Index: trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java (revision 6266) +++ trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java (revision 6267) @@ -63,5 +63,4 @@ public class NTV2GridShiftFile implements Serializable { - private String overviewHeaderCountId; private int overviewHeaderCount; private int subGridHeaderCount; @@ -104,5 +103,5 @@ topLevelSubGrid = null; in.read(b8); - overviewHeaderCountId = new String(b8); + String overviewHeaderCountId = new String(b8); if (!"NUM_OREC".equals(overviewHeaderCountId)) throw new IllegalArgumentException("Input file is not an NTv2 grid shift file"); Index: trunk/src/org/openstreetmap/josm/gui/JMultilineLabel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/JMultilineLabel.java (revision 6266) +++ trunk/src/org/openstreetmap/josm/gui/JMultilineLabel.java (revision 6267) @@ -20,5 +20,4 @@ public class JMultilineLabel extends JLabel { private int maxWidth = Integer.MAX_VALUE; - private Dimension superPreferred = null; private Rectangle oldbounds = null; private Dimension oldPreferred = null; @@ -57,14 +56,14 @@ */ @Override - public Dimension getPreferredSize() - { + public Dimension getPreferredSize() { // Without this check it will result in an infinite loop calling // getPreferredSize. Remember the old bounds and only recalculate if // the size actually changed. - if(this.getBounds().equals(oldbounds) && oldPreferred != null) + if (this.getBounds().equals(oldbounds) && oldPreferred != null) { return oldPreferred; + } oldbounds = this.getBounds(); - this.superPreferred = super.getPreferredSize(); + Dimension superPreferred = super.getPreferredSize(); // Make it not larger than required int width = Math.min(superPreferred.width, maxWidth); @@ -73,6 +72,7 @@ final View v = (View) super.getClientProperty(BasicHTML.propertyKey); - if(v == null) + if (v == null) { return superPreferred; + } v.setSize(width, 0); Index: trunk/src/org/openstreetmap/josm/gui/MapFrame.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MapFrame.java (revision 6266) +++ trunk/src/org/openstreetmap/josm/gui/MapFrame.java (revision 6267) @@ -144,6 +144,4 @@ private final DialogsPanel dialogsPanel; - private final boolean unregisterTab; - /** * Default width of the toggle dialog area. @@ -239,5 +237,5 @@ MapView.addLayerChangeListener(this); - unregisterTab = Shortcut.findShortcut(KeyEvent.VK_TAB, 0)!=null; + boolean unregisterTab = Shortcut.findShortcut(KeyEvent.VK_TAB, 0)!=null; if (unregisterTab) { for (JComponent c: allDialogButtons) c.setFocusTraversalKeysEnabled(false); Index: trunk/src/org/openstreetmap/josm/gui/MapStatus.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 6266) +++ trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 6267) @@ -146,5 +146,4 @@ public final BackgroundProgressMonitor progressMonitor = new BackgroundProgressMonitor(); - private final MouseListener jumpToOnLeftClick; private final SoMChangeListener somListener; @@ -709,5 +708,5 @@ // also show Jump To dialog on mouse click (except context menu) - jumpToOnLeftClick = new MouseAdapter() { + MouseListener jumpToOnLeftClick = new MouseAdapter() { @Override public void mouseClicked(MouseEvent e) { Index: trunk/src/org/openstreetmap/josm/gui/SplashScreen.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/SplashScreen.java (revision 6266) +++ trunk/src/org/openstreetmap/josm/gui/SplashScreen.java (revision 6267) @@ -37,5 +37,4 @@ public class SplashScreen extends JFrame { - private SplashScreenProgressRenderer progressRenderer; private SwingRenderingProgressMonitor progressMonitor; @@ -89,5 +88,5 @@ // Add a status message - progressRenderer = new SplashScreenProgressRenderer(); + SplashScreenProgressRenderer progressRenderer = new SplashScreenProgressRenderer(); gbc.gridy = 3; gbc.insets = new Insets(0, 0, 10, 0); Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 6266) +++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 6267) @@ -75,8 +75,4 @@ private AdjustmentSynchronizer adjustmentSynchronizer; - private JCheckBox cbLockMyScrolling; - private JCheckBox cbLockMergedScrolling; - private JCheckBox cbLockTheirScrolling; - private JLabel lblMyVersion; private JLabel lblMergedVersion; @@ -307,5 +303,5 @@ gc.weighty = 0.0; gc.insets = new Insets(0,0,0,0); - cbLockMyScrolling = new JCheckBox(); + JCheckBox cbLockMyScrolling = new JCheckBox(); cbLockMyScrolling.setName("checkbox.lockmyscrolling"); add(buildAdjustmentLockControlPanel(cbLockMyScrolling), gc); @@ -313,5 +309,5 @@ gc.gridx = 2; gc.gridy = 1; - cbLockMergedScrolling = new JCheckBox(); + JCheckBox cbLockMergedScrolling = new JCheckBox(); cbLockMergedScrolling.setName("checkbox.lockmergedscrolling"); add(buildAdjustmentLockControlPanel(cbLockMergedScrolling), gc); @@ -319,5 +315,5 @@ gc.gridx = 4; gc.gridy = 1; - cbLockTheirScrolling = new JCheckBox(); + JCheckBox cbLockTheirScrolling = new JCheckBox(); cbLockTheirScrolling.setName("checkbox.locktheirscrolling"); add(buildAdjustmentLockControlPanel(cbLockTheirScrolling), gc); Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java (revision 6266) +++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java (revision 6267) @@ -37,8 +37,4 @@ private static DecimalFormat COORD_FORMATTER = new DecimalFormat("###0.0000000"); - private JLabel lblMyVersion; - private JLabel lblMergedVersion; - private JLabel lblTheirVersion; - private JLabel lblMyCoordinates; private JLabel lblMergedCoordinates; @@ -75,5 +71,5 @@ gc.weighty = 0.0; gc.insets = new Insets(10,0,10,0); - lblMyVersion = new JLabel(tr("My version")); + JLabel lblMyVersion = new JLabel(tr("My version")); lblMyVersion.setToolTipText(tr("Properties in my dataset, i.e. the local dataset")); add(lblMyVersion, gc); @@ -81,5 +77,5 @@ gc.gridx = 3; gc.gridy = 0; - lblMergedVersion = new JLabel(tr("Merged version")); + JLabel lblMergedVersion = new JLabel(tr("Merged version")); lblMergedVersion.setToolTipText(tr("Properties in the merged element. They will replace properties in my elements when merge decisions are applied.")); add(lblMergedVersion, gc); @@ -87,5 +83,5 @@ gc.gridx = 5; gc.gridy = 0; - lblTheirVersion = new JLabel(tr("Their version")); + JLabel lblTheirVersion = new JLabel(tr("Their version")); lblTheirVersion.setToolTipText(tr("Properties in their dataset, i.e. the server dataset")); add(lblTheirVersion, gc); Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java (revision 6266) +++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java (revision 6267) @@ -41,6 +41,4 @@ private JTable theirTable; private final TagMergeModel model; - private JButton btnKeepMine; - private JButton btnKeepTheir; AdjustmentSynchronizer adjustmentSynchronizer; @@ -173,5 +171,5 @@ KeepMineAction keepMineAction = new KeepMineAction(); mineTable.getSelectionModel().addListSelectionListener(keepMineAction); - btnKeepMine = new JButton(keepMineAction); + JButton btnKeepMine = new JButton(keepMineAction); btnKeepMine.setName("button.keepmine"); add(btnKeepMine, gc); @@ -196,5 +194,5 @@ gc.weighty = 0.0; KeepTheirAction keepTheirAction = new KeepTheirAction(); - btnKeepTheir = new JButton(keepTheirAction); + JButton btnKeepTheir = new JButton(keepTheirAction); btnKeepTheir.setName("button.keeptheir"); add(btnKeepTheir, gc); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (revision 6266) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (revision 6267) @@ -81,5 +81,5 @@ // the actions private SelectObjectsAction selectObjectsAction; - private ReadChangesetsAction readChangesetAction; + private ReadChangesetsAction readChangesetAction; private ShowChangesetInfoAction showChangesetInfoAction; private CloseOpenChangesetsAction closeChangesetAction; Index: trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java (revision 6266) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java (revision 6267) @@ -59,14 +59,12 @@ private JTable userTable; private FilterTableModel filterModel = new FilterTableModel(); - private SideButton addButton; - private SideButton editButton; - private SideButton deleteButton; - private SideButton upButton; - private SideButton downButton; private EnableFilterAction enableFilterAction; private HidingFilterAction hidingFilterAction; - public FilterDialog(){ + /** + * Constructs a new {@code FilterDialog} + */ + public FilterDialog() { super(tr("Filter"), "filter", tr("Filter objects and hide/disable them."), Shortcut.registerShortcut("subwindow:filter", tr("Toggle: {0}", tr("Filter")), @@ -140,5 +138,5 @@ userTable.setDefaultRenderer(String.class, new StringRenderer()); - addButton = new SideButton(new AbstractAction() { + SideButton addButton = new SideButton(new AbstractAction() { { putValue(NAME, tr("Add")); @@ -153,5 +151,5 @@ } }}); - editButton = new SideButton(new AbstractAction() { + SideButton editButton = new SideButton(new AbstractAction() { { putValue(NAME, tr("Edit")); @@ -170,5 +168,5 @@ } }); - deleteButton = new SideButton(new AbstractAction() { + SideButton deleteButton = new SideButton(new AbstractAction() { { putValue(NAME, tr("Delete")); @@ -183,5 +181,5 @@ } }); - upButton = new SideButton(new AbstractAction() { + SideButton upButton = new SideButton(new AbstractAction() { { putValue(NAME, tr("Up")); @@ -198,5 +196,5 @@ }); - downButton = new SideButton(new AbstractAction() { + SideButton downButton = new SideButton(new AbstractAction() { { putValue(NAME, tr("Down")); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java (revision 6266) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java (revision 6267) @@ -61,5 +61,4 @@ protected List primitives; protected OsmDataLayer layer; - private JosmTextArea txtData; private JosmTextArea txtMappaint; boolean mappaintTabLoaded; @@ -94,5 +93,5 @@ protected JPanel buildDataPanel() { JPanel p = new JPanel(new GridBagLayout()); - txtData = new JosmTextArea(); + JosmTextArea txtData = new JosmTextArea(); txtData.setFont(new Font("Monospaced", txtData.getFont().getStyle(), txtData.getFont().getSize())); txtData.setEditable(false); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java (revision 6266) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java (revision 6267) @@ -63,5 +63,4 @@ private ChangesetContentTableModel model; private Changeset currentChangeset; - private JTable tblContent; private DonwloadChangesetContentAction actDownloadContentAction; @@ -103,5 +102,5 @@ protected JPanel buildContentPanel() { JPanel pnl = new JPanel(new BorderLayout()); - tblContent = new JTable( + JTable tblContent = new JTable( model, new ChangesetContentTableColumnModel(), Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetTagsPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetTagsPanel.java (revision 6266) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetTagsPanel.java (revision 6267) @@ -20,5 +20,4 @@ public class ChangesetTagsPanel extends JPanel implements PropertyChangeListener{ - private TagTable tblTags; private TagEditorModel model; @@ -27,9 +26,12 @@ setBorder(BorderFactory.createEmptyBorder(5,5,5,5)); model = new TagEditorModel(); - tblTags = new TagTable(model); + TagTable tblTags = new TagTable(model); tblTags.setEnabled(false); add(new JScrollPane(tblTags), BorderLayout.CENTER); } + /** + * Constructs a new {@code ChangesetTagsPanel}. + */ public ChangesetTagsPanel() { build(); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java (revision 6266) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java (revision 6267) @@ -41,15 +41,12 @@ } - private ButtonGroup bgQueries; private Map rbQueries; private Map lblQueries; private JCheckBox cbMyChangesetsOnly; - private HtmlPanel pnlInfos; - protected JPanel buildQueriesPanel() { JPanel pnl = new JPanel(new GridBagLayout()); - bgQueries = new ButtonGroup(); + ButtonGroup bgQueries = new ButtonGroup(); rbQueries = new HashMap(); lblQueries = new HashMap(); @@ -123,5 +120,5 @@ protected JPanel buildInfoPanel() { - pnlInfos = new HtmlPanel(); + HtmlPanel pnlInfos = new HtmlPanel(); pnlInfos.setText(tr("Please select one the following standard queries." + "Select Download my changesets only" Index: trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java (revision 6266) +++ trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java (revision 6267) @@ -31,5 +31,4 @@ private CoordinateInfoViewer coordinateInfoViewer; private JTabbedPane tpViewers; - private VersionTable versionTable; /** @@ -55,5 +54,5 @@ pnl.setLayout(new BorderLayout()); - versionTable = new VersionTable(model); + VersionTable versionTable = new VersionTable(model); pnl.add(embeddInScrollPane(versionTable), BorderLayout.CENTER); return pnl; Index: trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (revision 6266) +++ trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (revision 6267) @@ -39,5 +39,4 @@ private UrlLabel lblUser; private UrlLabel lblChangeset; - private JPanel pnlUserAndChangeset; protected void build() { @@ -45,8 +44,7 @@ pnl1.setLayout(new BorderLayout()); lblInfo = new JMultilineLabel(""); - //lblInfo.setHorizontalAlignment(JLabel.LEFT); pnl1.add(lblInfo, BorderLayout.CENTER); - pnlUserAndChangeset = new JPanel(); + JPanel pnlUserAndChangeset = new JPanel(); pnlUserAndChangeset.setLayout(new GridLayout(2,2)); lblUser = new UrlLabel("", 2); Index: trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java (revision 6266) +++ trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java (revision 6267) @@ -51,10 +51,7 @@ public final static String CLOSE_CHANGESET_AFTER_UPLOAD = ChangesetManagementPanel.class.getName() + ".closeChangesetAfterUpload"; - private ButtonGroup bgUseNewOrExisting; private JRadioButton rbUseNew; private JRadioButton rbExisting; private JosmComboBox cbOpenChangesets; - private JButton btnRefresh; - private JButton btnClose; private JCheckBox cbCloseAfterUpload; private OpenChangesetComboBoxModel model; @@ -69,5 +66,5 @@ setBorder(BorderFactory.createEmptyBorder(3,3,3,3)); - bgUseNewOrExisting = new ButtonGroup(); + ButtonGroup bgUseNewOrExisting = new ButtonGroup(); gc.gridwidth = 4; @@ -125,5 +122,5 @@ gc.gridwidth = 1; gc.weightx = 0.0; - btnRefresh = new JButton(new RefreshAction()); + JButton btnRefresh = new JButton(new RefreshAction()); btnRefresh.setMargin(new Insets(0,0,0,0)); add(btnRefresh, gc); @@ -133,5 +130,5 @@ gc.gridwidth = 1; CloseChangesetAction closeChangesetAction = new CloseChangesetAction(); - btnClose = new JButton(closeChangesetAction); + JButton btnClose = new JButton(closeChangesetAction); btnClose.setMargin(new Insets(0,0,0,0)); cbOpenChangesets.addItemListener(closeChangesetAction); Index: trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (revision 6266) +++ trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (revision 6267) @@ -51,6 +51,4 @@ private static final Color BG_COLOR_ERROR = new Color(255,224,224); - private ButtonGroup bgStrategies; - private ButtonGroup bgMultiChangesetPolicies; private Map rbStrategy; private Map lblNumRequests; @@ -64,4 +62,7 @@ private long numUploadedObjects = 0; + /** + * Constructs a new {@code UploadStrategySelectionPanel}. + */ public UploadStrategySelectionPanel() { build(); @@ -71,5 +72,5 @@ JPanel pnl = new JPanel(); pnl.setLayout(new GridBagLayout()); - bgStrategies = new ButtonGroup(); + ButtonGroup bgStrategies = new ButtonGroup(); rbStrategy = new HashMap(); lblStrategies = new HashMap(); @@ -193,5 +194,5 @@ pnlMultiChangesetPolicyPanel.add(rbUseMultipleChangesets = new JRadioButton(tr("Open and use as many new changesets as necessary")),gc); - bgMultiChangesetPolicies = new ButtonGroup(); + ButtonGroup bgMultiChangesetPolicies = new ButtonGroup(); bgMultiChangesetPolicies.add(rbFillOneChangeset); bgMultiChangesetPolicies.add(rbUseMultipleChangesets); Index: trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java (revision 6266) +++ trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java (revision 6267) @@ -148,6 +148,4 @@ private final List grabbers = new ArrayList(); private final List grabberThreads = new ArrayList(); - private int threadCount; - private int workingThreadCount; private boolean canceled; @@ -569,6 +567,4 @@ requestQueueLock.lock(); try { - workingThreadCount--; - sortRequests(localOnly); while (!canceled && (requestQueue.isEmpty() || (localOnly && !requestQueue.get(0).hasExactMatch()))) { @@ -581,5 +577,4 @@ } - workingThreadCount++; if (canceled) return null; @@ -958,6 +953,4 @@ grabberThreads.add(t); } - this.workingThreadCount = grabbers.size(); - this.threadCount = grabbers.size(); } finally { requestQueueLock.unlock(); Index: trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java (revision 6266) +++ trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java (revision 6267) @@ -23,5 +23,4 @@ private JosmTextField tfUserName; private JosmPasswordField tfPassword; - private UserNameValidator valUserName; private JCheckBox cbWriteMapData; @@ -44,5 +43,5 @@ pnl.add(tfUserName = new JosmTextField(), gc); SelectAllOnFocusGainedDecorator.decorate(tfUserName); - valUserName = new UserNameValidator(tfUserName); + UserNameValidator valUserName = new UserNameValidator(tfUserName); valUserName.validate(); Index: trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java (revision 6266) +++ trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java (revision 6267) @@ -56,5 +56,4 @@ */ public class OAuthAuthorizationWizard extends JDialog { - private HtmlPanel pnlMessage; private boolean canceled; private final String apiUrl; @@ -109,5 +108,5 @@ gc.gridy = 1; gc.insets = new Insets(5,0,0,5); - pnlMessage = new HtmlPanel(); + HtmlPanel pnlMessage = new HtmlPanel(); pnlMessage.setText("" + tr("With OAuth you grant JOSM the right to upload map data and GPS tracks " Index: trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java (revision 6266) +++ trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java (revision 6267) @@ -52,5 +52,4 @@ private JCheckBox largeGpsPoints = new JCheckBox(tr("Draw large GPS points")); private JCheckBox hdopCircleGpsPoints = new JCheckBox(tr("Draw a circle from HDOP value")); - private ButtonGroup colorGroup; 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)")); @@ -207,5 +206,5 @@ // colorTracks - colorGroup = new ButtonGroup(); + ButtonGroup colorGroup = new ButtonGroup(); if (layerName!=null) { colorGroup.add(colorTypeGlobal); Index: trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java (revision 6266) +++ trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java (revision 6267) @@ -55,6 +55,4 @@ } - private ButtonGroup bgVersionBasedUpdatePolicy; - private ButtonGroup bgTimeBasedUpdatePolicy; private Map rbVersionBasedUpatePolicy; private Map rbTimeBasedUpatePolicy; @@ -69,5 +67,5 @@ gc.weightx =1.0; - bgVersionBasedUpdatePolicy = new ButtonGroup(); + ButtonGroup bgVersionBasedUpdatePolicy = new ButtonGroup(); rbVersionBasedUpatePolicy = new HashMap(); JRadioButton btn = new JRadioButton(tr("Ask before updating")); @@ -110,5 +108,5 @@ TimeBasedPolicyChangeListener changeListener = new TimeBasedPolicyChangeListener(); - bgTimeBasedUpdatePolicy = new ButtonGroup(); + ButtonGroup bgTimeBasedUpdatePolicy = new ButtonGroup(); rbTimeBasedUpatePolicy = new HashMap(); JRadioButton btn = new JRadioButton(tr("Ask before updating")); @@ -157,4 +155,7 @@ } + /** + * Constructs a new {@code PluginUpdatePolicyPanel}. + */ public PluginUpdatePolicyPanel() { build(); Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java (revision 6266) +++ trunk/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java (revision 6267) @@ -33,5 +33,4 @@ /** the OSM user name */ private JosmTextField tfOsmUserName; - private UserNameValidator valUserName; /** the OSM password */ private JosmPasswordField tfOsmPassword; @@ -58,5 +57,5 @@ add(tfOsmUserName = new JosmTextField(), gc); SelectAllOnFocusGainedDecorator.decorate(tfOsmUserName); - valUserName = new UserNameValidator(tfOsmUserName); + UserNameValidator valUserName = new UserNameValidator(tfOsmUserName); valUserName.validate(); Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java (revision 6266) +++ trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java (revision 6267) @@ -72,5 +72,4 @@ public static final String PROXY_PASS = "proxy.pass"; - private ButtonGroup bgProxyPolicy; private Map rbProxyPolicy; private JosmTextField tfProxyHttpHost; @@ -209,5 +208,5 @@ GridBagConstraints gc = new GridBagConstraints(); - bgProxyPolicy = new ButtonGroup(); + ButtonGroup bgProxyPolicy = new ButtonGroup(); rbProxyPolicy = new HashMap(); ProxyPolicyChangeListener policyChangeListener = new ProxyPolicyChangeListener(); Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java (revision 6266) +++ trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java (revision 6267) @@ -43,5 +43,4 @@ private AutoCompletionManager autocomplete; - private AutoCompletionList acList; /** @@ -185,5 +184,5 @@ autocomplete = layer.data.getAutoCompletionManager(); - acList = new AutoCompletionList(); + AutoCompletionList acList = new AutoCompletionList(); TagCellEditor editor = ((TagCellEditor) tagTable.getColumnModel().getColumn(0).getCellEditor()); Index: trunk/src/org/openstreetmap/josm/tools/UrlLabel.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/UrlLabel.java (revision 6266) +++ trunk/src/org/openstreetmap/josm/tools/UrlLabel.java (revision 6267) @@ -18,6 +18,8 @@ private String url = ""; private String description = ""; - private int fontPlus; + /** + * Constructs a new {@code UrlLabel}. + */ public UrlLabel() { addMouseListener(this); @@ -41,6 +43,7 @@ setUrl(url); setDescription(description); - this.fontPlus = fontPlus; - if (fontPlus!=0) setFont(getFont().deriveFont(0, getFont().getSize()+fontPlus)); + if (fontPlus!=0) { + setFont(getFont().deriveFont(0, getFont().getSize()+fontPlus)); + } refresh(); }