Index: trunk/src/org/openstreetmap/josm/actions/JosmAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/JosmAction.java (revision 3384) +++ trunk/src/org/openstreetmap/josm/actions/JosmAction.java (revision 3385) @@ -99,11 +99,4 @@ } - /** - * needs to be overridden to be useful - */ - public void addListener(JosmAction a) { - return; - } - private void setHelpId() { String helpId = "Action/"+getClass().getName().substring(getClass().getName().lastIndexOf('.')+1); Index: trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java (revision 3384) +++ trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java (revision 3385) @@ -30,5 +30,5 @@ public final class PasteTagsAction extends JosmAction implements PasteBufferChangedListener { - public PasteTagsAction(JosmAction copyAction) { + public PasteTagsAction() { super(tr("Paste Tags"), "pastetags", tr("Apply tags of contents of paste buffer to all selected items."), Index: trunk/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java (revision 3384) +++ trunk/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java (revision 3385) @@ -14,5 +14,5 @@ public class PushbackTokenizer { - public class Range { + public static class Range { private final long start; private final long end; Index: trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java =================================================================== --- trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java (revision 3384) +++ trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java (revision 3385) @@ -41,5 +41,5 @@ * confirm these changes. */ - + public abstract class TagCorrector

{ @@ -76,7 +76,7 @@ p.add(label2, GBC.eop().anchor(GBC.CENTER)); - for (OsmPrimitive primitive : tagCorrectionsMap.keySet()) { - final List tagCorrections = tagCorrectionsMap - .get(primitive); + for (Entry> entry : tagCorrectionsMap.entrySet()) { + final OsmPrimitive primitive = entry.getKey(); + final List tagCorrections = entry.getValue(); if (tagCorrections.isEmpty()) { @@ -102,7 +102,8 @@ } - for (OsmPrimitive primitive : roleCorrectionMap.keySet()) { - final List roleCorrections = roleCorrectionMap - .get(primitive); + for (Entry> entry : roleCorrectionMap.entrySet()) { + final OsmPrimitive primitive = entry.getKey(); + final List roleCorrections = entry.getValue(); + if (roleCorrections.isEmpty()) { continue; Index: trunk/src/org/openstreetmap/josm/data/projection/Lambert.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/projection/Lambert.java (revision 3384) +++ trunk/src/org/openstreetmap/josm/data/projection/Lambert.java (revision 3385) @@ -85,5 +85,5 @@ public static final int DEFAULT_ZONE = 0; - private static int layoutZone = DEFAULT_ZONE; + private int layoutZone = DEFAULT_ZONE; private static NTV2GridShiftFile ntf_rgf93Grid = null; Index: trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (revision 3384) +++ trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (revision 3385) @@ -292,5 +292,4 @@ */ protected void buttonAction(int buttonIndex, ActionEvent evt) { - String a = evt.getActionCommand(); result = buttonIndex+1; setVisible(false); Index: trunk/src/org/openstreetmap/josm/gui/FileDrop.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/FileDrop.java (revision 3384) +++ trunk/src/org/openstreetmap/josm/gui/FileDrop.java (revision 3385) @@ -323,5 +323,5 @@ // Convert list to array - final File[] files = (File[]) fileList.toArray(); + final File[] files = fileList.toArray(new File[fileList.size()]); // Alert listener to drop. Index: trunk/src/org/openstreetmap/josm/gui/MainMenu.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MainMenu.java (revision 3384) +++ trunk/src/org/openstreetmap/josm/gui/MainMenu.java (revision 3385) @@ -119,5 +119,5 @@ public final JosmAction copy = new CopyAction(); public final JosmAction paste = new PasteAction(); - public final JosmAction pasteTags = new PasteTagsAction(copy); + public final JosmAction pasteTags = new PasteTagsAction(); public final JosmAction duplicate = new DuplicateAction(); public final JosmAction delete = new DeleteAction(); Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java (revision 3384) +++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java (revision 3385) @@ -175,10 +175,6 @@ StatisticsInfo info = new StatisticsInfo(); info.numTags = tagsForAllPrimitives.getKeys().size(); - for (OsmPrimitiveType type: sourceStatistics.keySet()) { - info.sourceInfo.put(type, sourceStatistics.get(type)); - } - for (OsmPrimitiveType type: targetStatistics.keySet()) { - info.targetInfo.put(type, targetStatistics.get(type)); - } + info.sourceInfo.putAll(sourceStatistics); + info.targetInfo.putAll(targetStatistics); statisticsModel.append(info); validate(); Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java (revision 3384) +++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java (revision 3385) @@ -50,7 +50,5 @@ } } - try { - layer.updateOffscreenBuffer = true; - } catch (Exception e) {} + layer.updateOffscreenBuffer = true; Main.map.mapView.repaint(); (new Thread() { // clean up the garbage - shouldn't hurt Index: trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java (revision 3384) +++ trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java (revision 3385) @@ -52,5 +52,5 @@ * This wizard walks the user to the necessary steps to retrieve an OAuth Access Token which * allows JOSM to access the OSM API on the users behalf. - * + * */ public class OAuthAuthorizationWizard extends JDialog { @@ -70,5 +70,5 @@ /** * Builds the row with the action buttons - * + * * @return */ @@ -90,5 +90,5 @@ /** * Builds the panel with general information in the header - * + * * @return */ @@ -207,5 +207,5 @@ /** * Creates the wizard. - * + * * @param apiUrl the API URL. Must not be null. * @throws IllegalArgumentException thrown if apiUrl is null @@ -220,5 +220,5 @@ /** * Creates the wizard. - * + * * @param parent the component relative to which the dialog is displayed * @param apiUrl the API URL. Must not be null. @@ -235,5 +235,5 @@ * Sets the API URL for the API for which this wizard is generating * an Access Token. - * + * * @param apiUrl the API URL. Must not be null. * @throws IllegalArgumentException thrown if apiUrl is null @@ -256,5 +256,5 @@ /** * Replies true if the dialog was cancelled - * + * * @return true if the dialog was cancelled */ @@ -274,5 +274,5 @@ /** * Replies the Access Token entered using the wizard - * + * * @return the access token. May be null if the wizard was canceled. */ @@ -283,5 +283,5 @@ /** * Replies the current OAuth parameters. - * + * * @return the current OAuth parameters. */ @@ -293,5 +293,5 @@ * Replies true if the currently selected Access Token shall be saved to * the preferences. - * + * * @return true if the currently selected Access Token shall be saved to * the preferences @@ -303,5 +303,5 @@ /** * Initializes the dialog with values from the preferences - * + * */ public void initFromPreferences() { @@ -389,5 +389,5 @@ } - class ExternalBrowserLauncher implements HyperlinkListener { + static class ExternalBrowserLauncher implements HyperlinkListener { public void hyperlinkUpdate(HyperlinkEvent e) { if (e.getEventType().equals(HyperlinkEvent.EventType.ACTIVATED)) { Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java (revision 3384) +++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java (revision 3385) @@ -69,13 +69,12 @@ int end = start; String curText = getText(0, size); - + // if the text starts with a number we don't autocomplete if (Main.pref.getBoolean("autocomplete.dont_complete_numbers", true)) { try { Long.parseLong(str); - if (curText.length() == 0) { + if (curText.length() == 0) // we don't autocomplete on numbers return; - } Long.parseLong(curText); return; @@ -85,5 +84,5 @@ } } - + // lookup and select a matching item Object item = lookupItem(curText); @@ -226,5 +225,5 @@ * renders an AutoCompletionListItem by showing only the string value part */ - public class AutoCompleteListCellRenderer extends JLabel implements ListCellRenderer { + public static class AutoCompleteListCellRenderer extends JLabel implements ListCellRenderer { public AutoCompleteListCellRenderer() { Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPritority.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPritority.java (revision 3384) +++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPritority.java (revision 3385) @@ -28,5 +28,5 @@ */ public static AutoCompletionItemPritority IS_IN_STANDARD = new AutoCompletionItemPritority(false, true, false); - + /** * Indicates that this is a value from a selected object. @@ -64,11 +64,11 @@ */ public int compareTo(AutoCompletionItemPritority other) { - int sel = new Boolean(selected).compareTo(other.selected); + int sel = Boolean.valueOf(selected).compareTo(other.selected); if (sel != 0) return sel; - int ds = new Boolean(inDataSet).compareTo(other.inDataSet); + int ds = Boolean.valueOf(inDataSet).compareTo(other.inDataSet); if (ds != 0) return ds; - int std = new Boolean(inStandard).compareTo(other.inStandard); + int std = Boolean.valueOf(inStandard).compareTo(other.inStandard); if (std != 0) return std; @@ -82,7 +82,7 @@ public AutoCompletionItemPritority mergeWith(AutoCompletionItemPritority other) { return new AutoCompletionItemPritority( - inDataSet || other.inDataSet, - inStandard || other.inStandard, - selected || other.selected); + inDataSet || other.inDataSet, + inStandard || other.inStandard, + selected || other.selected); } Index: trunk/src/org/openstreetmap/josm/tools/PresetTextComparator.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/PresetTextComparator.java (revision 3384) +++ trunk/src/org/openstreetmap/josm/tools/PresetTextComparator.java (revision 3385) @@ -1,9 +1,10 @@ package org.openstreetmap.josm.tools; +import java.io.Serializable; import java.util.Comparator; import javax.swing.JMenuItem; -public class PresetTextComparator implements Comparator { +public class PresetTextComparator implements Comparator, Serializable { //TODO add error checking and stuff public int compare(JMenuItem arg0, JMenuItem arg1) { Index: trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java (revision 3384) +++ trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java (revision 3385) @@ -109,5 +109,5 @@ } - private class AddNamespaceFilter extends XMLFilterImpl { + private static class AddNamespaceFilter extends XMLFilterImpl { private final String namespace;