Index: trunk/src/org/openstreetmap/josm/actions/relation/ExportRelationToGpxAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/relation/ExportRelationToGpxAction.java (revision 13851) +++ trunk/src/org/openstreetmap/josm/actions/relation/ExportRelationToGpxAction.java (revision 13852) @@ -19,4 +19,5 @@ import java.util.ListIterator; import java.util.Map; +import java.util.Set; import java.util.Stack; @@ -61,5 +62,5 @@ /** Mode of this ExportToGpxAction */ - protected final EnumSet mode; + protected final Set mode; /** Primitives this action works on */ @@ -76,5 +77,5 @@ * @param mode which mode to use, see {@code ExportRelationToGpxAction.Mode} */ - public ExportRelationToGpxAction(EnumSet mode) { + public ExportRelationToGpxAction(Set mode) { super(name(mode), mode.contains(TO_FILE) ? "exportgpx" : "dialogs/layerlist", tooltip(mode), null, false, null, false); @@ -83,5 +84,5 @@ } - private static String name(EnumSet mode) { + private static String name(Set mode) { if (mode.contains(TO_FILE)) { if (mode.contains(FROM_FIRST_MEMBER)) { @@ -99,5 +100,5 @@ } - private static String tooltip(EnumSet mode) { + private static String tooltip(Set mode) { if (mode.contains(FROM_FIRST_MEMBER)) { return tr("Flatten this relation to a single gpx track recursively, " + Index: trunk/src/org/openstreetmap/josm/command/SplitWayCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/SplitWayCommand.java (revision 13851) +++ trunk/src/org/openstreetmap/josm/command/SplitWayCommand.java (revision 13852) @@ -275,7 +275,4 @@ Collection nowarnroles = Config.getPref().getList("way.split.roles.nowarn", Arrays.asList("outer", "inner", "forward", "backward", "north", "south", "east", "west")); - - //final MapFrame map = MainApplication.getMap(); - //final boolean isMapModeDraw = map != null && map.mapMode == map.mapModeDraw; // Change the original way Index: trunk/src/org/openstreetmap/josm/data/oauth/SignpostAdapters.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/oauth/SignpostAdapters.java (revision 13851) +++ trunk/src/org/openstreetmap/josm/data/oauth/SignpostAdapters.java (revision 13852) @@ -25,4 +25,6 @@ */ public static class OAuthProvider extends AbstractOAuthProvider { + + private static final long serialVersionUID = 1L; /** @@ -60,4 +62,6 @@ */ public static class OAuthConsumer extends AbstractOAuthConsumer { + + private static final long serialVersionUID = 1L; /** Index: trunk/src/org/openstreetmap/josm/data/osm/QuadBucketPrimitiveStore.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/QuadBucketPrimitiveStore.java (revision 13851) +++ trunk/src/org/openstreetmap/josm/data/osm/QuadBucketPrimitiveStore.java (revision 13852) @@ -38,10 +38,4 @@ */ private final Collection relations = new ArrayList<>(); - - /** - * Constructs a new {@code QuadBucketPrimitiveStore}. - */ - public QuadBucketPrimitiveStore() { - } /** Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/ComputeStyleListWorker.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/ComputeStyleListWorker.java (revision 13851) +++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/ComputeStyleListWorker.java (revision 13852) @@ -33,4 +33,7 @@ */ public class ComputeStyleListWorker extends RecursiveTask> implements PrimitiveVisitor { + + private static final long serialVersionUID = 1L; + private final transient List input; private final transient List output; Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 13851) +++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 13852) @@ -595,5 +595,5 @@ int textWidth = (int) bounds.getWidth(); if (bs.hAlign == HorizontalTextAlignment.CENTER) { - x -= textWidth / 2; + x -= textWidth / 2d; } else if (bs.hAlign == HorizontalTextAlignment.LEFT) { x -= -box.x + 4 + textWidth; @@ -1667,5 +1667,5 @@ try { record.paintPrimitive(paintSettings, this); - } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException | NullPointerException e) { + } catch (RuntimeException e) { throw BugReport.intercept(e).put("record", record); } Index: trunk/src/org/openstreetmap/josm/data/tagging/ac/AutoCompletionSet.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/tagging/ac/AutoCompletionSet.java (revision 13851) +++ trunk/src/org/openstreetmap/josm/data/tagging/ac/AutoCompletionSet.java (revision 13852) @@ -18,4 +18,6 @@ */ public class AutoCompletionSet extends TreeSet { + + private static final long serialVersionUID = 1L; // Keep a separate tree set of values for determining fast if a value is present Index: trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 13851) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 13852) @@ -666,8 +666,10 @@ @Override public void popupMenuWillBecomeInvisible(PopupMenuEvent e) { + // Do nothing } @Override public void popupMenuCanceled(PopupMenuEvent e) { + // Do nothing } }); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/RecentTagCollection.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/RecentTagCollection.java (revision 13851) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/RecentTagCollection.java (revision 13852) @@ -23,4 +23,5 @@ */ static final class LruCache extends LinkedHashMap { + private static final long serialVersionUID = 1L; private final int capacity; Index: trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java (revision 13851) +++ trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java (revision 13852) @@ -370,5 +370,5 @@ } - setDisplayToFitMapMarkers(); + super.setDisplayToFitMapMarkers(); } } Index: trunk/src/org/openstreetmap/josm/gui/layer/AutosaveTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/AutosaveTask.java (revision 13851) +++ trunk/src/org/openstreetmap/josm/gui/layer/AutosaveTask.java (revision 13852) @@ -22,4 +22,5 @@ import java.util.LinkedList; import java.util.List; +import java.util.Locale; import java.util.Set; import java.util.Timer; @@ -197,5 +198,5 @@ int index = startIndex; while (true) { - String filename = String.format("%1$s_%2$tY%2$tm%2$td_%2$tH%2$tM%2$tS%2$tL%3$s", + String filename = String.format(Locale.ENGLISH, "%1$s_%2$tY%2$tm%2$td_%2$tH%2$tM%2$tS%2$tL%3$s", layer.layerFileName, now, index == 0 ? "" : ('_' + Integer.toString(index))); File result = new File(autosaveDir, filename + '.' + Index: trunk/src/org/openstreetmap/josm/gui/layer/NativeScaleLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/NativeScaleLayer.java (revision 13851) +++ trunk/src/org/openstreetmap/josm/gui/layer/NativeScaleLayer.java (revision 13852) @@ -5,4 +5,5 @@ import java.util.Collection; import java.util.List; +import java.util.Locale; import org.openstreetmap.josm.gui.NavigatableComponent; @@ -64,5 +65,5 @@ @Override public String toString() { - return String.format("%f [%s]", scale, isNative); + return String.format(Locale.ENGLISH, "%f [%s]", scale, isNative); } Index: trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java (revision 13851) +++ trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java (revision 13852) @@ -416,5 +416,5 @@ Point notePoint = MainApplication.getMap().mapView.getPoint(note.getLatLon()); //move the note point to the center of the icon where users are most likely to click when selecting - notePoint.setLocation(notePoint.getX(), notePoint.getY() - iconHeight / 2); + notePoint.setLocation(notePoint.getX(), notePoint.getY() - iconHeight / 2d); double dist = clickPoint.distanceSq(notePoint); if (minDistance > dist && clickPoint.distance(notePoint) < snapDistance) { Index: trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 13851) +++ trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 13852) @@ -64,8 +64,7 @@ import org.openstreetmap.josm.data.osm.DataSelectionListener; import org.openstreetmap.josm.data.osm.DataSet; -import org.openstreetmap.josm.data.osm.DownloadPolicy; -import org.openstreetmap.josm.data.osm.UploadPolicy; import org.openstreetmap.josm.data.osm.DataSetMerger; import org.openstreetmap.josm.data.osm.DatasetConsistencyTest; +import org.openstreetmap.josm.data.osm.DownloadPolicy; import org.openstreetmap.josm.data.osm.HighlightUpdateListener; import org.openstreetmap.josm.data.osm.IPrimitive; @@ -74,4 +73,5 @@ import org.openstreetmap.josm.data.osm.OsmPrimitiveComparator; import org.openstreetmap.josm.data.osm.Relation; +import org.openstreetmap.josm.data.osm.UploadPolicy; import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent; @@ -239,4 +239,5 @@ static final class LruCache extends LinkedHashMap { + private static final long serialVersionUID = 1L; LruCache(int initialCapacity) { super(initialCapacity, 1.1f, true); Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java (revision 13851) +++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java (revision 13852) @@ -92,4 +92,5 @@ static class HashSetWithLast extends LinkedHashSet { + private static final long serialVersionUID = 1L; protected transient E last; Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSeparator.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSeparator.java (revision 13851) +++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSeparator.java (revision 13852) @@ -8,4 +8,6 @@ public class TaggingPresetSeparator extends TaggingPreset { @Override - public void setDisplayName() {} + public void setDisplayName() { + // Do nothing + } } Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Roles.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Roles.java (revision 13851) +++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Roles.java (revision 13852) @@ -179,4 +179,5 @@ @Override public void addCommands(List changedTags) { + // Do nothing } Index: trunk/src/org/openstreetmap/josm/tools/Shortcut.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/Shortcut.java (revision 13851) +++ trunk/src/org/openstreetmap/josm/tools/Shortcut.java (revision 13852) @@ -283,4 +283,5 @@ private static class ShortcutCollection extends CopyOnWriteArrayList { + private static final long serialVersionUID = 1L; @Override public boolean add(Shortcut shortcut) {