Index: /trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java (revision 10937) +++ /trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java (revision 10938) @@ -83,5 +83,4 @@ private List changesets; private Exception lastException; - private UserInfo userInfo; private DownloadOpenChangesetsTask() { @@ -121,5 +120,5 @@ protected void realRun() throws SAXException, IOException, OsmTransferException { try { - userInfo = fetchUserInfo(); + UserInfo userInfo = fetchUserInfo(); if (canceled) return; Index: /trunk/src/org/openstreetmap/josm/data/AutosaveTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/AutosaveTask.java (revision 10937) +++ /trunk/src/org/openstreetmap/josm/data/AutosaveTask.java (revision 10938) @@ -94,5 +94,4 @@ private final Set changedDatasets = new HashSet<>(); private final List layersInfo = new ArrayList<>(); - private Timer timer; private final Object layersLock = new Object(); private final Deque deletedLayers = new LinkedList<>(); @@ -132,6 +131,5 @@ } - timer = new Timer(true); - timer.schedule(this, 1000L, PROP_INTERVAL.get() * 1000L); + new Timer(true).schedule(this, 1000L, PROP_INTERVAL.get() * 1000L); Main.getLayerManager().addLayerChangeListener(this, true); } Index: /trunk/src/org/openstreetmap/josm/data/cache/BufferedImageCacheEntry.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/cache/BufferedImageCacheEntry.java (revision 10937) +++ /trunk/src/org/openstreetmap/josm/data/cache/BufferedImageCacheEntry.java (revision 10938) @@ -18,5 +18,4 @@ // transient to avoid serialization, volatile to avoid synchronization of whole getImage() method private transient volatile BufferedImage img; - private transient volatile boolean writtenToDisk; // we need to have separate control variable, to know, if we already tried to load the image, as img might be null // after we loaded image, as for example, when image file is malformed (eg. HTML file) @@ -79,6 +78,4 @@ } out.writeObject(this); - // ugly hack to wait till element will get to disk to clean the memory - writtenToDisk = true; if (img != null) { Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java (revision 10937) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java (revision 10938) @@ -159,18 +159,18 @@ * Constants used in the transformation. */ - private double b, a, e; - - /** - * Convenience value equal to {@link #a} / {@link #b}. + private double b, e; + + /** + * Convenience value equal to {@code a} / {@link #b}. */ private double arb; /** - * Convenience value equal to {@link #a}×{@link #b}. + * Convenience value equal to {@code a}×{@link #b}. */ private double ab; /** - * Convenience value equal to {@link #b} / {@link #a}. + * Convenience value equal to {@link #b} / {@code a}. */ private double bra; @@ -237,5 +237,5 @@ double temp = cosph0 * cosph0; b = Math.sqrt(1.0 + e2 * (temp * temp) / (1.0 - e2)); - a = b * com / con; + double a = b * com / con; final double d = b * com / (cosph0 * Math.sqrt(con)); double f = d * d - 1.0; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (revision 10937) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (revision 10938) @@ -86,5 +86,4 @@ private ShowChangesetInfoAction showChangesetInfoAction; private CloseOpenChangesetsAction closeChangesetAction; - private LaunchChangesetManagerAction launchChangesetManagerAction; private ChangesetDialogPopup popupMenu; @@ -206,7 +205,4 @@ cbInSelectionOnly.addItemListener(showChangesetInfoAction); - // -- launch changeset manager action - launchChangesetManagerAction = new LaunchChangesetManagerAction(); - popupMenu = new ChangesetDialogPopup(lstInActiveDataLayer, lstInSelection); @@ -220,5 +216,5 @@ new SideButton(closeChangesetAction, false), new SideButton(showChangesetInfoAction, false), - new SideButton(launchChangesetManagerAction, false) + new SideButton(new LaunchChangesetManagerAction(), false) })); } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java (revision 10937) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java (revision 10938) @@ -59,5 +59,4 @@ private UserTableModel model; private SelectUsersPrimitivesAction selectionUsersPrimitivesAction; - private ShowUserInfoAction showUserInfoAction; /** @@ -95,5 +94,5 @@ // -- info action // - showUserInfoAction = new ShowUserInfoAction(); + ShowUserInfoAction showUserInfoAction = new ShowUserInfoAction(); userTable.getSelectionModel().addListSelectionListener(showUserInfoAction); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java (revision 10937) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java (revision 10938) @@ -400,19 +400,15 @@ private static class HeaderPanel extends JPanel { - private JMultilineLabel lblMessage; private transient Changeset current; + + HeaderPanel() { + build(); + } protected final void build() { setLayout(new FlowLayout(FlowLayout.LEFT)); - lblMessage = new JMultilineLabel( - tr("The content of this changeset is not downloaded yet.") - ); - add(lblMessage); + add(new JMultilineLabel(tr("The content of this changeset is not downloaded yet."))); add(new JButton(new DownloadAction())); - } - - HeaderPanel() { - build(); } Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 10937) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 10938) @@ -342,10 +342,4 @@ */ private class SetOffsetActionListener implements ActionListener { - private JPanel panel; - private JLabel lbExifTime; - private JosmTextField tfGpsTime; - private JosmComboBox cbTimezones; - private ImageDisplay imgDisp; - private JList imgList; @Override @@ -353,5 +347,5 @@ SimpleDateFormat dateFormat = (SimpleDateFormat) DateUtils.getDateTimeFormat(DateFormat.SHORT, DateFormat.MEDIUM); - panel = new JPanel(new BorderLayout()); + JPanel panel = new JPanel(new BorderLayout()); panel.add(new JLabel(tr("Take a photo of your GPS receiver while it displays the time.
" + "Display that photo here.
" @@ -359,5 +353,5 @@ BorderLayout.NORTH); - imgDisp = new ImageDisplay(); + ImageDisplay imgDisp = new ImageDisplay(); imgDisp.setPreferredSize(new Dimension(300, 225)); panel.add(imgDisp, BorderLayout.CENTER); @@ -373,5 +367,5 @@ panelTf.add(new JLabel(tr("Photo time (from exif):")), gc); - lbExifTime = new JLabel(); + JLabel lbExifTime = new JLabel(); gc.gridx = 1; gc.weightx = 1.0; @@ -388,5 +382,5 @@ panelTf.add(new JLabel(tr("Gps time (read from the above photo): ")), gc); - tfGpsTime = new JosmTextField(12); + JosmTextField tfGpsTime = new JosmTextField(12); tfGpsTime.setEnabled(false); tfGpsTime.setMinimumSize(new Dimension(155, tfGpsTime.getMinimumSize().height)); @@ -422,5 +416,5 @@ Collections.sort(vtTimezones); - cbTimezones = new JosmComboBox<>(vtTimezones.toArray(new String[0])); + JosmComboBox cbTimezones = new JosmComboBox<>(vtTimezones.toArray(new String[0])); String tzId = Main.pref.get("geoimage.timezoneid", ""); @@ -446,5 +440,5 @@ JPanel panelLst = new JPanel(new BorderLayout()); - imgList = new JList<>(new AbstractListModel() { + JList imgList = new JList<>(new AbstractListModel() { @Override public String getElementAt(int i) { Index: /trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java (revision 10937) +++ /trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java (revision 10938) @@ -399,5 +399,4 @@ class FullyAutomaticAuthorisationTask extends PleaseWaitRunnable { private boolean canceled; - private OsmOAuthAuthorizationClient authClient; FullyAutomaticAuthorisationTask(Component parent) { @@ -480,5 +479,5 @@ try { getProgressMonitor().setTicksCount(3); - authClient = new OsmOAuthAuthorizationClient( + OsmOAuthAuthorizationClient authClient = new OsmOAuthAuthorizationClient( getAdvancedPropertiesPanel().getAdvancedParameters() );