Index: /trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java (revision 8836) @@ -63,5 +63,5 @@ * Create an InvalidSelection exception with default message */ - public InvalidSelection() { + InvalidSelection() { super(tr("Please select at least three nodes.")); } @@ -71,5 +71,5 @@ * @param msg Message that will be display to the user */ - public InvalidSelection(String msg) { + InvalidSelection(String msg) { super(msg); } @@ -356,5 +356,5 @@ * @throws InvalidSelection if nodes have same coordinates */ - public Line(Node first, Node last) throws InvalidSelection { + Line(Node first, Node last) throws InvalidSelection { xM = first.getEastNorth().getX(); yM = first.getEastNorth().getY(); @@ -376,5 +376,5 @@ * @throws InvalidSelection if nodes have same coordinates */ - public Line(Way way) throws InvalidSelection { + Line(Way way) throws InvalidSelection { this(way.firstNode(), way.lastNode()); } Index: /trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java (revision 8836) @@ -364,5 +364,5 @@ private TreeSelectionListener validatorSelectionListener; - public MapFrameAdapter() { + MapFrameAdapter() { if ("conflict".equals(mode)) { conflictSelectionListener = new ListSelectionListener() { Index: /trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java (revision 8836) @@ -191,5 +191,5 @@ * Constructs a new {@code ImageryOffsetDialog}. */ - public ImageryOffsetDialog() { + ImageryOffsetDialog() { super(Main.parent, tr("Adjust imagery offset"), Index: /trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (revision 8836) @@ -85,5 +85,5 @@ public final String role; - public RelationRole(Relation rel, String role) { + RelationRole(Relation rel, String role) { this.rel = rel; this.role = role; @@ -197,5 +197,5 @@ /** Constructor */ - public WayTraverser(Collection ways) { + WayTraverser(Collection ways) { availableWays = new HashSet<>(ways); lastWay = null; @@ -381,5 +381,5 @@ public final AssembledMultipolygon pol; - public PolygonLevel(AssembledMultipolygon pol, int level) { + PolygonLevel(AssembledMultipolygon pol, int level) { this.pol = pol; this.level = level; Index: /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (revision 8836) @@ -411,5 +411,5 @@ public double heading; // heading of segSum == approximate heading of the way - public WayData(Way pWay) { + WayData(Way pWay) { way = pWay; nNode = way.getNodes().size(); Index: /trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java (revision 8836) @@ -193,5 +193,5 @@ private Set hull; - public UploadHullBuilder() { + UploadHullBuilder() { hull = new HashSet<>(); } @@ -269,5 +269,5 @@ * @param toUpload the collection of primitives to upload */ - public DeletedParentsChecker(OsmDataLayer layer, Collection toUpload) { + DeletedParentsChecker(OsmDataLayer layer, Collection toUpload) { super(tr("Checking parents for deleted objects")); this.toUpload = toUpload; Index: /trunk/src/org/openstreetmap/josm/actions/ValidateAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/ValidateAction.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/actions/ValidateAction.java (revision 8836) @@ -124,5 +124,5 @@ * @param formerValidatedPrimitives the last collection of primitives being validates. May be null. */ - public ValidationTask(Collection tests, Collection validatedPrimitives, + ValidationTask(Collection tests, Collection validatedPrimitives, Collection formerValidatedPrimitives) { super(tr("Validating"), false /*don't ignore exceptions */); Index: /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java (revision 8836) @@ -102,5 +102,5 @@ private final boolean newLayer; - public DownloadTask(boolean newLayer, OsmServerReader reader, ProgressMonitor progressMonitor) { + DownloadTask(boolean newLayer, OsmServerReader reader, ProgressMonitor progressMonitor) { super(tr("Downloading GPS data"), progressMonitor, false); this.reader = reader; Index: /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java (revision 8836) @@ -91,5 +91,5 @@ protected List notesData; - public DownloadTask(OsmServerReader reader, ProgressMonitor progressMonitor) { + DownloadTask(OsmServerReader reader, ProgressMonitor progressMonitor) { super(tr("Downloading Notes"), progressMonitor, false); this.reader = reader; @@ -137,5 +137,5 @@ class DownloadBoundingBoxTask extends DownloadTask { - public DownloadBoundingBoxTask(OsmServerReader reader, ProgressMonitor progressMonitor) { + DownloadBoundingBoxTask(OsmServerReader reader, ProgressMonitor progressMonitor) { super(reader, progressMonitor); } @@ -173,5 +173,5 @@ class DownloadRawUrlTask extends DownloadTask { - public DownloadRawUrlTask(OsmServerReader reader, ProgressMonitor progressMonitor) { + DownloadRawUrlTask(OsmServerReader reader, ProgressMonitor progressMonitor) { super(reader, progressMonitor); } @@ -199,5 +199,5 @@ class DownloadBzip2RawUrlTask extends DownloadTask { - public DownloadBzip2RawUrlTask(OsmServerReader reader, ProgressMonitor progressMonitor) { + DownloadBzip2RawUrlTask(OsmServerReader reader, ProgressMonitor progressMonitor) { super(reader, progressMonitor); } Index: /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java (revision 8836) @@ -232,5 +232,5 @@ private final boolean osmData; - public PostDownloadProcessor(boolean osmData) { + PostDownloadProcessor(boolean osmData) { this.osmData = osmData; } Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 8836) @@ -1774,5 +1774,5 @@ * Constructs a new {@code SnapChangeAction}. */ - public SnapChangeAction() { + SnapChangeAction() { super(tr("Angle snapping"), /* ICON() */ "anglesnap", tr("Switch angle snapping mode while drawing"), null, false); Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (revision 8836) @@ -158,5 +158,5 @@ public final boolean perpendicular; - public ReferenceSegment(EastNorth en, EastNorth p1, EastNorth p2, boolean perpendicular) { + ReferenceSegment(EastNorth en, EastNorth p1, EastNorth p2, boolean perpendicular) { this.en = en; this.p1 = p1; @@ -189,5 +189,5 @@ private class DualAlignChangeAction extends JosmAction { - public DualAlignChangeAction() { + DualAlignChangeAction() { super(tr("Dual alignment"), /* ICON() */ "mapmode/extrude/dualalign", tr("Switch dual alignment mode while extruding"), null, false); @@ -1179,8 +1179,8 @@ + Math.abs(heightpoint.getX()) + Math.abs(heightpoint.getY()); - return new Line2D.Double(start, new Point2D.Double(start.getX() + (unitvector.getX() * linelength) , start.getY() + return new Line2D.Double(start, new Point2D.Double(start.getX() + (unitvector.getX() * linelength), start.getY() + (unitvector.getY() * linelength))); } catch (NoninvertibleTransformException e) { - return new Line2D.Double(start, new Point2D.Double(start.getX() + (unitvector.getX() * 10) , start.getY() + return new Line2D.Double(start, new Point2D.Double(start.getX() + (unitvector.getX() * 10), start.getY() + (unitvector.getY() * 10))); } Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 8836) @@ -84,5 +84,5 @@ // contains all possible cases the cursor can be in the SelectAction - private static enum SelectActionCursor { + private enum SelectActionCursor { rect("normal", /* ICON(cursor/modifier/) */ "selection"), rect_add("normal", /* ICON(cursor/modifier/) */ "select_add"), Index: /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 8836) @@ -62,5 +62,5 @@ private static final String SEARCH_EXPRESSION = "searchExpression"; - public static enum SearchMode { + public enum SearchMode { replace('R'), add('A'), remove('D'), in_selection('S'); @@ -178,5 +178,5 @@ private final HistoryComboBox hcb; - public SearchKeywordRow(HistoryComboBox hcb) { + SearchKeywordRow(HistoryComboBox hcb) { super(new FlowLayout(FlowLayout.LEFT)); this.hcb = hcb; @@ -352,6 +352,6 @@ .addTitle(tr("basic examples")) .addKeyword(tr("Baker Street"), null, tr("''Baker'' and ''Street'' in any key")) - .addKeyword(tr("\"Baker Street\""), "\"\"", tr("''Baker Street'' in any key")) - , GBC.eol()); + .addKeyword(tr("\"Baker Street\""), "\"\"", tr("''Baker Street'' in any key")), + GBC.eol()); right.add(new SearchKeywordRow(hcbSearchString) .addTitle(tr("basics")) @@ -367,6 +367,6 @@ tr("to quote operators.
Within quoted strings the \" and \\ characters need to be escaped " + "by a preceding \\ (e.g. \\\" and \\\\)."), - "\"addr:street\"") - , GBC.eol()); + "\"addr:street\""), + GBC.eol()); right.add(new SearchKeywordRow(hcbSearchString) .addTitle(tr("combinators")) @@ -375,6 +375,6 @@ .addKeyword("expr OR expr", "OR ", tr("logical or (at least one expression has to be satisfied)")) .addKeyword("-expr", null, tr("logical not")) - .addKeyword("(expr)", "()", tr("use parenthesis to group expressions")) - , GBC.eol()); + .addKeyword("(expr)", "()", tr("use parenthesis to group expressions")), + GBC.eol()); if (Main.pref.getBoolean("expert", false)) { @@ -385,6 +385,6 @@ .addKeyword("type:relation", "type:relation ", tr("all relations")) .addKeyword("closed", "closed ", tr("all closed ways")) - .addKeyword("untagged", "untagged ", tr("object without useful tags")) - , GBC.eol()); + .addKeyword("untagged", "untagged ", tr("object without useful tags")), + GBC.eol()); right.add(new SearchKeywordRow(hcbSearchString) .addTitle(tr("metadata")) @@ -395,6 +395,6 @@ "changeset:0 (objects without an assigned changeset)") .addKeyword("timestamp:", "timestamp:", tr("objects with last modification timestamp within range"), "timestamp:2012/", - "timestamp:2008/2011-02-04T12") - , GBC.eol()); + "timestamp:2008/2011-02-04T12"), + GBC.eol()); right.add(new SearchKeywordRow(hcbSearchString) .addTitle(tr("properties")) @@ -404,6 +404,6 @@ .addKeyword("role:", "role:", tr("objects with given role in a relation")) .addKeyword("areasize:-100", "areasize:", tr("closed ways with an area of 100 m\u00b2")) - .addKeyword("waylength:200-", "waylength:", tr("ways with a length of 200 m or more")) - , GBC.eol()); + .addKeyword("waylength:200-", "waylength:", tr("ways with a length of 200 m or more")), + GBC.eol()); right.add(new SearchKeywordRow(hcbSearchString) .addTitle(tr("state")) @@ -411,6 +411,6 @@ .addKeyword("new", "new ", tr("all new objects")) .addKeyword("selected", "selected ", tr("all selected objects")) - .addKeyword("incomplete", "incomplete ", tr("all incomplete objects")) - , GBC.eol()); + .addKeyword("incomplete", "incomplete ", tr("all incomplete objects")), + GBC.eol()); right.add(new SearchKeywordRow(hcbSearchString) .addTitle(tr("related objects")) @@ -420,6 +420,6 @@ tr("n-th member of relation and/or n-th node of way"), "nth:5 (child type:relation)", "nth:-1") .addKeyword("nth%:7", "nth%: ", - tr("every n-th member of relation and/or every n-th node of way"), "nth%:100 (child waterway)") - , GBC.eol()); + tr("every n-th member of relation and/or every n-th node of way"), "nth%:100 (child waterway)"), + GBC.eol()); right.add(new SearchKeywordRow(hcbSearchString) .addTitle(tr("view")) @@ -428,6 +428,6 @@ .addKeyword("indownloadedarea", "indownloadedarea ", tr("objects in downloaded area")) .addKeyword("allindownloadedarea", "allindownloadedarea ", - tr("objects (and all its way nodes / relation members) in downloaded area")) - , GBC.eol()); + tr("objects (and all its way nodes / relation members) in downloaded area")), + GBC.eol()); } } Index: /trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (revision 8836) @@ -354,5 +354,5 @@ private final boolean defaultValue; - public BooleanMatch(String key, boolean defaultValue) { + BooleanMatch(String key, boolean defaultValue) { this.key = key; this.defaultValue = defaultValue; @@ -435,9 +435,9 @@ */ private static class Id extends RangeMatch { - public Id(Range range) { + Id(Range range) { super(range); } - public Id(PushbackTokenizer tokenizer) throws ParseError { + Id(PushbackTokenizer tokenizer) throws ParseError { this(tokenizer.readRange(tr("Range of primitive ids expected"))); } @@ -458,9 +458,9 @@ */ private static class ChangesetId extends RangeMatch { - public ChangesetId(Range range) { + ChangesetId(Range range) { super(range); } - public ChangesetId(PushbackTokenizer tokenizer) throws ParseError { + ChangesetId(PushbackTokenizer tokenizer) throws ParseError { this(tokenizer.readRange(tr("Range of changeset ids expected"))); } @@ -481,9 +481,9 @@ */ private static class Version extends RangeMatch { - public Version(Range range) { + Version(Range range) { super(range); } - public Version(PushbackTokenizer tokenizer) throws ParseError { + Version(PushbackTokenizer tokenizer) throws ParseError { this(tokenizer.readRange(tr("Range of versions expected"))); } @@ -510,6 +510,6 @@ private final boolean caseSensitive; - public KeyValue(String key, String value, boolean regexSearch, boolean caseSensitive) throws ParseError { - this.caseSensitive = caseSensitive; + KeyValue(String key, String value, boolean regexSearch, boolean caseSensitive) throws ParseError { + this.caseSensitive = caseSensitive; if (regexSearch) { int searchFlags = regexFlags(caseSensitive); @@ -781,5 +781,5 @@ private final boolean caseSensitive; - public Any(String s, boolean regexSearch, boolean caseSensitive) throws ParseError { + Any(String s, boolean regexSearch, boolean caseSensitive) throws ParseError { s = Normalizer.normalize(s, Normalizer.Form.NFC); this.caseSensitive = caseSensitive; @@ -845,5 +845,5 @@ private final OsmPrimitiveType type; - public ExactType(String type) throws ParseError { + ExactType(String type) throws ParseError { this.type = OsmPrimitiveType.from(type); if (this.type == null) @@ -869,5 +869,5 @@ private String user; - public UserMatch(String user) { + UserMatch(String user) { if ("anonymous".equals(user)) { this.user = null; @@ -897,5 +897,5 @@ private String role; - public RoleMatch(String role) { + RoleMatch(String role) { if (role == null) { this.role = ""; @@ -935,5 +935,5 @@ private final boolean modulo; - public Nth(PushbackTokenizer tokenizer, boolean modulo) throws ParseError { + Nth(PushbackTokenizer tokenizer, boolean modulo) throws ParseError { this((int) tokenizer.readNumber(tr("Positive integer expected")), modulo); } @@ -982,10 +982,10 @@ private final long max; - public RangeMatch(long min, long max) { + RangeMatch(long min, long max) { this.min = Math.min(min, max); this.max = Math.max(min, max); } - public RangeMatch(Range range) { + RangeMatch(Range range) { this(range.getStart(), range.getEnd()); } @@ -1014,9 +1014,9 @@ */ private static class NodeCountRange extends RangeMatch { - public NodeCountRange(Range range) { + NodeCountRange(Range range) { super(range); } - public NodeCountRange(PushbackTokenizer tokenizer) throws ParseError { + NodeCountRange(PushbackTokenizer tokenizer) throws ParseError { this(tokenizer.readRange(tr("Range of numbers expected"))); } @@ -1043,9 +1043,9 @@ */ private static class WayCountRange extends RangeMatch { - public WayCountRange(Range range) { + WayCountRange(Range range) { super(range); } - public WayCountRange(PushbackTokenizer tokenizer) throws ParseError { + WayCountRange(PushbackTokenizer tokenizer) throws ParseError { this(tokenizer.readRange(tr("Range of numbers expected"))); } @@ -1072,9 +1072,9 @@ */ private static class TagCountRange extends RangeMatch { - public TagCountRange(Range range) { + TagCountRange(Range range) { super(range); } - public TagCountRange(PushbackTokenizer tokenizer) throws ParseError { + TagCountRange(PushbackTokenizer tokenizer) throws ParseError { this(tokenizer.readRange(tr("Range of numbers expected"))); } @@ -1096,5 +1096,5 @@ private static class TimestampRange extends RangeMatch { - public TimestampRange(long minCount, long maxCount) { + TimestampRange(long minCount, long maxCount) { super(minCount, maxCount); } @@ -1266,9 +1266,9 @@ private static class AreaSize extends RangeMatch { - public AreaSize(Range range) { + AreaSize(Range range) { super(range); } - public AreaSize(PushbackTokenizer tokenizer) throws ParseError { + AreaSize(PushbackTokenizer tokenizer) throws ParseError { this(tokenizer.readRange(tr("Range of numbers expected"))); } @@ -1293,9 +1293,9 @@ private static class WayLength extends RangeMatch { - public WayLength(Range range) { + WayLength(Range range) { super(range); } - public WayLength(PushbackTokenizer tokenizer) throws ParseError { + WayLength(PushbackTokenizer tokenizer) throws ParseError { this(tokenizer.readRange(tr("Range of numbers expected"))); } @@ -1325,5 +1325,5 @@ * @param all if true, all way nodes or relation members have to be within source area;if false, one suffices. */ - public InArea(boolean all) { + InArea(boolean all) { this.all = all; } @@ -1375,5 +1375,5 @@ private static class InView extends InArea { - public InView(boolean all) { + InView(boolean all) { super(all); } Index: /trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java (revision 8836) @@ -48,5 +48,5 @@ * @param monitor progress monitor */ - public UploadTask(String title, ProgressMonitor monitor) { + UploadTask(String title, ProgressMonitor monitor) { super(title, monitor, false); } Index: /trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java =================================================================== --- /trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java (revision 8836) @@ -66,5 +66,5 @@ private final Pattern pattern; - public StringSwitcher(String a, String b) { + StringSwitcher(String a, String b) { this.a = a; this.b = b; Index: /trunk/src/org/openstreetmap/josm/data/APIDataSet.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/APIDataSet.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/data/APIDataSet.java (revision 8836) @@ -276,5 +276,5 @@ private final boolean newOrUndeleted; - public RelationUploadDependencyGraph(Collection relations, boolean newOrUndeleted) { + RelationUploadDependencyGraph(Collection relations, boolean newOrUndeleted) { this.newOrUndeleted = newOrUndeleted; build(relations); Index: /trunk/src/org/openstreetmap/josm/data/Preferences.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 8836) @@ -522,5 +522,5 @@ private final Setting newValue; - public DefaultPreferenceChangeEvent(String key, Setting oldValue, Setting newValue) { + DefaultPreferenceChangeEvent(String key, Setting oldValue, Setting newValue) { this.key = key; this.oldValue = oldValue; @@ -1721,5 +1721,5 @@ private String key; - public SettingToXml(StringBuilder b, boolean noPassword) { + SettingToXml(StringBuilder b, boolean noPassword) { this.b = b; this.noPassword = noPassword; Index: /trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (revision 8836) @@ -46,5 +46,5 @@ private final Class c; - public FilterPredicate(Class c) { + FilterPredicate(Class c) { this.c = c; } Index: /trunk/src/org/openstreetmap/josm/data/imagery/CachedAttributionBingAerialTileSource.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/imagery/CachedAttributionBingAerialTileSource.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/data/imagery/CachedAttributionBingAerialTileSource.java (revision 8836) @@ -48,5 +48,5 @@ class BingAttributionData extends CacheCustomContent { - public BingAttributionData() { + BingAttributionData() { super("bing.attribution.xml", CacheCustomContent.INTERVAL_HOURLY); } Index: /trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (revision 8836) @@ -133,5 +133,5 @@ private final JTable list; - public SelectLayerDialog(Collection layers) { + SelectLayerDialog(Collection layers) { super(Main.parent, tr("Select WMTS layer"), new String[]{tr("Add layers"), tr("Cancel")}); this.layers = layers.toArray(new Layer[]{}); Index: /trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java (revision 8836) @@ -17,5 +17,5 @@ public class ChangesetDataSet { - public static enum ChangesetModificationType { + public enum ChangesetModificationType { CREATED, UPDATED, @@ -156,5 +156,5 @@ private HistoryOsmPrimitive primitive; - public DefaultChangesetDataSetEntry(ChangesetModificationType modificationType, HistoryOsmPrimitive primitive) { + DefaultChangesetDataSetEntry(ChangesetModificationType modificationType, HistoryOsmPrimitive primitive) { this.modificationType = modificationType; this.primitive = primitive; @@ -175,5 +175,5 @@ private Iterator> typeIterator; - public DefaultIterator() { + DefaultIterator() { typeIterator = modificationTypes.entrySet().iterator(); } Index: /trunk/src/org/openstreetmap/josm/data/osm/MultipolygonBuilder.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/MultipolygonBuilder.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/data/osm/MultipolygonBuilder.java (revision 8836) @@ -99,5 +99,5 @@ public List innerWays; - public PolygonLevel(JoinedPolygon pol, int level) { + PolygonLevel(JoinedPolygon pol, int level) { this.outerWay = pol; this.level = level; @@ -345,5 +345,5 @@ private final List output; - public Worker(List input, int from, int to, List output) { + Worker(List input, int from, int to, List output) { this.input = input; this.from = from; Index: /trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java (revision 8836) @@ -86,5 +86,5 @@ * Constructor for root node */ - public QBLevel(final QuadBuckets buckets) { + QBLevel(final QuadBuckets buckets) { level = 0; index = 0; @@ -95,5 +95,5 @@ } - public QBLevel(QBLevel parent, int parent_index, final QuadBuckets buckets) { + QBLevel(QBLevel parent, int parent_index, final QuadBuckets buckets) { this.parent = parent; this.level = parent.level + 1; @@ -508,5 +508,5 @@ } - public QuadBucketIterator(QuadBuckets qb) { + QuadBucketIterator(QuadBuckets qb) { if (!qb.root.hasChildren() || qb.root.hasContent()) { currentNode = qb.root; Index: /trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java (revision 8836) @@ -108,5 +108,5 @@ private final boolean consolidate; - public ListenerInfo(DataSetListener listener, boolean consolidate) { + ListenerInfo(DataSetListener listener, boolean consolidate) { this.listener = listener; this.consolidate = consolidate; Index: /trunk/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java (revision 8836) @@ -29,5 +29,5 @@ private final SelectionChangedListener listener; - public ListenerInfo(SelectionChangedListener listener) { + ListenerInfo(SelectionChangedListener listener) { this.listener = listener; } Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/LineClip.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/LineClip.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/LineClip.java (revision 8836) @@ -38,5 +38,5 @@ return false; } - return cohenSutherland(p1.x, p1.y, p2.x, p2.y, clipBounds.x , clipBounds.y, + return cohenSutherland(p1.x, p1.y, p2.x, p2.y, clipBounds.x, clipBounds.y, clipBounds.x + clipBounds.width, clipBounds.y + clipBounds.height); } Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (revision 8836) @@ -110,5 +110,5 @@ private int xPrev0, yPrev0; - public OffsetIterator(List nodes, double offset) { + OffsetIterator(List nodes, double offset) { this.nodes = nodes; this.offset = offset; @@ -193,5 +193,5 @@ private final int flags; - public StyleRecord(ElemStyle style, OsmPrimitive osm, int flags) { + StyleRecord(ElemStyle style, OsmPrimitive osm, int flags) { this.style = style; this.osm = osm; @@ -1563,5 +1563,5 @@ * @param output the list of styles to which styles will be added */ - public ComputeStyleListWorker(final List input, int from, int to, List output) { + ComputeStyleListWorker(final List input, int from, int to, List output) { this.input = input; this.from = from; @@ -1640,5 +1640,5 @@ private final List allStyleElems; - public ConcurrentTasksHelper(List allStyleElems) { + ConcurrentTasksHelper(List allStyleElems) { this.allStyleElems = allStyleElems; } Index: /trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java (revision 8836) @@ -56,5 +56,5 @@ * @since 7370 (public) */ - public static enum Param { + public enum Param { /** False easting */ Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java (revision 8836) @@ -108,5 +108,5 @@ * @param members The list of relation members */ - public RelationMembers(List members) { + RelationMembers(List members) { this.members = new ArrayList<>(members.size()); for (RelationMember member : members) { @@ -141,5 +141,5 @@ * @param keys The set of tags of the relation */ - public RelationPair(List members, Map keys) { + RelationPair(List members, Map keys) { this.members = new RelationMembers(members); this.keys = keys; Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java (revision 8836) @@ -42,5 +42,5 @@ private final Map keys; - public WayPair(List coor, Map keys) { + WayPair(List coor, Map keys) { this.coor = coor; this.keys = keys; @@ -68,5 +68,5 @@ private final List coor; - public WayPairNoTags(List coor) { + WayPairNoTags(List coor) { this.coor = coor; } Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java (revision 8836) @@ -78,5 +78,5 @@ } - static enum CheckMode { + enum CheckMode { TIME_RANGE(0), POINTS_IN_TIME(1), BOTH(2); private final int code; Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java (revision 8836) @@ -88,5 +88,5 @@ private final String name; - public RolePreset(List roles, String name) { + RolePreset(List roles, String name) { this.roles = roles; this.name = name; Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java (revision 8836) @@ -56,5 +56,5 @@ * @param engMessage The English message */ - public UnclosedWaysCheck(int code, String key, String engMessage) { + UnclosedWaysCheck(int code, String key, String engMessage) { this(code, key, engMessage, Collections.emptySet()); } @@ -67,5 +67,5 @@ * @param ignoredValues The ignored values. */ - public UnclosedWaysCheck(int code, String key, String engMessage, Set ignoredValues) { + UnclosedWaysCheck(int code, String key, String engMessage, Set ignoredValues) { this(code, key, engMessage, ignoredValues, true); } @@ -79,5 +79,5 @@ * @param ignore indicates if special values must be ignored or considered only */ - public UnclosedWaysCheck(int code, String key, String engMessage, Set specialValues, boolean ignore) { + UnclosedWaysCheck(int code, String key, String engMessage, Set specialValues, boolean ignore) { this.code = code; this.key = key; @@ -123,5 +123,5 @@ * @param engMessage The English message */ - public UnclosedWaysBooleanCheck(int code, String key, String engMessage) { + UnclosedWaysBooleanCheck(int code, String key, String engMessage) { super(code, key, engMessage); } Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java (revision 8836) @@ -297,5 +297,5 @@ private final Node n2; - public MyWaySegment(Way w, Node n1, Node n2) { + MyWaySegment(Way w, Node n1, Node n2) { this.w = w; String railway = w.get("railway"); Index: /trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java (revision 8836) @@ -204,5 +204,5 @@ * An enum designating how long to not show this message again, i.e., for how long to store */ - static enum NotShowAgain { + enum NotShowAgain { NO, OPERATION, SESSION, PERMANENT; @@ -262,5 +262,5 @@ * @param displayImmediateOption whether to provide "Do not show again (this session)" */ - public MessagePanel(Object message, boolean displayImmediateOption) { + MessagePanel(Object message, boolean displayImmediateOption) { cbStandard.setSelected(true); ButtonGroup group = new ButtonGroup(); Index: /trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (revision 8836) @@ -657,5 +657,5 @@ * Constructs a new {@code HelpAction}. */ - public HelpAction() { + HelpAction() { putValue(SHORT_DESCRIPTION, tr("Show help information")); putValue(NAME, tr("Help")); Index: /trunk/src/org/openstreetmap/josm/gui/GettingStarted.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (revision 8836) @@ -73,5 +73,5 @@ */ private static class MotdContent extends CacheCustomContent { - public MotdContent() { + MotdContent() { super("motd.html", CacheCustomContent.INTERVAL_DAILY); } Index: /trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java (revision 8836) @@ -111,5 +111,5 @@ private int value; - public DefaultAction(JDialog dialog, JOptionPane pane, int value) { + DefaultAction(JDialog dialog, JOptionPane pane, int value) { this.dialog = dialog; this.pane = pane; Index: /trunk/src/org/openstreetmap/josm/gui/MainApplication.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 8836) @@ -594,5 +594,5 @@ private final DefaultProxySelector proxySelector; - public GuiFinalizationWorker(Map> args, DefaultProxySelector proxySelector) { + GuiFinalizationWorker(Map> args, DefaultProxySelector proxySelector) { this.args = args; this.proxySelector = proxySelector; Index: /trunk/src/org/openstreetmap/josm/gui/MainMenu.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MainMenu.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/MainMenu.java (revision 8836) @@ -145,5 +145,5 @@ public class MainMenu extends JMenuBar { - public static enum WINDOW_MENU_GROUP { ALWAYS, TOGGLE_DIALOG, VOLATILE } + public enum WINDOW_MENU_GROUP { ALWAYS, TOGGLE_DIALOG, VOLATILE } /* File menu */ @@ -343,4 +343,5 @@ * @since 6082 (moved from Utilsplugin2) */ + // CHECKSTYLE.OFF: LineLength public final JMenu moreToolsMenu = addMenu("More tools", /* I18N: mnemonic: M */ trc("menu", "More tools"), KeyEvent.VK_M, 4, ht("/Menu/MoreTools")); /** @@ -367,5 +368,4 @@ * imageryMenu contains all imagery-related actions */ - // CHECKSTYLE.OFF: LineLength public final ImageryMenu imageryMenu = addMenu(new ImageryMenu(imagerySubMenu), /* I18N: mnemonic: I */ "Imagery", KeyEvent.VK_I, 8, ht("/Menu/Imagery")); // CHECKSTYLE.ON: LineLength @@ -948,5 +948,5 @@ private JMenu presetsMenu; - public PresetsMenuEnabler(JMenu presetsMenu) { + PresetsMenuEnabler(JMenu presetsMenu) { MapView.addLayerChangeListener(this); this.presetsMenu = presetsMenu; @@ -1017,5 +1017,5 @@ private String currentSearchText = null; - public SearchFieldTextListener(MainMenu mainMenu, JTextField searchField) { + SearchFieldTextListener(MainMenu mainMenu, JTextField searchField) { this.mainMenu = mainMenu; this.searchField = searchField; Index: /trunk/src/org/openstreetmap/josm/gui/MapFrame.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MapFrame.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/MapFrame.java (revision 8836) @@ -548,5 +548,5 @@ private transient Collection buttons; - public ListAllButtonsAction(Collection buttons) { + ListAllButtonsAction(Collection buttons) { this.buttons = buttons; } Index: /trunk/src/org/openstreetmap/josm/gui/MapMover.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MapMover.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/MapMover.java (revision 8836) @@ -38,5 +38,5 @@ private final String action; - public ZoomerAction(String action) { + ZoomerAction(String action) { this.action = action; } Index: /trunk/src/org/openstreetmap/josm/gui/MapSlider.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MapSlider.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/MapSlider.java (revision 8836) @@ -19,5 +19,5 @@ private boolean preventChange = false; - public MapSlider(MapView mv) { + MapSlider(MapView mv) { super(35, 150); setOpaque(false); Index: /trunk/src/org/openstreetmap/josm/gui/MapStatus.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 8836) @@ -211,5 +211,5 @@ private final String text; - public StatusTextHistory(Object id, String text) { + StatusTextHistory(Object id, String text) { this.id = id; this.text = text; @@ -348,5 +348,5 @@ private MapFrame parent; - public Collector(MapFrame parent) { + Collector(MapFrame parent) { this.parent = parent; } @@ -751,5 +751,5 @@ }); - public MapStatusPopupMenu() { + MapStatusPopupMenu() { for (final String key : new TreeSet<>(SystemOfMeasurement.ALL_SYSTEMS.keySet())) { JCheckBoxMenuItem item = new JCheckBoxMenuItem(new AbstractAction(key) { Index: /trunk/src/org/openstreetmap/josm/gui/MenuScroller.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MenuScroller.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/MenuScroller.java (revision 8836) @@ -428,5 +428,5 @@ private class MenuScrollTimer extends Timer { - public MenuScrollTimer(final int increment, int interval) { + MenuScrollTimer(final int increment, int interval) { super(interval, new ActionListener() { @@ -445,5 +445,5 @@ private MenuScrollTimer timer; - public MenuScrollItem(MenuIcon icon, int increment) { + MenuScrollItem(MenuIcon icon, int increment) { setIcon(icon); setDisabledIcon(icon); @@ -467,5 +467,5 @@ } - private static enum MenuIcon implements Icon { + private enum MenuIcon implements Icon { UP(9, 1, 9), Index: /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (revision 8836) @@ -635,5 +635,5 @@ private final double scale; - public ZoomData(EastNorth center, double scale) { + ZoomData(EastNorth center, double scale) { this.center = Projections.inverseProject(center); this.scale = scale; Index: /trunk/src/org/openstreetmap/josm/gui/NotificationManager.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/NotificationManager.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/NotificationManager.java (revision 8836) @@ -83,5 +83,5 @@ } - public NotificationManager() { + NotificationManager() { queue = new LinkedList<>(); hideTimer = new Timer(defaultNotificationTime, new HideEvent()); @@ -186,5 +186,5 @@ private JPanel innerPanel; - public NotificationPanel(Notification note) { + NotificationPanel(Notification note) { setVisible(false); build(note); @@ -310,5 +310,5 @@ class HideAction extends AbstractAction { - public HideAction() { + HideAction() { putValue(SMALL_ICON, ImageProvider.get("misc", "grey_x")); } @@ -345,5 +345,5 @@ public static class RoundedPanel extends JPanel { - public RoundedPanel() { + RoundedPanel() { super(); setOpaque(false); Index: /trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java (revision 8836) @@ -41,14 +41,16 @@ private int direction; - public ScrollViewPortMouseListener(int direction) { + ScrollViewPortMouseListener(int direction) { this.direction = direction; } - @Override public void mouseExited(MouseEvent arg0) { + @Override + public void mouseExited(MouseEvent arg0) { ScrollViewport.this.scrollDirection = NO_SCROLL; timer.stop(); } - @Override public void mouseReleased(MouseEvent arg0) { + @Override + public void mouseReleased(MouseEvent arg0) { ScrollViewport.this.scrollDirection = NO_SCROLL; timer.stop(); Index: /trunk/src/org/openstreetmap/josm/gui/SplashScreen.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/SplashScreen.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/SplashScreen.java (revision 8836) @@ -155,5 +155,5 @@ private String duration = ""; - public MeasurableTask(String name) { + MeasurableTask(String name) { this.name = name; this.start = System.currentTimeMillis(); @@ -381,5 +381,5 @@ * Constructs a new {@code SplashScreenProgressRenderer}. */ - public SplashScreenProgressRenderer() { + SplashScreenProgressRenderer() { build(); } Index: /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java (revision 8836) @@ -170,5 +170,5 @@ private int direction; - public MoveXAction(int direction) { + MoveXAction(int direction) { this.direction = direction; } @@ -184,5 +184,5 @@ private int direction; - public MoveYAction(int direction) { + MoveYAction(int direction) { this.direction = direction; } Index: /trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java (revision 8836) @@ -333,5 +333,5 @@ } - public TileGridInputPanel() { + TileGridInputPanel() { build(); } @@ -500,5 +500,5 @@ } - public TileAddressInputPanel() { + TileAddressInputPanel() { setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); build(); @@ -510,5 +510,5 @@ class ApplyTileAddressAction extends AbstractAction { - public ApplyTileAddressAction() { + ApplyTileAddressAction() { putValue(SMALL_ICON, ImageProvider.get("apply")); putValue(SHORT_DESCRIPTION, tr("Apply the tile address")); @@ -532,5 +532,5 @@ private TileBounds tileBounds = null; - public TileAddressValidator(JTextComponent tc) { + TileAddressValidator(JTextComponent tc) { super(tc); } @@ -591,5 +591,5 @@ private int tileIndex; - public TileCoordinateValidator(JTextComponent tc) { + TileCoordinateValidator(JTextComponent tc) { super(tc); } Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 8836) @@ -435,5 +435,5 @@ class CopyStartLeftAction extends CopyAction { - public CopyStartLeftAction() { + CopyStartLeftAction() { super(/* ICON(dialogs/conflict/)*/ "copystartleft", tr("> top"), tr("Copy my selected nodes to the start of the merged node list")); @@ -457,5 +457,5 @@ class CopyEndLeftAction extends CopyAction { - public CopyEndLeftAction() { + CopyEndLeftAction() { super(/* ICON(dialogs/conflict/)*/ "copyendleft", tr("> bottom"), tr("Copy my selected elements to the end of the list of merged elements.")); @@ -479,5 +479,5 @@ class CopyBeforeCurrentLeftAction extends CopyAction { - public CopyBeforeCurrentLeftAction() { + CopyBeforeCurrentLeftAction() { super(/* ICON(dialogs/conflict/)*/ "copybeforecurrentleft", tr("> before"), tr("Copy my selected elements before the first selected element in the list of merged elements.")); @@ -509,5 +509,5 @@ class CopyAfterCurrentLeftAction extends CopyAction { - public CopyAfterCurrentLeftAction() { + CopyAfterCurrentLeftAction() { super(/* ICON(dialogs/conflict/)*/ "copyaftercurrentleft", tr("> after"), tr("Copy my selected elements after the first selected element in the list of merged elements.")); @@ -535,5 +535,5 @@ class CopyStartRightAction extends CopyAction { - public CopyStartRightAction() { + CopyStartRightAction() { super(/* ICON(dialogs/conflict/)*/ "copystartright", tr("< top"), tr("Copy their selected element to the start of the list of merged elements.")); @@ -553,5 +553,5 @@ class CopyEndRightAction extends CopyAction { - public CopyEndRightAction() { + CopyEndRightAction() { super(/* ICON(dialogs/conflict/)*/ "copyendright", tr("< bottom"), tr("Copy their selected elements to the end of the list of merged elements.")); @@ -571,5 +571,5 @@ class CopyBeforeCurrentRightAction extends CopyAction { - public CopyBeforeCurrentRightAction() { + CopyBeforeCurrentRightAction() { super(/* ICON(dialogs/conflict/)*/ "copybeforecurrentright", tr("< before"), tr("Copy their selected elements before the first selected element in the list of merged elements.")); @@ -597,5 +597,5 @@ class CopyAfterCurrentRightAction extends CopyAction { - public CopyAfterCurrentRightAction() { + CopyAfterCurrentRightAction() { super(/* ICON(dialogs/conflict/)*/ "copyaftercurrentright", tr("< after"), tr("Copy their selected element after the first selected element in the list of merged elements")); @@ -623,5 +623,5 @@ class CopyAllLeft extends AbstractAction implements Observer, PropertyChangeListener { - public CopyAllLeft() { + CopyAllLeft() { ImageIcon icon = ImageProvider.get("dialogs/conflict", "useallleft"); putValue(Action.SMALL_ICON, icon); @@ -652,5 +652,5 @@ class CopyAllRight extends AbstractAction implements Observer, PropertyChangeListener { - public CopyAllRight() { + CopyAllRight() { ImageIcon icon = ImageProvider.get("dialogs/conflict", "useallright"); putValue(Action.SMALL_ICON, icon); @@ -681,5 +681,5 @@ class MoveUpMergedAction extends AbstractAction implements ListSelectionListener { - public MoveUpMergedAction() { + MoveUpMergedAction() { ImageIcon icon = ImageProvider.get("dialogs/conflict", "moveup"); putValue(Action.SMALL_ICON, icon); @@ -715,5 +715,5 @@ class MoveDownMergedAction extends AbstractAction implements ListSelectionListener { - public MoveDownMergedAction() { + MoveDownMergedAction() { ImageIcon icon = ImageProvider.get("dialogs/conflict", "movedown"); putValue(Action.SMALL_ICON, icon); @@ -749,5 +749,5 @@ class RemoveMergedAction extends AbstractAction implements ListSelectionListener { - public RemoveMergedAction() { + RemoveMergedAction() { ImageIcon icon = ImageProvider.get("dialogs/conflict", "remove"); putValue(Action.SMALL_ICON, icon); Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java (revision 8836) @@ -392,5 +392,5 @@ class KeepMyCoordinatesAction extends AbstractAction implements Observer { - public KeepMyCoordinatesAction() { + KeepMyCoordinatesAction() { putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagkeepmine")); putValue(Action.SHORT_DESCRIPTION, tr("Keep my coordinates")); @@ -409,5 +409,5 @@ class KeepTheirCoordinatesAction extends AbstractAction implements Observer { - public KeepTheirCoordinatesAction() { + KeepTheirCoordinatesAction() { putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagkeeptheir")); putValue(Action.SHORT_DESCRIPTION, tr("Keep their coordinates")); @@ -426,5 +426,5 @@ class UndecideCoordinateConflictAction extends AbstractAction implements Observer { - public UndecideCoordinateConflictAction() { + UndecideCoordinateConflictAction() { putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagundecide")); putValue(Action.SHORT_DESCRIPTION, tr("Undecide conflict between different coordinates")); @@ -443,5 +443,5 @@ class KeepMyDeletedStateAction extends AbstractAction implements Observer { - public KeepMyDeletedStateAction() { + KeepMyDeletedStateAction() { putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagkeepmine")); putValue(Action.SHORT_DESCRIPTION, tr("Keep my deleted state")); @@ -460,5 +460,5 @@ class KeepTheirDeletedStateAction extends AbstractAction implements Observer { - public KeepTheirDeletedStateAction() { + KeepTheirDeletedStateAction() { putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagkeeptheir")); putValue(Action.SHORT_DESCRIPTION, tr("Keep their deleted state")); @@ -477,5 +477,5 @@ class UndecideDeletedStateConflictAction extends AbstractAction implements Observer { - public UndecideDeletedStateConflictAction() { + UndecideDeletedStateConflictAction() { putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagundecide")); putValue(Action.SHORT_DESCRIPTION, tr("Undecide conflict between deleted state")); Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java (revision 8836) @@ -270,5 +270,5 @@ */ class KeepMineAction extends AbstractAction implements ListSelectionListener { - public KeepMineAction() { + KeepMineAction() { ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagkeepmine"); if (icon != null) { @@ -302,5 +302,5 @@ */ class KeepTheirAction extends AbstractAction implements ListSelectionListener { - public KeepTheirAction() { + KeepTheirAction() { ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagkeeptheir"); if (icon != null) { @@ -339,5 +339,5 @@ private final Set synchronizedAdjustables; - public AdjustmentSynchronizer() { + AdjustmentSynchronizer() { synchronizedAdjustables = new HashSet<>(); } @@ -400,5 +400,5 @@ class UndecideAction extends AbstractAction implements ListSelectionListener { - public UndecideAction() { + UndecideAction() { ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagundecide"); if (icon != null) { Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java (revision 8836) @@ -406,5 +406,5 @@ class CancelAction extends AbstractAction { - public CancelAction() { + CancelAction() { putValue(Action.SHORT_DESCRIPTION, tr("Cancel conflict resolution")); putValue(Action.NAME, tr("Cancel")); @@ -465,5 +465,5 @@ private double dividerLocation; - public AutoAdjustingSplitPane(int newOrientation) { + AutoAdjustingSplitPane(int newOrientation) { super(newOrientation); addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, this); Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java (revision 8836) @@ -196,5 +196,5 @@ * Construct a new {@link EditorCellRenderer}. */ - public EditorCellRenderer() { + EditorCellRenderer() { setOpaque(true); } Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java (revision 8836) @@ -154,5 +154,5 @@ class ApplyRoleAction extends AbstractAction { - public ApplyRoleAction() { + ApplyRoleAction() { putValue(NAME, tr("Apply")); putValue(SMALL_ICON, ImageProvider.get("ok")); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (revision 8836) @@ -293,5 +293,5 @@ class SelectObjectsAction extends AbstractAction implements ListSelectionListener, ItemListener{ - public SelectObjectsAction() { + SelectObjectsAction() { putValue(NAME, tr("Select")); putValue(SHORT_DESCRIPTION, tr("Select all objects assigned to the currently selected changesets")); @@ -346,5 +346,5 @@ */ class ReadChangesetsAction extends AbstractAction implements ListSelectionListener, ItemListener{ - public ReadChangesetsAction() { + ReadChangesetsAction() { putValue(NAME, tr("Download")); putValue(SHORT_DESCRIPTION, tr("Download information about the selected changesets from the OSM server")); @@ -384,5 +384,5 @@ */ class CloseOpenChangesetsAction extends AbstractAction implements ListSelectionListener, ItemListener { - public CloseOpenChangesetsAction() { + CloseOpenChangesetsAction() { putValue(NAME, tr("Close open changesets")); putValue(SHORT_DESCRIPTION, tr("Closes the selected open changesets")); @@ -419,5 +419,5 @@ */ class ShowChangesetInfoAction extends AbstractAction implements ListSelectionListener, ItemListener { - public ShowChangesetInfoAction() { + ShowChangesetInfoAction() { putValue(NAME, tr("Show info")); putValue(SHORT_DESCRIPTION, tr("Open a web page for each selected changeset")); @@ -462,5 +462,5 @@ */ class LaunchChangesetManagerAction extends AbstractAction { - public LaunchChangesetManagerAction() { + LaunchChangesetManagerAction() { putValue(NAME, tr("Details")); putValue(SHORT_DESCRIPTION, tr("Opens the Changeset Manager window for the selected changesets")); @@ -561,5 +561,5 @@ class ChangesetDialogPopup extends ListPopupMenu { - public ChangesetDialogPopup(JList ... lists) { + ChangesetDialogPopup(JList ... lists) { super(lists); add(selectObjectsAction); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java (revision 8836) @@ -169,5 +169,5 @@ private JTree source; - public UndoRedoSelectionListener(JTree source) { + UndoRedoSelectionListener(JTree source) { this.source = source; } @@ -486,5 +486,5 @@ class MouseEventHandler extends PopupMenuLauncher { - public MouseEventHandler() { + MouseEventHandler() { super(new CommandStackPopup()); } @@ -499,5 +499,5 @@ private class CommandStackPopup extends JPopupMenu { - public CommandStackPopup() { + CommandStackPopup() { add(selectAction); add(selectAndZoomAction); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (revision 8836) @@ -352,5 +352,5 @@ * Constructs a new {@code MouseEventHandler}. */ - public MouseEventHandler() { + MouseEventHandler() { super(popupMenu); } @@ -374,5 +374,5 @@ * Constructs a new {@code ConflictListModel}. */ - public ConflictListModel() { + ConflictListModel() { listeners = new CopyOnWriteArrayList<>(); } @@ -431,5 +431,5 @@ class ResolveAction extends AbstractAction implements ListSelectionListener { - public ResolveAction() { + ResolveAction() { putValue(NAME, tr("Resolve")); putValue(SHORT_DESCRIPTION, tr("Open a merge dialog of all selected items in the list above.")); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (revision 8836) @@ -155,5 +155,5 @@ */ class CancelAction extends AbstractAction { - public CancelAction() { + CancelAction() { putValue(Action.SHORT_DESCRIPTION, tr("Cancel conflict resolution and close the dialog")); putValue(Action.NAME, tr("Cancel")); @@ -172,5 +172,5 @@ */ static class HelpAction extends AbstractAction { - public HelpAction() { + HelpAction() { putValue(Action.SHORT_DESCRIPTION, tr("Show help information")); putValue(Action.NAME, tr("Help")); @@ -190,5 +190,5 @@ */ class ApplyResolutionAction extends AbstractAction implements PropertyChangeListener { - public ApplyResolutionAction() { + ApplyResolutionAction() { putValue(Action.SHORT_DESCRIPTION, tr("Apply resolved conflicts and close the dialog")); putValue(Action.NAME, tr("Apply Resolution")); @@ -213,6 +213,6 @@ + "Click {0} to close anyway. Already
" + "resolved differences will not be applied.
" - + "Click {1} to return to resolving conflicts." - , options[0].toString(), options[1].toString() + + "Click {1} to return to resolving conflicts.", + options[0].toString(), options[1].toString() ), tr("Conflict not resolved completely"), Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java (revision 8836) @@ -316,5 +316,5 @@ } - public RelationMemberTableColumnModel() { + RelationMemberTableColumnModel() { createColumns(); } @@ -322,5 +322,5 @@ class OKAction extends AbstractAction { - public OKAction() { + OKAction() { putValue(NAME, tr("OK")); putValue(SMALL_ICON, ImageProvider.get("ok")); @@ -336,5 +336,5 @@ class CancelAction extends AbstractAction { - public CancelAction() { + CancelAction() { putValue(NAME, tr("Cancel")); putValue(SMALL_ICON, ImageProvider.get("cancel")); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java (revision 8836) @@ -431,5 +431,5 @@ private class HidingFilterAction extends AbstractFilterAction { - public HidingFilterAction() { + HidingFilterAction() { putValue(SHORT_DESCRIPTION, tr("Hiding filter")); HIDING_FILTER_SHORTCUT.setAccelerator(this); @@ -451,5 +451,4 @@ } } - } } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java (revision 8836) @@ -349,5 +349,5 @@ */ private static class OSDLabel extends JLabel { - public OSDLabel(String text) { + OSDLabel(String text) { super(text); setOpaque(true); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 8836) @@ -125,5 +125,5 @@ private int layerIndex = -1; - public ToggleLayerIndexVisibility(int layerIndex) { + ToggleLayerIndexVisibility(int layerIndex) { this.layerIndex = layerIndex; } @@ -981,5 +981,5 @@ private static class ActiveLayerCheckBox extends JCheckBox { - public ActiveLayerCheckBox() { + ActiveLayerCheckBox() { setHorizontalAlignment(javax.swing.SwingConstants.CENTER); ImageIcon blank = ImageProvider.get("dialogs/layerlist", "blank"); @@ -1001,5 +1001,5 @@ * Constructs a new {@code LayerVisibleCheckBox}. */ - public LayerVisibleCheckBox() { + LayerVisibleCheckBox() { setHorizontalAlignment(javax.swing.SwingConstants.RIGHT); iconEye = ImageProvider.get("dialogs/layerlist", "eye"); @@ -1037,5 +1037,5 @@ * Constructs a new {@code ActiveLayerCellRenderer}. */ - public ActiveLayerCellRenderer() { + ActiveLayerCellRenderer() { cb = new ActiveLayerCheckBox(); } @@ -1056,5 +1056,5 @@ * Constructs a new {@code LayerVisibleCellRenderer}. */ - public LayerVisibleCellRenderer() { + LayerVisibleCellRenderer() { this.cb = new LayerVisibleCheckBox(); } @@ -1072,5 +1072,5 @@ private final LayerVisibleCheckBox cb; - public LayerVisibleCellEditor(LayerVisibleCheckBox cb) { + LayerVisibleCellEditor(LayerVisibleCheckBox cb) { super(cb); this.cb = cb; @@ -1132,5 +1132,5 @@ private static class LayerNameCellEditor extends DefaultCellEditor { - public LayerNameCellEditor(DisableShortcutsOnFocusGainedTextField tf) { + LayerNameCellEditor(DisableShortcutsOnFocusGainedTextField tf) { super(tf); } @@ -1157,5 +1157,5 @@ */ class MoveUpAction extends AbstractAction implements IEnabledStateUpdating{ - public MoveUpAction() { + MoveUpAction() { putValue(NAME, tr("Move up")); putValue(SMALL_ICON, ImageProvider.get("dialogs", "up")); @@ -1179,5 +1179,5 @@ */ class MoveDownAction extends AbstractAction implements IEnabledStateUpdating { - public MoveDownAction() { + MoveDownAction() { putValue(NAME, tr("Move down")); putValue(SMALL_ICON, ImageProvider.get("dialogs", "down")); @@ -1666,5 +1666,5 @@ static class LayerList extends JTable { - public LayerList(TableModel dataModel) { + LayerList(TableModel dataModel) { super(dataModel); } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java (revision 8836) @@ -296,5 +296,5 @@ * Constructs a new {@code MyCheckBoxRenderer}. */ - public MyCheckBoxRenderer() { + MyCheckBoxRenderer() { setHorizontalAlignment(SwingConstants.CENTER); setVerticalAlignment(SwingConstants.CENTER); @@ -493,5 +493,5 @@ private boolean error; - public SaveToFileTask(StyleSource s, File file) { + SaveToFileTask(StyleSource s, File file) { super(tr("Reloading style sources")); this.s = s; @@ -536,5 +536,5 @@ se.url = file.getPath(); MapPaintStyles.addStyle(se); - tblStyles.getSelectionModel().setSelectionInterval(model.getRowCount() - 1 , model.getRowCount() - 1); + tblStyles.getSelectionModel().setSelectionInterval(model.getRowCount() - 1, model.getRowCount() - 1); model.ensureSelectedIsVisible(); } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java (revision 8836) @@ -268,5 +268,5 @@ * Constructs a new {@code NoteTableModel}. */ - public NoteTableModel() { + NoteTableModel() { data = new ArrayList<>(); } @@ -303,5 +303,5 @@ * Constructs a new {@code AddCommentAction}. */ - public AddCommentAction() { + AddCommentAction() { putValue(SHORT_DESCRIPTION, tr("Add comment")); putValue(NAME, tr("Comment")); @@ -335,5 +335,5 @@ * Constructs a new {@code CloseAction}. */ - public CloseAction() { + CloseAction() { putValue(SHORT_DESCRIPTION, tr("Close note")); putValue(NAME, tr("Close")); @@ -360,5 +360,5 @@ * Constructs a new {@code NewAction}. */ - public NewAction() { + NewAction() { putValue(SHORT_DESCRIPTION, tr("Create a new note")); putValue(NAME, tr("Create")); @@ -380,5 +380,5 @@ * Constructs a new {@code ReopenAction}. */ - public ReopenAction() { + ReopenAction() { putValue(SHORT_DESCRIPTION, tr("Reopen note")); putValue(NAME, tr("Reopen")); @@ -406,5 +406,5 @@ * Constructs a new {@code SortAction}. */ - public SortAction() { + SortAction() { putValue(SHORT_DESCRIPTION, tr("Sort notes")); putValue(NAME, tr("Sort")); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 8836) @@ -317,5 +317,5 @@ class MouseEventHandler extends PopupMenuLauncher { - public MouseEventHandler() { + MouseEventHandler() { super(popupMenu); } @@ -352,5 +352,5 @@ */ static class NewAction extends AbstractAction implements LayerChangeListener{ - public NewAction() { + NewAction() { putValue(SHORT_DESCRIPTION, tr("Create a new relation")); putValue(NAME, tr("New")); @@ -398,5 +398,5 @@ private transient SearchCompiler.Match filter; - public RelationListModel(DefaultListSelectionModel selectionModel) { + RelationListModel(DefaultListSelectionModel selectionModel) { this.selectionModel = selectionModel; } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (revision 8836) @@ -200,5 +200,5 @@ private boolean highlightEnabled = Main.pref.getBoolean("draw.target-highlight", true); - public MouseEventHandler() { + MouseEventHandler() { super(popupMenu); } @@ -293,5 +293,5 @@ * Constructs a new {@code SearchAction}. */ - public SearchAction() { + SearchAction() { putValue(NAME, tr("Search")); putValue(SHORT_DESCRIPTION, tr("Search for objects")); @@ -324,5 +324,5 @@ * Constructs a new {@code SelectAction}. */ - public SelectAction() { + SelectAction() { updateEnabledState(); } @@ -355,5 +355,5 @@ * Constructs a new {@code ShowHistoryAction}. */ - public ShowHistoryAction() { + ShowHistoryAction() { putValue(NAME, tr("History")); putValue(SHORT_DESCRIPTION, tr("Display the history of the selected objects.")); @@ -395,5 +395,5 @@ class ZoomToJOSMSelectionAction extends AbstractAction implements ListDataListener { - public ZoomToJOSMSelectionAction() { + ZoomToJOSMSelectionAction() { putValue(NAME, tr("Zoom to selection")); putValue(SHORT_DESCRIPTION, tr("Zoom to selection")); @@ -436,5 +436,5 @@ * Constructs a new {@code ZoomToListSelection}. */ - public ZoomToListSelection() { + ZoomToListSelection() { putValue(NAME, tr("Zoom to selected element(s)")); putValue(SHORT_DESCRIPTION, tr("Zoom to selected element(s)")); @@ -486,5 +486,5 @@ * @param selectionModel the selection model used in the list */ - public SelectionListModel(DefaultListSelectionModel selectionModel) { + SelectionListModel(DefaultListSelectionModel selectionModel) { this.selectionModel = selectionModel; } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 8836) @@ -610,5 +610,5 @@ * Constructs a new {@code DialogPopupMenu}. */ - public DialogPopupMenu() { + DialogPopupMenu() { alwaysShown.setSelected(buttonHiding == ButtonHidingType.ALWAYS_SHOWN); dynamic.setSelected(buttonHiding == ButtonHidingType.DYNAMIC); @@ -636,5 +636,5 @@ * Constructs a new {@code MouseEventHandler}. */ - public MouseEventHandler() { + MouseEventHandler() { super(popupMenu); } @@ -660,5 +660,5 @@ */ private class DetachedDialog extends JDialog { - public DetachedDialog() { + DetachedDialog() { super(JOptionPane.getFrameForComponent(Main.parent)); getContentPane().add(ToggleDialog.this); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java (revision 8836) @@ -137,5 +137,5 @@ public void run() { if (model.getRowCount() != 0) { - setTitle(trn("{0} Author", "{0} Authors", model.getRowCount() , model.getRowCount())); + setTitle(trn("{0} Author", "{0} Authors", model.getRowCount(), model.getRowCount())); } else { setTitle(tr("Authors")); @@ -156,5 +156,9 @@ class SelectUsersPrimitivesAction extends AbstractAction implements ListSelectionListener{ - public SelectUsersPrimitivesAction() { + + /** + * Constructs a new {@code SelectUsersPrimitivesAction}. + */ + SelectUsersPrimitivesAction() { putValue(NAME, tr("Select")); putValue(SHORT_DESCRIPTION, tr("Select objects submitted by this user")); @@ -189,5 +193,5 @@ class ShowUserInfoAction extends AbstractInfoAction implements ListSelectionListener { - public ShowUserInfoAction() { + ShowUserInfoAction() { super(false); putValue(NAME, tr("Show info")); @@ -286,5 +290,5 @@ private transient List data; - public UserTableModel() { + UserTableModel() { setColumnIdentifiers(new String[]{tr("Author"), tr("# Objects"), "%"}); data = new ArrayList<>(); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java (revision 8836) @@ -474,5 +474,5 @@ class MouseEventHandler extends PopupMenuLauncher { - public MouseEventHandler() { + MouseEventHandler() { super(popupMenu); } @@ -589,5 +589,5 @@ private boolean canceled; - public FixTask(Collection testErrors) { + FixTask(Collection testErrors) { super(tr("Fixing errors ..."), false /* don't ignore exceptions */); this.testErrors = testErrors == null ? new ArrayList() : testErrors; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java (revision 8836) @@ -349,5 +349,5 @@ */ static class CancelAction extends AbstractAction { - public CancelAction() { + CancelAction() { putValue(NAME, tr("Close")); putValue(SMALL_ICON, ImageProvider.get("cancel")); @@ -369,5 +369,5 @@ */ class QueryAction extends AbstractAction { - public QueryAction() { + QueryAction() { putValue(NAME, tr("Query")); putValue(SMALL_ICON, ImageProvider.get("dialogs", "search")); @@ -400,5 +400,5 @@ */ class RemoveFromCacheAction extends AbstractAction implements ListSelectionListener{ - public RemoveFromCacheAction() { + RemoveFromCacheAction() { putValue(NAME, tr("Remove from cache")); putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete")); @@ -420,5 +420,4 @@ public void valueChanged(ListSelectionEvent e) { updateEnabledState(); - } } @@ -429,5 +428,5 @@ */ class CloseSelectedChangesetsAction extends AbstractAction implements ListSelectionListener{ - public CloseSelectedChangesetsAction() { + CloseSelectedChangesetsAction() { putValue(NAME, tr("Close")); putValue(SMALL_ICON, ImageProvider.get("closechangeset")); @@ -471,5 +470,5 @@ */ class DownloadSelectedChangesetsAction extends AbstractAction implements ListSelectionListener{ - public DownloadSelectedChangesetsAction() { + DownloadSelectedChangesetsAction() { putValue(NAME, tr("Update changeset")); putValue(SMALL_ICON, ImageProvider.get("dialogs/changeset", "updatechangeset")); @@ -500,5 +499,5 @@ */ class DownloadSelectedChangesetContentAction extends AbstractAction implements ListSelectionListener{ - public DownloadSelectedChangesetContentAction() { + DownloadSelectedChangesetContentAction() { putValue(NAME, tr("Download changeset content")); putValue(SMALL_ICON, DOWNLOAD_CONTENT_ICON); @@ -538,5 +537,5 @@ class DownloadMyChangesets extends AbstractAction { - public DownloadMyChangesets() { + DownloadMyChangesets() { putValue(NAME, tr("My changesets")); putValue(SMALL_ICON, ImageProvider.get("dialogs/changeset", "downloadchangeset")); @@ -578,5 +577,5 @@ class MouseEventHandler extends PopupMenuLauncher { - public MouseEventHandler() { + MouseEventHandler() { super(new ChangesetTablePopupMenu()); } @@ -591,5 +590,5 @@ class ChangesetTablePopupMenu extends JPopupMenu { - public ChangesetTablePopupMenu() { + ChangesetTablePopupMenu() { add(actRemoveFromCacheAction); add(actCloseSelectedChangesetsAction); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java (revision 8836) @@ -192,5 +192,5 @@ */ class DownloadChangesetContentAction extends AbstractAction{ - public DownloadChangesetContentAction() { + DownloadChangesetContentAction() { putValue(NAME, tr("Download content")); putValue(SMALL_ICON, ChangesetCacheManager.DOWNLOAD_CONTENT_ICON); @@ -225,5 +225,5 @@ class ChangesetContentTablePopupMenu extends JPopupMenu { - public ChangesetContentTablePopupMenu() { + ChangesetContentTablePopupMenu() { add(actDownloadContentAction); add(actShowHistory); @@ -269,5 +269,5 @@ } - public ShowHistoryAction() { + ShowHistoryAction() { putValue(NAME, tr("Show history")); putValue(SMALL_ICON, ImageProvider.get("dialogs", "history")); @@ -319,5 +319,5 @@ class SelectInCurrentLayerAction extends AbstractAction implements ListSelectionListener, EditLayerChangeListener{ - public SelectInCurrentLayerAction() { + SelectInCurrentLayerAction() { putValue(NAME, tr("Select in layer")); putValue(SMALL_ICON, ImageProvider.get("dialogs", "select")); @@ -369,5 +369,5 @@ class ZoomInCurrentLayerAction extends AbstractAction implements ListSelectionListener, EditLayerChangeListener{ - public ZoomInCurrentLayerAction() { + ZoomInCurrentLayerAction() { putValue(NAME, tr("Zoom to in layer")); putValue(SMALL_ICON, ImageProvider.get("dialogs/autoscale", "selection")); @@ -433,5 +433,5 @@ } - public HeaderPanel() { + HeaderPanel() { build(); } @@ -443,5 +443,5 @@ private class DownloadAction extends AbstractAction { - public DownloadAction() { + DownloadAction() { putValue(NAME, tr("Download now")); putValue(SHORT_DESCRIPTION, tr("Download the changeset content")); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java (revision 8836) @@ -143,10 +143,10 @@ private final HistoryOsmPrimitive primitive; - public ChangesetContentEntry(ChangesetModificationType modificationType, HistoryOsmPrimitive primitive) { + ChangesetContentEntry(ChangesetModificationType modificationType, HistoryOsmPrimitive primitive) { this.modificationType = modificationType; this.primitive = primitive; } - public ChangesetContentEntry(ChangesetDataSetEntry entry) { + ChangesetContentEntry(ChangesetDataSetEntry entry) { this(entry.getModificationType(), entry.getPrimitive()); } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java (revision 8836) @@ -268,5 +268,5 @@ */ class RemoveFromCacheAction extends AbstractAction { - public RemoveFromCacheAction() { + RemoveFromCacheAction() { putValue(NAME, tr("Remove from cache")); putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete")); @@ -291,5 +291,5 @@ */ class DownloadChangesetContentAction extends AbstractAction { - public DownloadChangesetContentAction() { + DownloadChangesetContentAction() { putValue(NAME, tr("Download content")); putValue(SMALL_ICON, ChangesetCacheManager.DOWNLOAD_CONTENT_ICON); @@ -328,5 +328,5 @@ */ class UpdateChangesetAction extends AbstractAction{ - public UpdateChangesetAction() { + UpdateChangesetAction() { putValue(NAME, tr("Update changeset")); putValue(SMALL_ICON, ChangesetCacheManager.UPDATE_CONTENT_ICON); @@ -357,5 +357,5 @@ class SelectInCurrentLayerAction extends AbstractAction implements EditLayerChangeListener{ - public SelectInCurrentLayerAction() { + SelectInCurrentLayerAction() { putValue(NAME, tr("Select in layer")); putValue(SMALL_ICON, ImageProvider.get("dialogs", "select")); @@ -418,5 +418,5 @@ class ZoomInCurrentLayerAction extends AbstractAction implements EditLayerChangeListener{ - public ZoomInCurrentLayerAction() { + ZoomInCurrentLayerAction() { putValue(NAME, tr("Zoom to in layer")); putValue(SMALL_ICON, ImageProvider.get("dialogs/autoscale", "selection")); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionPanel.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionPanel.java (revision 8836) @@ -60,5 +60,5 @@ */ class UpdateChangesetDiscussionAction extends AbstractAction { - public UpdateChangesetDiscussionAction() { + UpdateChangesetDiscussionAction() { putValue(NAME, tr("Update changeset discussion")); putValue(SMALL_ICON, ChangesetCacheManager.UPDATE_CONTENT_ICON); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java (revision 8836) @@ -78,5 +78,5 @@ class DownloadAction extends AbstractAction implements DocumentListener{ - public DownloadAction() { + DownloadAction() { putValue(SMALL_ICON, ChangesetCacheManager.DOWNLOAD_CONTENT_ICON); putValue(SHORT_DESCRIPTION, tr("Download the changeset with the specified id, including the changeset content")); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (revision 8836) @@ -329,5 +329,5 @@ } - public OpenAndCloseStateRestrictionPanel() { + OpenAndCloseStateRestrictionPanel() { build(); } @@ -490,5 +490,5 @@ } - public UserRestrictionPanel() { + UserRestrictionPanel() { build(); } @@ -807,5 +807,5 @@ } - public TimeRestrictionPanel() { + TimeRestrictionPanel() { build(); } @@ -928,5 +928,5 @@ private static class BBoxRestrictionPanel extends BoundingBoxSelectionPanel { - public BBoxRestrictionPanel() { + BBoxRestrictionPanel() { setBorder(BorderFactory.createCompoundBorder( BorderFactory.createEmptyBorder(3, 3, 3, 3), @@ -972,5 +972,5 @@ } - public UidInputFieldValidator(JTextComponent tc) { + UidInputFieldValidator(JTextComponent tc) { super(tc); } @@ -1019,5 +1019,5 @@ } - public UserNameInputValidator(JTextComponent tc) { + UserNameInputValidator(JTextComponent tc) { super(tc); } @@ -1050,5 +1050,5 @@ } - public DateValidator(JTextComponent tc) { + DateValidator(JTextComponent tc) { super(tc); } @@ -1117,5 +1117,5 @@ } - public TimeValidator(JTextComponent tc) { + TimeValidator(JTextComponent tc) { super(tc); } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java (revision 8836) @@ -35,5 +35,5 @@ * Enumeration of basic, predefined queries */ - private static enum BasicQuery { + private enum BasicQuery { MOST_RECENT_CHANGESETS, MY_OPEN_CHANGESETS, Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java (revision 8836) @@ -158,5 +158,5 @@ class QueryAction extends AbstractAction { - public QueryAction() { + QueryAction() { putValue(NAME, tr("Query")); putValue(SMALL_ICON, ImageProvider.get("dialogs", "search")); @@ -207,5 +207,5 @@ class CancelAction extends AbstractAction { - public CancelAction() { + CancelAction() { putValue(NAME, tr("Cancel")); putValue(SMALL_ICON, ImageProvider.get("cancel")); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 8836) @@ -56,5 +56,4 @@ import org.openstreetmap.josm.actions.relation.SelectMembersAction; import org.openstreetmap.josm.actions.relation.SelectRelationAction; -import org.openstreetmap.josm.actions.search.SearchAction.SearchMode; import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting; import org.openstreetmap.josm.command.ChangeCommand; @@ -894,5 +893,5 @@ private static final String DELETE_FROM_RELATION_PREF = "delete_from_relation"; - public DeleteAction() { + DeleteAction() { super(tr("Delete"), /* ICON() */ "dialogs/delete", tr("Delete the selected key in all objects"), Shortcut.registerShortcut("properties:delete", tr("Delete Tags"), KeyEvent.VK_D, @@ -1002,5 +1001,5 @@ */ class AddAction extends JosmAction { - public AddAction() { + AddAction() { super(tr("Add"), /* ICON() */ "dialogs/add", tr("Add a new key/value pair to all objects"), Shortcut.registerShortcut("properties:add", tr("Add Tag"), KeyEvent.VK_A, @@ -1019,5 +1018,5 @@ */ class EditAction extends JosmAction implements ListSelectionListener { - public EditAction() { + EditAction() { super(tr("Edit"), /* ICON() */ "dialogs/edit", tr("Edit the value of the selected key for all objects"), Shortcut.registerShortcut("properties:edit", tr("Edit Tags"), KeyEvent.VK_S, @@ -1054,5 +1053,5 @@ class HelpAction extends AbstractAction { - public HelpAction() { + HelpAction() { putValue(NAME, tr("Go to OSM wiki for tag help (F1)")); putValue(SHORT_DESCRIPTION, tr("Launch browser with wiki help for selected object")); @@ -1155,5 +1154,5 @@ final StringProperty TAGINFO_URL_PROP = new StringProperty("taginfo.url", "https://taginfo.openstreetmap.org/"); - public TaginfoAction() { + TaginfoAction() { super(tr("Go to Taginfo"), "dialogs/taginfo", tr("Launch browser with Taginfo statistics for selected object"), null, false); } @@ -1184,5 +1183,5 @@ class PasteValueAction extends AbstractAction { - public PasteValueAction() { + PasteValueAction() { putValue(NAME, tr("Paste Value")); putValue(SHORT_DESCRIPTION, tr("Paste the value of the selected tag from clipboard")); @@ -1235,5 +1234,5 @@ * Constructs a new {@code CopyValueAction}. */ - public CopyValueAction() { + CopyValueAction() { putValue(NAME, tr("Copy Value")); putValue(SHORT_DESCRIPTION, tr("Copy the value of the selected tag to clipboard")); @@ -1249,5 +1248,5 @@ class CopyKeyValueAction extends AbstractCopyAction { - public CopyKeyValueAction() { + CopyKeyValueAction() { putValue(NAME, tr("Copy selected Key(s)/Value(s)")); putValue(SHORT_DESCRIPTION, tr("Copy the key and value of the selected tag(s) to clipboard")); @@ -1263,5 +1262,5 @@ class CopyAllKeyValueAction extends AbstractCopyAction { - public CopyAllKeyValueAction() { + CopyAllKeyValueAction() { putValue(NAME, tr("Copy all Keys/Values")); putValue(SHORT_DESCRIPTION, tr("Copy the key and value of all the tags to clipboard")); @@ -1281,5 +1280,5 @@ private final boolean sameType; - public SearchAction(boolean sameType) { + SearchAction(boolean sameType) { this.sameType = sameType; if (sameType) { Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 8836) @@ -424,5 +424,5 @@ protected Component componentUnderMouse; - public AbstractTagsDialog(Component parent, String title, String[] buttonTexts) { + AbstractTagsDialog(Component parent, String title, String[] buttonTexts) { super(parent, title, buttonTexts); addMouseListener(new PopupMenuLauncher(popupMenu)); @@ -541,5 +541,5 @@ private int commandCount; - public AddTagsDialog() { + AddTagsDialog() { super(Main.parent, tr("Add value?"), new String[] {tr("OK"), tr("Cancel")}); setButtonIcons(new String[] {"ok", "cancel"}); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (revision 8836) @@ -173,5 +173,5 @@ */ class EditAction extends AbstractAction implements TreeSelectionListener { - public EditAction() { + EditAction() { putValue(SHORT_DESCRIPTION, tr("Edit the relation the currently selected relation member refers to.")); putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit")); @@ -218,5 +218,5 @@ */ class DownloadAllChildRelationsAction extends AbstractAction{ - public DownloadAllChildRelationsAction() { + DownloadAllChildRelationsAction() { putValue(SHORT_DESCRIPTION, tr("Download all child relations (recursively)")); putValue(SMALL_ICON, ImageProvider.get("download")); @@ -240,5 +240,5 @@ */ class DownloadSelectedAction extends AbstractAction implements TreeSelectionListener { - public DownloadSelectedAction() { + DownloadSelectedAction() { putValue(SHORT_DESCRIPTION, tr("Download selected relations")); // FIXME: replace with better icon @@ -283,5 +283,5 @@ protected Exception lastException; - public DownloadTask(String title, Dialog parent) { + DownloadTask(String title, Dialog parent) { super(title, new PleaseWaitProgressMonitor(parent), false); } @@ -332,5 +332,5 @@ private final Set downloadedRelationIds; - public DownloadAllChildrenTask(Dialog parent, Relation r) { + DownloadAllChildrenTask(Dialog parent, Relation r) { super(tr("Download relation members"), parent); this.relation = r; @@ -443,5 +443,5 @@ private final Set relations; - public DownloadRelationSetTask(Dialog parent, Set relations) { + DownloadRelationSetTask(Dialog parent, Set relations) { super(tr("Download relation members"), parent); this.relations = relations; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 8836) @@ -827,5 +827,5 @@ class AddSelectedAtStartAction extends AddFromSelectionAction implements TableModelListener { - public AddSelectedAtStartAction() { + AddSelectedAtStartAction() { putValue(SHORT_DESCRIPTION, tr("Add all objects selected in the current dataset before the first member")); @@ -858,5 +858,5 @@ class AddSelectedAtEndAction extends AddFromSelectionAction implements TableModelListener { - public AddSelectedAtEndAction() { + AddSelectedAtEndAction() { putValue(SHORT_DESCRIPTION, tr("Add all objects selected in the current dataset after the last member")); putValue(SMALL_ICON, ImageProvider.get("dialogs/conflict", "copyendright")); @@ -891,5 +891,5 @@ * Constructs a new {@code AddSelectedBeforeSelection}. */ - public AddSelectedBeforeSelection() { + AddSelectedBeforeSelection() { putValue(SHORT_DESCRIPTION, tr("Add all objects selected in the current dataset before the first selected member")); @@ -929,5 +929,5 @@ class AddSelectedAfterSelection extends AddFromSelectionAction implements TableModelListener, ListSelectionListener { - public AddSelectedAfterSelection() { + AddSelectedAfterSelection() { putValue(SHORT_DESCRIPTION, tr("Add all objects selected in the current dataset after the last selected member")); @@ -970,5 +970,5 @@ * Constructs a new {@code RemoveSelectedAction}. */ - public RemoveSelectedAction() { + RemoveSelectedAction() { putValue(SHORT_DESCRIPTION, tr("Remove all members referring to one of the selected objects")); putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "deletemembers")); @@ -1005,5 +1005,5 @@ */ class SelectedMembersForSelectionAction extends AbstractAction implements TableModelListener { - public SelectedMembersForSelectionAction() { + SelectedMembersForSelectionAction() { putValue(SHORT_DESCRIPTION, tr("Select relation members which refer to objects in the current selection")); putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "selectmembers")); @@ -1041,5 +1041,5 @@ */ class SelectPrimitivesForSelectedMembersAction extends AbstractAction implements ListSelectionListener { - public SelectPrimitivesForSelectedMembersAction() { + SelectPrimitivesForSelectedMembersAction() { putValue(SHORT_DESCRIPTION, tr("Select objects for selected relation members")); putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "selectprimitives")); @@ -1063,5 +1063,5 @@ class SortAction extends AbstractAction implements TableModelListener { - public SortAction() { + SortAction() { String tooltip = tr("Sort the relation members"); putValue(SMALL_ICON, ImageProvider.get("dialogs", "sort")); @@ -1090,5 +1090,5 @@ class SortBelowAction extends AbstractAction implements TableModelListener, ListSelectionListener { - public SortBelowAction() { + SortBelowAction() { putValue(SMALL_ICON, ImageProvider.get("dialogs", "sort_below")); putValue(NAME, tr("Sort below")); @@ -1118,5 +1118,5 @@ class ReverseAction extends AbstractAction implements TableModelListener { - public ReverseAction() { + ReverseAction() { putValue(SHORT_DESCRIPTION, tr("Reverse the order of the relation members")); putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "reverse")); @@ -1143,5 +1143,5 @@ class MoveUpAction extends AbstractAction implements ListSelectionListener { - public MoveUpAction() { + MoveUpAction() { String tooltip = tr("Move the currently selected members up"); putValue(SMALL_ICON, ImageProvider.get("dialogs", "moveup")); @@ -1165,5 +1165,5 @@ class MoveDownAction extends AbstractAction implements ListSelectionListener { - public MoveDownAction() { + MoveDownAction() { String tooltip = tr("Move the currently selected members down"); putValue(SMALL_ICON, ImageProvider.get("dialogs", "movedown")); @@ -1187,5 +1187,5 @@ class RemoveAction extends AbstractAction implements ListSelectionListener { - public RemoveAction() { + RemoveAction() { String tooltip = tr("Remove the currently selected members from this relation"); putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete")); @@ -1210,5 +1210,5 @@ class DeleteCurrentRelationAction extends AbstractAction implements PropertyChangeListener{ - public DeleteCurrentRelationAction() { + DeleteCurrentRelationAction() { putValue(SHORT_DESCRIPTION, tr("Delete the currently edited relation")); putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete")); @@ -1322,5 +1322,5 @@ tr("Yes, create a conflict and close"), ImageProvider.get("ok"), - tr("Click to create a conflict and close this relation editor") , + tr("Click to create a conflict and close this relation editor"), null /* no specific help topic */ ), @@ -1328,5 +1328,5 @@ tr("No, continue editing"), ImageProvider.get("cancel"), - tr("Click to return to the relation editor and to resume relation editing") , + tr("Click to return to the relation editor and to resume relation editing"), null /* no specific help topic */ ) @@ -1365,5 +1365,5 @@ class ApplyAction extends SavingAction { - public ApplyAction() { + ApplyAction() { putValue(SHORT_DESCRIPTION, tr("Apply the current updates")); putValue(SMALL_ICON, ImageProvider.get("save")); @@ -1399,5 +1399,5 @@ class OKAction extends SavingAction { - public OKAction() { + OKAction() { putValue(SHORT_DESCRIPTION, tr("Apply the updates and close the dialog")); putValue(SMALL_ICON, ImageProvider.get("ok")); @@ -1436,5 +1436,5 @@ class CancelAction extends SavingAction { - public CancelAction() { + CancelAction() { putValue(SHORT_DESCRIPTION, tr("Cancel the updates and close the dialog")); putValue(SMALL_ICON, ImageProvider.get("cancel")); @@ -1487,5 +1487,5 @@ tr("Yes, save the changes and close"), ImageProvider.get("ok"), - tr("Click to save the changes and close this relation editor") , + tr("Click to save the changes and close this relation editor"), null /* no specific help topic */ ), @@ -1493,5 +1493,5 @@ tr("No, discard the changes and close"), ImageProvider.get("cancel"), - tr("Click to discard the changes and close this relation editor") , + tr("Click to discard the changes and close this relation editor"), null /* no specific help topic */ ), @@ -1499,5 +1499,5 @@ tr("Cancel, continue editing"), ImageProvider.get("cancel"), - tr("Click to return to the relation editor and to resume relation editing") , + tr("Click to return to the relation editor and to resume relation editing"), null /* no specific help topic */ ) @@ -1520,5 +1520,5 @@ class AddTagAction extends AbstractAction { - public AddTagAction() { + AddTagAction() { putValue(SHORT_DESCRIPTION, tr("Add an empty tag")); putValue(SMALL_ICON, ImageProvider.get("dialogs", "add")); @@ -1533,5 +1533,5 @@ class DownloadIncompleteMembersAction extends AbstractAction implements TableModelListener { - public DownloadIncompleteMembersAction() { + DownloadIncompleteMembersAction() { String tooltip = tr("Download all incomplete members"); putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "downloadincomplete")); @@ -1567,5 +1567,5 @@ class DownloadSelectedIncompleteMembersAction extends AbstractAction implements ListSelectionListener, TableModelListener{ - public DownloadSelectedIncompleteMembersAction() { + DownloadSelectedIncompleteMembersAction() { putValue(SHORT_DESCRIPTION, tr("Download selected incomplete members")); putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "downloadincompleteselected")); @@ -1604,5 +1604,5 @@ class SetRoleAction extends AbstractAction implements ListSelectionListener, DocumentListener { - public SetRoleAction() { + SetRoleAction() { putValue(SHORT_DESCRIPTION, tr("Sets a role for the selected members")); putValue(SMALL_ICON, ImageProvider.get("apply")); @@ -1684,5 +1684,5 @@ */ class DuplicateRelationAction extends AbstractAction { - public DuplicateRelationAction() { + DuplicateRelationAction() { putValue(SHORT_DESCRIPTION, tr("Create a copy of this relation and open it in another editor window")); // FIXME provide an icon @@ -1706,5 +1706,5 @@ */ class EditAction extends AbstractAction implements ListSelectionListener { - public EditAction() { + EditAction() { putValue(SHORT_DESCRIPTION, tr("Edit the relation the currently selected relation member refers to")); putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit")); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java (revision 8836) @@ -231,5 +231,5 @@ private class SelectPreviousGapAction extends AbstractAction { - public SelectPreviousGapAction() { + SelectPreviousGapAction() { putValue(NAME, tr("Select previous Gap")); putValue(SHORT_DESCRIPTION, tr("Select the previous relation member which gives rise to a gap")); @@ -250,5 +250,5 @@ private class SelectNextGapAction extends AbstractAction { - public SelectNextGapAction() { + SelectNextGapAction() { putValue(NAME, tr("Select next Gap")); putValue(SHORT_DESCRIPTION, tr("Select the next relation member which gives rise to a gap")); @@ -272,5 +272,5 @@ * Constructs a new {@code ZoomToGapAction}. */ - public ZoomToGapAction() { + ZoomToGapAction() { putValue(NAME, tr("Zoom to Gap")); putValue(SHORT_DESCRIPTION, tr("Zoom to the gap in the way sequence")); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java (revision 8836) @@ -86,5 +86,5 @@ */ class ReloadAction extends AbstractAction implements ListDataListener { - public ReloadAction() { + ReloadAction() { putValue(SHORT_DESCRIPTION, tr("Load parent relations")); putValue(SMALL_ICON, ImageProvider.get("dialogs", "refresh")); @@ -140,5 +140,5 @@ */ class EditAction extends AbstractAction implements ListSelectionListener { - public EditAction() { + EditAction() { putValue(SHORT_DESCRIPTION, tr("Edit the currently selected relation")); putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit")); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java (revision 8836) @@ -47,5 +47,5 @@ public final OsmDataLayer layer; - public DialogContext(OsmDataLayer layer, Relation relation) { + DialogContext(OsmDataLayer layer, Relation relation) { this.layer = layer; this.relation = relation; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java (revision 8836) @@ -109,5 +109,5 @@ private TreePath path; - public RelationLoader(Dialog dialog, Relation relation, TreePath path) { + RelationLoader(Dialog dialog, Relation relation, TreePath path) { super( tr("Load relation"), Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java (revision 8836) @@ -36,5 +36,5 @@ public final boolean oneWay; - public NodesWays(boolean oneWay) { + NodesWays(boolean oneWay) { this.oneWay = oneWay; } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java (revision 8836) @@ -51,5 +51,5 @@ private static final class GroupTreeNode extends DefaultMutableTreeNode { - public GroupTreeNode(Object userObject) { + GroupTreeNode(Object userObject) { super(userObject); } Index: /trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java (revision 8836) @@ -198,5 +198,5 @@ * Constructs a new {@code BookmarkCellRenderer}. */ - public BookmarkCellRenderer() { + BookmarkCellRenderer() { setOpaque(true); setIcon(ImageProvider.get("dialogs", "bookmark")); Index: /trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java (revision 8836) @@ -176,5 +176,5 @@ */ class AddAction extends AbstractAction { - public AddAction() { + AddAction() { putValue(NAME, tr("Create bookmark")); putValue(SMALL_ICON, ImageProvider.get("dialogs", "bookmark-new")); @@ -212,5 +212,5 @@ * Constructs a new {@code RemoveAction}. */ - public RemoveAction() { + RemoveAction() { putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete")); putValue(SHORT_DESCRIPTION, tr("Remove the currently selected bookmarks")); @@ -243,5 +243,5 @@ * Constructs a new {@code RenameAction}. */ - public RenameAction() { + RenameAction() { putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit")); putValue(SHORT_DESCRIPTION, tr("Rename the currently selected bookmark")); Index: /trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java (revision 8836) @@ -191,5 +191,5 @@ private JosmTextField tfLatValue; - public LatValueChecker(JosmTextField tfLatValue) { + LatValueChecker(JosmTextField tfLatValue) { this.tfLatValue = tfLatValue; } @@ -224,5 +224,5 @@ private JosmTextField tfLonValue; - public LonValueChecker(JosmTextField tfLonValue) { + LonValueChecker(JosmTextField tfLonValue) { this.tfLonValue = tfLonValue; } @@ -257,5 +257,5 @@ private JTextComponent tfTarget; - public SelectAllOnFocusHandler(JTextComponent tfTarget) { + SelectAllOnFocusHandler(JTextComponent tfTarget) { this.tfTarget = tfTarget; } Index: /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (revision 8836) @@ -474,5 +474,5 @@ class CancelAction extends AbstractAction { - public CancelAction() { + CancelAction() { putValue(NAME, tr("Cancel")); putValue(SMALL_ICON, ImageProvider.get("cancel")); @@ -492,5 +492,5 @@ class DownloadAction extends AbstractAction { - public DownloadAction() { + DownloadAction() { putValue(NAME, tr("Download")); putValue(SMALL_ICON, ImageProvider.get("download")); Index: /trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (revision 8836) @@ -85,5 +85,5 @@ public final String fourthcol; - public Server(String n, String u, String t, String f) { + Server(String n, String u, String t, String f) { name = n; url = u; @@ -288,5 +288,5 @@ class SearchAction extends AbstractAction implements DocumentListener { - public SearchAction() { + SearchAction() { putValue(NAME, tr("Search ...")); putValue(SMALL_ICON, ImageProvider.get("dialogs", "search")); @@ -334,5 +334,5 @@ private Exception lastException; - public NameQueryTask(String searchExpression) { + NameQueryTask(String searchExpression) { super(tr("Querying name server"), false /* don't ignore exceptions */); this.searchExpression = searchExpression; @@ -413,5 +413,5 @@ private transient ListSelectionModel selectionModel; - public NamedResultTableModel(ListSelectionModel selectionModel) { + NamedResultTableModel(ListSelectionModel selectionModel) { data = new ArrayList<>(); this.selectionModel = selectionModel; @@ -497,5 +497,5 @@ } - public NamedResultTableColumnModel() { + NamedResultTableColumnModel() { createColumns(); } @@ -517,5 +517,5 @@ * Constructs a new {@code NamedResultCellRenderer}. */ - public NamedResultCellRenderer() { + NamedResultCellRenderer() { setOpaque(true); setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2)); Index: /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (revision 8836) @@ -427,5 +427,5 @@ class OpenInBrowserAction extends AbstractAction { - public OpenInBrowserAction() { + OpenInBrowserAction() { putValue(SHORT_DESCRIPTION, tr("Open the current help page in an external browser")); putValue(SMALL_ICON, ImageProvider.get("help", "internet")); @@ -442,5 +442,5 @@ * Constructs a new {@code EditAction}. */ - public EditAction() { + EditAction() { putValue(SHORT_DESCRIPTION, tr("Edit the current help page")); putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit")); @@ -474,5 +474,5 @@ class ReloadAction extends AbstractAction { - public ReloadAction() { + ReloadAction() { putValue(SHORT_DESCRIPTION, tr("Reload the current help page")); putValue(SMALL_ICON, ImageProvider.get("dialogs", "refresh")); @@ -488,5 +488,5 @@ private transient HelpBrowserHistory history; - public BackAction(HelpBrowserHistory history) { + BackAction(HelpBrowserHistory history) { this.history = history; history.addObserver(this); @@ -510,5 +510,5 @@ private transient HelpBrowserHistory history; - public ForwardAction(HelpBrowserHistory history) { + ForwardAction(HelpBrowserHistory history) { this.history = history; history.addObserver(this); @@ -533,5 +533,5 @@ * Constructs a new {@code HomeAction}. */ - public HomeAction() { + HomeAction() { putValue(SHORT_DESCRIPTION, tr("Go to the JOSM help home page")); putValue(SMALL_ICON, ImageProvider.get("help", "home")); Index: /trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java (revision 8836) @@ -246,5 +246,5 @@ * @param role the role for this viewer. */ - public LatLonViewer(HistoryBrowserModel model, PointInTimeType role) { + LatLonViewer(HistoryBrowserModel model, PointInTimeType role) { build(); this.model = model; @@ -297,5 +297,5 @@ private JLabel lblDistance; - public DistanceViewer(HistoryBrowserModel model) { + DistanceViewer(HistoryBrowserModel model) { super(model, PointInTimeType.REFERENCE_POINT_IN_TIME); } Index: /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java (revision 8836) @@ -154,5 +154,5 @@ class CloseAction extends AbstractAction { - public CloseAction() { + CloseAction() { putValue(NAME, tr("Close")); putValue(SHORT_DESCRIPTION, tr("Close the dialog")); @@ -173,5 +173,5 @@ class ReloadAction extends AbstractAction { - public ReloadAction() { + ReloadAction() { putValue(NAME, tr("Reload")); putValue(SHORT_DESCRIPTION, tr("Reload the history from the server")); Index: /trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java (revision 8836) @@ -201,5 +201,5 @@ private final ShowHistoryAction showHistoryAction; - public NodeListPopupMenu() { + NodeListPopupMenu() { zoomToNodeAction = new ZoomToNodeAction(); add(zoomToNodeAction); @@ -223,5 +223,5 @@ * Constructs a new {@code ZoomToNodeAction}. */ - public ZoomToNodeAction() { + ZoomToNodeAction() { putValue(NAME, tr("Zoom to node")); putValue(SHORT_DESCRIPTION, tr("Zoom to this node in the current data layer")); @@ -269,5 +269,5 @@ * Constructs a new {@code ShowHistoryAction}. */ - public ShowHistoryAction() { + ShowHistoryAction() { putValue(NAME, tr("Show history")); putValue(SHORT_DESCRIPTION, tr("Open a history browser with the history of this node")); @@ -319,9 +319,10 @@ class InternalPopupMenuLauncher extends PopupMenuLauncher { - public InternalPopupMenuLauncher() { + InternalPopupMenuLauncher() { super(popupMenu); } - @Override protected int checkTableSelection(JTable table, Point p) { + @Override + protected int checkTableSelection(JTable table, Point p) { int row = super.checkTableSelection(table, p); popupMenu.prepare(primitiveIdAtRow(table.getModel(), row)); @@ -334,5 +335,5 @@ private ShowHistoryAction showHistoryAction; - public DoubleClickAdapter(JTable table) { + DoubleClickAdapter(JTable table) { this.table = table; showHistoryAction = new ShowHistoryAction(); Index: /trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java (revision 8836) @@ -49,5 +49,5 @@ } - public Item(DiffItemType state, Object value) { + Item(DiffItemType state, Object value) { this.state = state; this.value = state == DiffItemType.EMPTY ? null : value; @@ -64,5 +64,5 @@ boolean referenceReversed = false; - public TwoColumnDiff(Object[] reference, Object[] current) { + TwoColumnDiff(Object[] reference, Object[] current) { this.reference = Utils.copyArray(reference); this.current = Utils.copyArray(current); Index: /trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (revision 8836) @@ -248,5 +248,5 @@ private Integer id; - public OpenChangesetDialogAction() { + OpenChangesetDialogAction() { super(tr("Changeset"), new ImageProvider("dialogs/changeset", "changesetmanager").resetMaxSize(new Dimension(16, 16)).get()); putValue(SHORT_DESCRIPTION, tr("Opens the Changeset Manager window for the selected changesets")); Index: /trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java (revision 8836) @@ -155,5 +155,5 @@ * Constructs a new {@code ChangesetInfoAction}. */ - public ChangesetInfoAction() { + ChangesetInfoAction() { super(true); putValue(NAME, tr("Changeset info")); @@ -192,5 +192,5 @@ * Constructs a new {@code UserInfoAction}. */ - public UserInfoAction() { + UserInfoAction() { super(true); putValue(NAME, tr("User info")); @@ -233,5 +233,5 @@ * Constructs a new {@code VersionTablePopupMenu}. */ - public VersionTablePopupMenu() { + VersionTablePopupMenu() { super(); build(); Index: /trunk/src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java (revision 8836) @@ -50,5 +50,5 @@ * Constructs a new {@code ActionFlagsTableCell}. */ - public ActionFlagsTableCell() { + ActionFlagsTableCell() { checkBoxes[0] = new JCheckBox(tr("Upload")); checkBoxes[1] = new JCheckBox(tr("Save")); Index: /trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java (revision 8836) @@ -301,5 +301,5 @@ */ class RefreshAction extends AbstractAction { - public RefreshAction() { + RefreshAction() { putValue(SHORT_DESCRIPTION, tr("Load the list of your open changesets from the server")); putValue(SMALL_ICON, ImageProvider.get("dialogs", "refresh")); @@ -318,5 +318,5 @@ */ class CloseChangesetAction extends AbstractAction implements ItemListener{ - public CloseChangesetAction() { + CloseChangesetAction() { putValue(SMALL_ICON, ImageProvider.get("closechangeset")); putValue(SHORT_DESCRIPTION, tr("Close the currently selected open changeset")); Index: /trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java (revision 8836) @@ -119,5 +119,5 @@ class CloseAction extends AbstractAction implements ListSelectionListener { - public CloseAction() { + CloseAction() { putValue(NAME, tr("Close changesets")); putValue(SMALL_ICON, ImageProvider.get("closechangeset")); @@ -145,5 +145,5 @@ class CancelAction extends AbstractAction { - public CancelAction() { + CancelAction() { putValue(NAME, tr("Cancel")); putValue(SMALL_ICON, ImageProvider.get("cancel")); Index: /trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java (revision 8836) @@ -278,5 +278,5 @@ } - public OsmApiCredentialsPanel(CredentialDialog owner) { + OsmApiCredentialsPanel(CredentialDialog owner) { super(owner); build(); @@ -299,5 +299,5 @@ } - public OtherHostCredentialsPanel(CredentialDialog owner, String host) { + OtherHostCredentialsPanel(CredentialDialog owner, String host) { super(owner); this.host = host; @@ -321,5 +321,5 @@ } - public HttpProxyCredentialsPanel(CredentialDialog owner) { + HttpProxyCredentialsPanel(CredentialDialog owner) { super(owner); build(); @@ -349,5 +349,5 @@ protected JTextField nextTF; - public TFKeyListener(CredentialDialog owner, JTextField currentTF, JTextField nextTF) { + TFKeyListener(CredentialDialog owner, JTextField currentTF, JTextField nextTF) { this.owner = owner; this.currentTF = currentTF; @@ -382,5 +382,5 @@ class OKAction extends AbstractAction { - public OKAction() { + OKAction() { putValue(NAME, tr("Authenticate")); putValue(SHORT_DESCRIPTION, tr("Authenticate with the supplied username and password")); @@ -396,5 +396,5 @@ class CancelAction extends AbstractAction { - public CancelAction() { + CancelAction() { putValue(NAME, tr("Cancel")); putValue(SHORT_DESCRIPTION, tr("Cancel authentication")); Index: /trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java (revision 8836) @@ -62,5 +62,5 @@ * permitted, and indicates that the cause is nonexistent or unknown.) */ - public DownloadException(String message, Throwable cause) { + DownloadException(String message, Throwable cause) { super(message, cause); } Index: /trunk/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java (revision 8836) @@ -46,5 +46,5 @@ /** constructor that sets the default on each element **/ - public LayerNameAndFilePathTableCell() { + LayerNameAndFilePathTableCell() { setLayout(new GridBagLayout()); @@ -217,5 +217,5 @@ private class LaunchFileChooserAction extends AbstractAction { - public LaunchFileChooserAction() { + LaunchFileChooserAction() { putValue(NAME, "..."); putValue(SHORT_DESCRIPTION, tr("Launch a file chooser to select a file")); Index: /trunk/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java (revision 8836) @@ -81,5 +81,5 @@ private static class ClearAction extends AbstractAction { - public ClearAction() { + ClearAction() { super(tr("Clear")); putValue(SHORT_DESCRIPTION, tr("Clear the list of recently opened files")); Index: /trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java (revision 8836) @@ -28,5 +28,5 @@ * @throws IllegalArgumentException if layer is null */ - public SaveLayerInfo(AbstractModifiableLayer layer) { + SaveLayerInfo(AbstractModifiableLayer layer) { CheckParameterUtil.ensureParameterNotNull(layer, "layer"); this.layer = layer; Index: /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (revision 8836) @@ -55,5 +55,5 @@ public class SaveLayersDialog extends JDialog implements TableModelListener { - public static enum UserAction { + public enum UserAction { /** save/upload layers was successful, proceed with operation */ PROCEED, @@ -196,5 +196,5 @@ } - public LayerListWarningMessagePanel(String msg, List infos) { + LayerListWarningMessagePanel(String msg, List infos) { build(); lblMessage.setText(msg); @@ -301,5 +301,5 @@ class CancelAction extends AbstractAction { - public CancelAction() { + CancelAction() { putValue(NAME, tr("Cancel")); putValue(SHORT_DESCRIPTION, tr("Close this dialog and resume editing in JOSM")); @@ -333,5 +333,5 @@ class DiscardAndProceedAction extends AbstractAction implements PropertyChangeListener { - public DiscardAndProceedAction() { + DiscardAndProceedAction() { initForDiscardAndExit(); } @@ -375,5 +375,5 @@ private final transient Image upldDis = new BufferedImage(is, is, BufferedImage.TYPE_4BYTE_ABGR); - public SaveAndProceedAction() { + SaveAndProceedAction() { // get disabled versions of icons new JLabel(ImageProvider.get("save")).getDisabledIcon().paintIcon(new JPanel(), saveDis.getGraphics(), 0, 0); Index: /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTable.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTable.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTable.java (revision 8836) @@ -11,5 +11,5 @@ class SaveLayersTable extends JTable implements PropertyChangeListener { - public SaveLayersTable(SaveLayersModel model) { + SaveLayersTable(SaveLayersModel model) { super(model, new SaveLayersTableColumnModel()); putClientProperty("terminateEditOnFocusLost", Boolean.TRUE); Index: /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java (revision 8836) @@ -28,5 +28,5 @@ * Constructs a new {@code RecommendedActionsTableCell}. */ - public RecommendedActionsTableCell() { + RecommendedActionsTableCell() { pnlEmpty.setPreferredSize(new Dimension(1, 19)); needsUpload.setPreferredSize(new Dimension(needsUpload.getPreferredSize().width, 19)); @@ -72,5 +72,5 @@ * Constructs a new {@code SaveLayersTableColumnModel}. */ - public SaveLayersTableColumnModel() { + SaveLayersTableColumnModel() { build(); } Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java (revision 8836) @@ -24,5 +24,5 @@ * Constructs a new {@code UploadAndSaveProgressRenderer}. */ - public UploadAndSaveProgressRenderer() { + UploadAndSaveProgressRenderer() { build(); // initially not visible Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 8836) @@ -381,5 +381,5 @@ */ class UploadAction extends AbstractAction { - public UploadAction() { + UploadAction() { putValue(NAME, tr("Upload Changes")); putValue(SMALL_ICON, ImageProvider.get("upload")); @@ -504,5 +504,5 @@ */ class CancelAction extends AbstractAction { - public CancelAction() { + CancelAction() { putValue(NAME, tr("Cancel")); putValue(SMALL_ICON, ImageProvider.get("cancel")); Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java (revision 8836) @@ -184,9 +184,9 @@ } - public OsmPrimitiveList() { + OsmPrimitiveList() { this(new OsmPrimitiveListModel()); } - public OsmPrimitiveList(OsmPrimitiveListModel model) { + OsmPrimitiveList(OsmPrimitiveListModel model) { super(model); init(); @@ -257,5 +257,5 @@ class CancelAction extends AbstractAction { - public CancelAction() { + CancelAction() { putValue(Action.SHORT_DESCRIPTION, tr("Cancel uploading")); putValue(Action.NAME, tr("Cancel")); @@ -275,5 +275,5 @@ class ContinueAction extends AbstractAction implements ListSelectionListener { - public ContinueAction() { + ContinueAction() { putValue(Action.SHORT_DESCRIPTION, tr("Continue uploading")); putValue(Action.NAME, tr("Continue")); Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java (revision 8836) @@ -147,5 +147,5 @@ * Constructs a new {@code PrimitiveList}. */ - public PrimitiveList() { + PrimitiveList() { super(new PrimitiveListModel()); } @@ -165,9 +165,9 @@ * Constructs a new {@code PrimitiveListModel}. */ - public PrimitiveListModel() { + PrimitiveListModel() { primitives = new ArrayList<>(); } - public PrimitiveListModel(List primitives) { + PrimitiveListModel(List primitives) { setPrimitives(primitives); } Index: /trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (revision 8836) @@ -377,5 +377,5 @@ private class AutoZoomAction extends AbstractAction implements LayerAction { - public AutoZoomAction() { + AutoZoomAction() { super(tr("Auto Zoom")); } @@ -400,5 +400,5 @@ private class AutoLoadTilesAction extends AbstractAction implements LayerAction { - public AutoLoadTilesAction() { + AutoLoadTilesAction() { super(tr("Auto load tiles")); } @@ -422,5 +422,5 @@ private class LoadAllTilesAction extends AbstractAction { - public LoadAllTilesAction() { + LoadAllTilesAction() { super(tr("Load All Tiles")); } @@ -434,5 +434,5 @@ private class LoadErroneusTilesAction extends AbstractAction { - public LoadErroneusTilesAction() { + LoadErroneusTilesAction() { super(tr("Load All Error Tiles")); } @@ -446,5 +446,5 @@ private class ZoomToNativeLevelAction extends AbstractAction { - public ZoomToNativeLevelAction() { + ZoomToNativeLevelAction() { super(tr("Zoom to native resolution")); } @@ -459,5 +459,5 @@ private class ZoomToBestAction extends AbstractAction { - public ZoomToBestAction() { + ZoomToBestAction() { super(tr("Change resolution")); } @@ -487,5 +487,5 @@ private Field field; - public BooleanButtonModel(Field field) { + BooleanButtonModel(Field field) { this.field = field; } @@ -1236,5 +1236,5 @@ Tile t; if (create) { - t = getOrCreateTile(x, y , zoom); + t = getOrCreateTile(x, y, zoom); } else { t = getTile(x, y, zoom); @@ -1329,5 +1329,5 @@ private final TileSet[] tileSets; private final TileSetInfo[] tileSetInfos; - public DeepTileSet(EastNorth topLeft, EastNorth botRight, int minZoom, int maxZoom) { + DeepTileSet(EastNorth topLeft, EastNorth botRight, int minZoom, int maxZoom) { this.topLeft = topLeft; this.botRight = botRight; Index: /trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java (revision 8836) @@ -266,4 +266,5 @@ /** * Returns the currently set gamma value. + * @return the currently set gamma value */ public double getGamma() { @@ -273,4 +274,5 @@ /** * Sets a new gamma value, {@code 1} stands for no correction. + * @param gamma new gamma value */ public void setGamma(double gamma) { @@ -294,4 +296,7 @@ } } catch (IllegalArgumentException ignore) { + if (Main.isTraceEnabled()) { + Main.trace(ignore.getMessage()); + } } final int type = image.getTransparency() == Transparency.OPAQUE ? BufferedImage.TYPE_INT_RGB : BufferedImage.TYPE_INT_ARGB; @@ -304,4 +309,5 @@ /** * Returns the currently set gamma value. + * @return the currently set gamma value */ public double getGamma() { @@ -311,4 +317,5 @@ /** * Sets a new gamma value, {@code 1} stands for no correction. + * @param gamma new gamma value */ public void setGamma(double gamma) { Index: /trunk/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java (revision 8836) @@ -49,5 +49,5 @@ private transient WeakReference lastLayer; - public JumpToMarker(JumpToMarkerLayer layer, Shortcut shortcut) { + JumpToMarker(JumpToMarkerLayer layer, Shortcut shortcut) { this.layer = (Layer) layer; this.multikeyShortcut = shortcut; Index: /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 8836) @@ -825,5 +825,5 @@ private class ConsistencyTestAction extends AbstractAction { - public ConsistencyTestAction() { + ConsistencyTestAction() { super(tr("Dataset consistency test")); } Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 8836) @@ -213,5 +213,5 @@ private File file; - public GpxDataWrapper(String name, GpxData data, File file) { + GpxDataWrapper(String name, GpxData data, File file) { this.name = name; this.data = data; @@ -779,5 +779,5 @@ private boolean doRepaint; - public StatusBarUpdater(boolean doRepaint) { + StatusBarUpdater(boolean doRepaint) { this.doRepaint = doRepaint; } Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 8836) @@ -120,5 +120,5 @@ } - public Loader(Collection selection, GpxLayer gpxLayer) { + Loader(Collection selection, GpxLayer gpxLayer) { super(tr("Extracting GPS locations from EXIF")); this.selection = selection; @@ -127,5 +127,6 @@ } - @Override protected void realRun() throws IOException { + @Override + protected void realRun() throws IOException { progressMonitor.subTask(tr("Starting directory scan")); Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (revision 8836) @@ -62,5 +62,5 @@ private int orientation; - public LoadImageRunnable(File file, Integer orientation) { + LoadImageRunnable(File file, Integer orientation) { this.file = file; this.orientation = orientation == null ? -1 : orientation; Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (revision 8836) @@ -204,5 +204,5 @@ private final String action; - public ImageAction(String action, ImageIcon icon, String toolTipText) { + ImageAction(String action, ImageIcon icon, String toolTipText) { this.action = action; putValue(SHORT_DESCRIPTION, toolTipText); Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java (revision 8836) @@ -30,5 +30,5 @@ private GeoImageLayer layer; private MediaTracker tracker; - private ICacheAccess cache; + private ICacheAccess cache; private boolean cacheOff = Main.pref.getBoolean("geoimage.noThumbnailCache", false); Index: /trunk/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java (revision 8836) @@ -73,5 +73,5 @@ }; - private Timer t = new Timer(200 , new ActionListener() { + private 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 8835) +++ /trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java (revision 8836) @@ -106,5 +106,5 @@ private Rectangle2D r = new Rectangle2D.Double(); - public CalculateDownloadArea() { + CalculateDownloadArea() { super(tr("Calculating Download Area"), displayProgress ? null : NullProgressMonitor.INSTANCE, false); } Index: /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (revision 8836) @@ -196,15 +196,5 @@ } - URL url = null; - if (uri != null) { - try { - url = new URL(uri); - } catch (MalformedURLException e) { - // Try a relative file:// url, if the link is not in an URL-compatible form - if (relativePath != null) { - url = Utils.fileToURL(new File(relativePath.getParentFile(), uri)); - } - } - } + URL url = uriToUrl(uri, relativePath); String urlStr = url == null ? "" : url.toString(); @@ -229,12 +219,25 @@ return Arrays.asList(marker, audioMarker); } else if (urlStr.endsWith(".png") || urlStr.endsWith(".jpg") || urlStr.endsWith(".jpeg") || urlStr.endsWith(".gif")) { - final ImageMarker imageMarker = new ImageMarker(wpt.getCoor(), url, parentLayer, time, offset); - return Arrays.asList(marker, imageMarker); + return Arrays.asList(marker, new ImageMarker(wpt.getCoor(), url, parentLayer, time, offset)); } else { - final WebMarker webMarker = new WebMarker(wpt.getCoor(), url, parentLayer, time, offset); - return Arrays.asList(marker, webMarker); + return Arrays.asList(marker, new WebMarker(wpt.getCoor(), url, parentLayer, time, offset)); } } }); + } + + private static URL uriToUrl(String uri, File relativePath) { + URL url = null; + if (uri != null) { + try { + url = new URL(uri); + } catch (MalformedURLException e) { + // Try a relative file:// url, if the link is not in an URL-compatible form + if (relativePath != null) { + url = Utils.fileToURL(new File(relativePath.getParentFile(), uri)); + } + } + } + return url; } Index: /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (revision 8836) @@ -505,5 +505,5 @@ * Constructs a new {@code SynchronizeAudio} action. */ - public SynchronizeAudio() { + SynchronizeAudio() { super(tr("Synchronize Audio"), ImageProvider.get("audio-sync")); putValue("help", ht("/Action/SynchronizeAudio")); @@ -542,5 +542,5 @@ private class MoveAudio extends AbstractAction { - public MoveAudio() { + MoveAudio() { super(tr("Make Audio Marker at Play Head"), ImageProvider.get("addmarkers")); putValue("help", ht("/Action/MakeAudioMarkerAtPlayHead")); @@ -565,4 +565,3 @@ } } - } Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java (revision 8836) @@ -132,5 +132,5 @@ public int size; - public FontDescriptor(String name, int style, int size) { + FontDescriptor(String name, int style, int size) { this.name = name; this.style = style; Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java (revision 8836) @@ -33,5 +33,5 @@ private JCheckBoxMenuItem button; - public MapPaintAction(StyleSource style) { + MapPaintAction(StyleSource style) { super(style.getDisplayString(), style.getIconProvider(), tr("Select the map painting styles"), null, true, "mappaint/" + style.getDisplayString(), true); Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java (revision 8836) @@ -87,5 +87,5 @@ * This is the operation that {@link KeyValueCondition} uses to match. */ - public static enum Op { + public enum Op { /** The value equals the given reference. */ EQ, @@ -170,5 +170,5 @@ * Context, where the condition applies. */ - public static enum Context { + public enum Context { /** * normal primitive selector, e.g. way[highway=residential] @@ -340,5 +340,5 @@ * This defines how {@link KeyCondition} matches a given key. */ - public static enum KeyMatchType { + public enum KeyMatchType { /** * The key needs to be equal to the given label. Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (revision 8836) @@ -128,5 +128,5 @@ * @param e the environment against which we match */ - public MatchingReferrerFinder(Environment e) { + MatchingReferrerFinder(Environment e) { this.e = e; } @@ -227,5 +227,5 @@ } - public MultipolygonOpenEndFinder(Environment e) { + MultipolygonOpenEndFinder(Environment e) { super(e); } @@ -245,5 +245,4 @@ } }; - } Index: /trunk/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java (revision 8836) @@ -25,5 +25,5 @@ private static class AuthorisationProcedureCellRenderer extends JLabel implements ListCellRenderer { - public AuthorisationProcedureCellRenderer() { + AuthorisationProcedureCellRenderer() { setOpaque(true); } Index: /trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java (revision 8836) @@ -337,5 +337,5 @@ */ class RunAuthorisationAction extends AbstractAction implements DocumentListener{ - public RunAuthorisationAction() { + RunAuthorisationAction() { putValue(NAME, tr("Authorize now")); putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small")); @@ -373,5 +373,5 @@ */ class BackAction extends AbstractAction { - public BackAction() { + BackAction() { putValue(NAME, tr("Back")); putValue(SHORT_DESCRIPTION, tr("Run the automatic authorization steps again")); @@ -389,5 +389,5 @@ */ class TestAccessTokenAction extends AbstractAction { - public TestAccessTokenAction() { + TestAccessTokenAction() { putValue(NAME, tr("Test Access Token")); putValue(SMALL_ICON, ImageProvider.get("logo")); @@ -406,5 +406,5 @@ private static class UserNameValidator extends AbstractTextComponentValidator { - public UserNameValidator(JTextComponent tc) { + UserNameValidator(JTextComponent tc) { super(tc); } @@ -427,5 +427,5 @@ private static class PasswordValidator extends AbstractTextComponentValidator { - public PasswordValidator(JTextComponent tc) { + PasswordValidator(JTextComponent tc) { super(tc); } @@ -450,5 +450,5 @@ private OsmOAuthAuthorizationClient authClient; - public FullyAutomaticAuthorisationTask(Component parent) { + FullyAutomaticAuthorisationTask(Component parent) { super(parent, tr("Authorize JOSM to access the OSM API"), false /* don't ignore exceptions */); } Index: /trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java (revision 8836) @@ -76,5 +76,5 @@ private static class UserNameValidator extends AbstractTextComponentValidator { - public UserNameValidator(JTextComponent tc) { + UserNameValidator(JTextComponent tc) { super(tc); } Index: /trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java (revision 8836) @@ -177,5 +177,5 @@ private static class AccessTokenKeyValidator extends AbstractTextComponentValidator { - public AccessTokenKeyValidator(JTextComponent tc) { + AccessTokenKeyValidator(JTextComponent tc) { super(tc); } @@ -197,5 +197,5 @@ private static class AccessTokenSecretValidator extends AbstractTextComponentValidator { - public AccessTokenSecretValidator(JTextComponent tc) { + AccessTokenSecretValidator(JTextComponent tc) { super(tc); } @@ -246,5 +246,5 @@ */ class TestAccessTokenAction extends AbstractAction implements PropertyChangeListener { - public TestAccessTokenAction() { + TestAccessTokenAction() { putValue(NAME, tr("Test Access Token")); putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small")); Index: /trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java (revision 8836) @@ -323,5 +323,5 @@ * Constructs a new {@code CancelAction}. */ - public CancelAction() { + CancelAction() { putValue(NAME, tr("Cancel")); putValue(SMALL_ICON, ImageProvider.get("cancel")); @@ -345,5 +345,5 @@ * Constructs a new {@code AcceptAccessTokenAction}. */ - public AcceptAccessTokenAction() { + AcceptAccessTokenAction() { putValue(NAME, tr("Accept Access Token")); putValue(SMALL_ICON, ImageProvider.get("ok")); Index: /trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java (revision 8836) @@ -117,5 +117,5 @@ * Constructs a new {@code RetrieveRequestTokenPanel}. */ - public RetrieveRequestTokenPanel() { + RetrieveRequestTokenPanel() { build(); } @@ -214,5 +214,5 @@ * Constructs a new {@code RetrieveAccessTokenPanel}. */ - public RetrieveAccessTokenPanel() { + RetrieveAccessTokenPanel() { build(); } @@ -284,5 +284,5 @@ */ class BackAction extends AbstractAction { - public BackAction() { + BackAction() { putValue(NAME, tr("Back")); putValue(SHORT_DESCRIPTION, tr("Go back to step 1/3")); @@ -305,5 +305,5 @@ * Constructs a new {@code ShowAccessTokenPanel}. */ - public ShowAccessTokenPanel() { + ShowAccessTokenPanel() { build(); } @@ -362,5 +362,5 @@ */ class RestartAction extends AbstractAction { - public RestartAction() { + RestartAction() { putValue(NAME, tr("Restart")); putValue(SHORT_DESCRIPTION, tr("Go back to step 1/3")); @@ -384,5 +384,5 @@ class RetrieveRequestTokenAction extends AbstractAction{ - public RetrieveRequestTokenAction() { + RetrieveRequestTokenAction() { putValue(NAME, tr("Retrieve Request Token")); putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small")); @@ -420,5 +420,5 @@ class RetrieveAccessTokenAction extends AbstractAction { - public RetrieveAccessTokenAction() { + RetrieveAccessTokenAction() { putValue(NAME, tr("Retrieve Access Token")); putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small")); @@ -457,5 +457,5 @@ class TestAccessTokenAction extends AbstractAction { - public TestAccessTokenAction() { + TestAccessTokenAction() { putValue(NAME, tr("Test Access Token")); putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small")); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java (revision 8836) @@ -140,5 +140,5 @@ class CancelAction extends AbstractAction { - public CancelAction() { + CancelAction() { putValue(NAME, tr("Cancel")); putValue(SMALL_ICON, ImageProvider.get("cancel")); @@ -159,5 +159,5 @@ class OKAction extends AbstractAction { - public OKAction() { + OKAction() { putValue(NAME, tr("OK")); putValue(SMALL_ICON, ImageProvider.get("ok")); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (revision 8836) @@ -821,5 +821,5 @@ class LaunchFileChooserAction extends AbstractAction { - public LaunchFileChooserAction() { + LaunchFileChooserAction() { putValue(SMALL_ICON, ImageProvider.get("open")); putValue(SHORT_DESCRIPTION, tr("Launch a file chooser to select a file")); @@ -870,5 +870,5 @@ class NewActiveSourceAction extends AbstractAction { - public NewActiveSourceAction() { + NewActiveSourceAction() { putValue(NAME, tr("New")); putValue(SHORT_DESCRIPTION, getStr(I18nString.NEW_SOURCE_ENTRY_TOOLTIP)); @@ -900,5 +900,5 @@ class RemoveActiveSourcesAction extends AbstractAction implements ListSelectionListener { - public RemoveActiveSourcesAction() { + RemoveActiveSourcesAction() { putValue(NAME, tr("Remove")); putValue(SHORT_DESCRIPTION, getStr(I18nString.REMOVE_SOURCE_TOOLTIP)); @@ -923,5 +923,5 @@ class EditActiveSourceAction extends AbstractAction implements ListSelectionListener { - public EditActiveSourceAction() { + EditActiveSourceAction() { putValue(NAME, tr("Edit")); putValue(SHORT_DESCRIPTION, getStr(I18nString.EDIT_SOURCE_TOOLTIP)); @@ -970,5 +970,5 @@ private final int increment; - public MoveUpDownAction(boolean isDown) { + MoveUpDownAction(boolean isDown) { increment = isDown ? 1 : -1; putValue(SMALL_ICON, isDown ? ImageProvider.get("dialogs", "down") : ImageProvider.get("dialogs", "up")); @@ -998,5 +998,5 @@ class ActivateSourcesAction extends AbstractAction implements ListSelectionListener { - public ActivateSourcesAction() { + ActivateSourcesAction() { putValue(SHORT_DESCRIPTION, getStr(I18nString.ACTIVATE_TOOLTIP)); putValue(SMALL_ICON, ImageProvider.get("preferences", "activate-right")); @@ -1051,5 +1051,5 @@ class ResetAction extends AbstractAction { - public ResetAction() { + ResetAction() { putValue(NAME, tr("Reset")); putValue(SHORT_DESCRIPTION, tr("Reset to default")); @@ -1067,5 +1067,5 @@ private final transient List sourceProviders; - public ReloadSourcesAction(String url, List sourceProviders) { + ReloadSourcesAction(String url, List sourceProviders) { putValue(NAME, tr("Reload")); putValue(SHORT_DESCRIPTION, tr(getStr(I18nString.RELOAD_ALL_AVAILABLE), url)); @@ -1185,5 +1185,5 @@ class NewIconPathAction extends AbstractAction { - public NewIconPathAction() { + NewIconPathAction() { putValue(NAME, tr("New")); putValue(SHORT_DESCRIPTION, tr("Add a new icon path")); @@ -1199,5 +1199,5 @@ class RemoveIconPathAction extends AbstractAction implements ListSelectionListener { - public RemoveIconPathAction() { + RemoveIconPathAction() { putValue(NAME, tr("Remove")); putValue(SHORT_DESCRIPTION, tr("Remove the selected icon paths")); @@ -1222,5 +1222,5 @@ class EditIconPathAction extends AbstractAction implements ListSelectionListener { - public EditIconPathAction() { + EditIconPathAction() { putValue(NAME, tr("Edit")); putValue(SHORT_DESCRIPTION, tr("Edit the selected icon path")); @@ -1290,5 +1290,5 @@ private final List sources = new ArrayList<>(); - public SourceLoader(String url, List sourceProviders) { + SourceLoader(String url, List sourceProviders) { super(tr(getStr(I18nString.LOADING_SOURCES_FROM), url)); this.url = url; @@ -1478,5 +1478,5 @@ } - public FileOrUrlCellEditor(boolean isFile) { + FileOrUrlCellEditor(boolean isFile) { this.isFile = isFile; listeners = new CopyOnWriteArrayList<>(); @@ -1554,5 +1554,5 @@ class LaunchFileChooserAction extends AbstractAction { - public LaunchFileChooserAction() { + LaunchFileChooserAction() { putValue(NAME, "..."); putValue(SHORT_DESCRIPTION, tr("Launch a file chooser to select a file")); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (revision 8836) @@ -644,5 +644,5 @@ private final List actions; - public ActionTransferable(List actions) { + ActionTransferable(List actions) { this.actions = actions; } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java (revision 8836) @@ -411,5 +411,5 @@ private final String type; - public ImportProfileAction(String name, File file, String type) { + ImportProfileAction(String name, File file, String type) { super(name); this.file = file; Index: /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java (revision 8836) @@ -138,5 +138,5 @@ class NewEntryAction extends AbstractAction { - public NewEntryAction() { + NewEntryAction() { putValue(NAME, tr("New")); putValue(SHORT_DESCRIPTION, tr("add entry")); @@ -151,5 +151,5 @@ class RemoveEntryAction extends AbstractAction implements ListSelectionListener { - public RemoveEntryAction() { + RemoveEntryAction() { putValue(NAME, tr("Remove")); putValue(SHORT_DESCRIPTION, tr("Remove the selected entry")); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java (revision 8836) @@ -158,5 +158,5 @@ class NewEntryAction extends AbstractAction { - public NewEntryAction() { + NewEntryAction() { putValue(NAME, tr("New")); putValue(SHORT_DESCRIPTION, tr("add entry")); @@ -171,5 +171,5 @@ class RemoveEntryAction extends AbstractAction implements ListSelectionListener { - public RemoveEntryAction() { + RemoveEntryAction() { putValue(NAME, tr("Remove")); putValue(SHORT_DESCRIPTION, tr("Remove the selected entry")); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java (revision 8836) @@ -264,5 +264,5 @@ private class AllSettingsTableModel extends DefaultTableModel { - public AllSettingsTableModel() { + AllSettingsTableModel() { setColumnIdentifiers(new String[]{tr("Key"), tr("Value")}); } @@ -347,5 +347,5 @@ private static class SettingCellEditor extends DefaultCellEditor { - public SettingCellEditor() { + SettingCellEditor() { super(new JosmTextField()); } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java (revision 8836) @@ -79,5 +79,5 @@ private final List data = new ArrayList<>(); - public LanguageComboBoxModel() { + LanguageComboBoxModel() { data.add(0, null); data.addAll(Arrays.asList(I18n.getAvailableTranslations())); @@ -117,5 +117,5 @@ * Constructs a new {@code LanguageCellRenderer}. */ - public LanguageCellRenderer() { + LanguageCellRenderer() { this.dispatch = new DefaultListCellRenderer(); } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (revision 8836) @@ -131,5 +131,5 @@ pane.addTab(tr("Settings"), buildSettingsPanel()); pane.addTab(tr("Offset bookmarks"), new OffsetBookmarksPanel(gui)); - pane.addTab(tr("Cache contents") , new CacheContentsPanel()); + pane.addTab(tr("Cache contents"), new CacheContentsPanel()); loadSettings(); p.add(pane, GBC.std().fill(GBC.BOTH)); @@ -239,5 +239,5 @@ private transient List layers; - public ImageryURLTableCellRenderer(List layers) { + ImageryURLTableCellRenderer(List layers) { this.layers = layers; } @@ -480,5 +480,5 @@ private final ImageryInfo.ImageryType type; - public NewEntryAction(ImageryInfo.ImageryType type) { + NewEntryAction(ImageryInfo.ImageryType type) { putValue(NAME, type.toString()); putValue(SHORT_DESCRIPTION, tr("Add a new {0} entry by entering the URL", type.toString())); @@ -542,5 +542,5 @@ * Constructs a new {@code RemoveEntryAction}. */ - public RemoveEntryAction() { + RemoveEntryAction() { putValue(NAME, tr("Remove")); putValue(SHORT_DESCRIPTION, tr("Remove entry")); @@ -572,5 +572,5 @@ * Constructs a new {@code ActivateAction}. */ - public ActivateAction() { + ActivateAction() { putValue(NAME, tr("Activate")); putValue(SHORT_DESCRIPTION, tr("copy selected defaults")); @@ -639,5 +639,5 @@ * Constructs a new {@code ReloadAction}. */ - public ReloadAction() { + ReloadAction() { putValue(SHORT_DESCRIPTION, tr("reload defaults")); putValue(SMALL_ICON, ImageProvider.get("dialogs", "refresh")); @@ -813,5 +813,5 @@ * Constructs a new {@code OffsetBookmarksPanel}. */ - public OffsetBookmarksPanel(final PreferenceTabbedPane gui) { + OffsetBookmarksPanel(final PreferenceTabbedPane gui) { super(new GridBagLayout()); final JTable list = new JTable(model) { @@ -872,5 +872,5 @@ * Constructs a new {@code OffsetsBookmarksModel}. */ - public OffsetsBookmarksModel() { + OffsetsBookmarksModel() { setColumnIdentifiers(new String[] {tr("Projection"), tr("Layer"), tr("Name"), tr("Easting"), tr("Northing")}); } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/WMSLayerTree.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/WMSLayerTree.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/WMSLayerTree.java (revision 8836) @@ -133,5 +133,5 @@ } } - layerTree.firePropertyChange("selectedLayers", /*dummy values*/ false , true); + layerTree.firePropertyChange("selectedLayers", /*dummy values*/ false, true); } } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java (revision 8836) @@ -88,5 +88,5 @@ private static final String iconpref = "mappaint.icon.sources"; - public MapPaintSourceEditor() { + MapPaintSourceEditor() { super(SourceType.MAP_PAINT_STYLE, Main.getJOSMWebsite()+"/styles", styleSourceProviders, true); } @@ -176,4 +176,7 @@ } } catch (RuntimeException ignore) { + if (Main.isTraceEnabled()) { + Main.trace(ignore.getMessage()); + } } return null; Index: /trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java (revision 8836) @@ -185,5 +185,5 @@ private static final String iconpref = "taggingpreset.icon.sources"; - public TaggingPresetSourceEditor() { + TaggingPresetSourceEditor() { super(SourceType.TAGGING_PRESET, Main.getJOSMWebsite()+"/presets", presetSourceProviders, true); } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java (revision 8836) @@ -112,5 +112,5 @@ public final transient PluginInformation pi; - public JPluginCheckBox(final PluginInformation pi, boolean selected) { + JPluginCheckBox(final PluginInformation pi, boolean selected) { this.pi = pi; setSelected(selected); @@ -127,5 +127,5 @@ private final JPluginCheckBox cb; - public PluginCbActionListener(JPluginCheckBox cb) { + PluginCbActionListener(JPluginCheckBox cb) { this.cb = cb; } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java (revision 8836) @@ -329,5 +329,5 @@ * Constructs a new {@code DownloadAvailablePluginsAction}. */ - public DownloadAvailablePluginsAction() { + DownloadAvailablePluginsAction() { putValue(NAME, tr("Download list")); putValue(SHORT_DESCRIPTION, tr("Download the list of available plugins")); @@ -365,5 +365,5 @@ */ class UpdateSelectedPluginsAction extends AbstractAction { - public UpdateSelectedPluginsAction() { + UpdateSelectedPluginsAction() { putValue(NAME, tr("Update plugins")); putValue(SHORT_DESCRIPTION, tr("Update the selected plugins")); @@ -467,5 +467,5 @@ */ class ConfigureSitesAction extends AbstractAction { - public ConfigureSitesAction() { + ConfigureSitesAction() { putValue(NAME, tr("Configure sites...")); putValue(SHORT_DESCRIPTION, tr("Configure the list of sites where plugins are downloaded from")); @@ -581,5 +581,5 @@ } - public PluginConfigurationSitesPanel() { + PluginConfigurationSitesPanel() { build(); } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java (revision 8836) @@ -56,5 +56,5 @@ private transient ActionListener listener; - public CodeSelectionPanel(String initialCode, ActionListener listener) { + CodeSelectionPanel(String initialCode, ActionListener listener) { this.listener = listener; data = new ArrayList<>(Projections.getAllProjectionCodes()); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java (revision 8836) @@ -51,5 +51,5 @@ private HistoryComboBox cbInput; - public PreferencePanel(String initialText, ActionListener listener) { + PreferencePanel(String initialText, ActionListener listener) { build(initialText, listener); } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java (revision 8836) @@ -37,5 +37,5 @@ private class LambertCC9CBPanel extends CBPanel { - public LambertCC9CBPanel(String[] entries, int initialIndex, String label, ActionListener listener) { + LambertCC9CBPanel(String[] entries, int initialIndex, String label, ActionListener listener) { super(entries, initialIndex, label, listener); this.add(new JLabel(ImageProvider.get("data/projection", "LambertCC9Zones.png")), GBC.eol().fill(GBC.HORIZONTAL)); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java (revision 8836) @@ -32,5 +32,5 @@ private class LambertCBPanel extends CBPanel { - public LambertCBPanel(String[] entries, int initialIndex, String label, ActionListener listener) { + LambertCBPanel(String[] entries, int initialIndex, String label, ActionListener listener) { super(entries, initialIndex, label, listener); this.add(new JLabel(ImageProvider.get("data/projection", "Departements_Lambert4Zones.png")), GBC.eol().fill(GBC.HORIZONTAL)); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java (revision 8836) @@ -51,5 +51,5 @@ public JRadioButton north, south; - public UTMPanel(String[] entries, int initialIndex, String label, ActionListener listener) { + UTMPanel(String[] entries, int initialIndex, String label, ActionListener listener) { super(entries, initialIndex, label, listener); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java (revision 8836) @@ -183,5 +183,5 @@ * Constructs a new {@code NotYetAuthorisedPanel}. */ - public NotYetAuthorisedPanel() { + NotYetAuthorisedPanel() { build(); } @@ -305,5 +305,5 @@ * Constructs a new {@code AlreadyAuthorisedPanel}. */ - public AlreadyAuthorisedPanel() { + AlreadyAuthorisedPanel() { build(); refreshView(); @@ -315,5 +315,5 @@ */ private class AuthoriseNowAction extends AbstractAction { - public AuthoriseNowAction() { + AuthoriseNowAction() { putValue(NAME, tr("Authorize now")); putValue(SHORT_DESCRIPTION, tr("Click to step through the OAuth authorization process")); @@ -344,5 +344,5 @@ * Constructs a new {@code RenewAuthorisationAction}. */ - public RenewAuthorisationAction() { + RenewAuthorisationAction() { putValue(NAME, tr("New Access Token")); putValue(SHORT_DESCRIPTION, tr("Click to step through the OAuth authorization process and generate a new Access Token")); @@ -374,5 +374,5 @@ * Constructs a new {@code TestAuthorisationAction}. */ - public TestAuthorisationAction() { + TestAuthorisationAction() { putValue(NAME, tr("Test Access Token")); putValue(SHORT_DESCRIPTION, tr("Click test access to the OSM server with the current access token")); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java (revision 8836) @@ -170,5 +170,5 @@ private String lastTestedUrl = null; - public ValidateApiUrlAction() { + ValidateApiUrlAction() { putValue(NAME, tr("Validate")); putValue(SHORT_DESCRIPTION, tr("Test the API URL")); @@ -243,5 +243,5 @@ private static class ApiUrlValidator extends AbstractTextComponentValidator { - public ApiUrlValidator(JTextComponent tc) { + ApiUrlValidator(JTextComponent tc) { super(tc); } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (revision 8836) @@ -128,5 +128,5 @@ * Constructs a new {@code ScListModel}. */ - public ScListModel() { + ScListModel() { data = Shortcut.listAll(); } @@ -157,5 +157,5 @@ private boolean name; - public ShortcutTableCellRenderer(boolean name) { + ShortcutTableCellRenderer(boolean name) { this.name = name; } @@ -288,5 +288,5 @@ private PrefJPanel panel; - public CbAction(PrefJPanel panel) { + CbAction(PrefJPanel panel) { this.panel = panel; } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java (revision 8836) @@ -55,8 +55,8 @@ return false; } - + static class TagCheckerRulesSourceEditor extends SourceEditor { - public TagCheckerRulesSourceEditor() { + TagCheckerRulesSourceEditor() { super(SourceType.TAGCHECKER_RULE, Main.getJOSMWebsite()+"/rules", ruleSourceProviders, false); } @@ -122,5 +122,5 @@ } } - + /** * Helper class for validator tag checker rules preferences. @@ -143,5 +143,5 @@ public Collection getDefault() { List def = new ArrayList<>(); - + addDefault(def, "addresses", tr("Addresses"), tr("Checks for errors on addresses")); addDefault(def, "combinations", tr("Tag combinations"), tr("Checks for missing tag or suspicious combinations")); @@ -156,8 +156,8 @@ addDefault(def, "unnecessary", tr("Unnecessary tags"), tr("Checks for unnecessary tags")); addDefault(def, "wikipedia", tr("Wikipedia"), tr("Checks for wrong wikipedia tags")); - + return def; } - + private void addDefault(List defaults, String filename, String title, String description) { ExtendedSourceEntry i = new ExtendedSourceEntry(filename+".mapcss", "resource://data/validator/"+filename+".mapcss"); @@ -188,5 +188,5 @@ final ValidatorPreference valPref = gui.getValidatorPreference(); sources = new TagCheckerRulesSourceEditor(); - + valPref.addSubTab(this, tr("Tag checker rules"), sources, tr("Choose Tag checker rules to enable")); Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java (revision 8836) @@ -612,5 +612,5 @@ private int colMax; - public SelectionStateMemento() { + SelectionStateMemento() { rowMin = rowSelectionModel.getMinSelectionIndex(); rowMax = rowSelectionModel.getMaxSelectionIndex(); Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java (revision 8836) @@ -73,5 +73,5 @@ */ static class TagTableColumnModel extends DefaultTableColumnModel { - public TagTableColumnModel(DefaultListSelectionModel selectionModel) { + TagTableColumnModel(DefaultListSelectionModel selectionModel) { setSelectionModel(selectionModel); TableColumn col = null; @@ -196,5 +196,5 @@ class DeleteAction extends RunnableAction implements ListSelectionListener { - public DeleteAction() { + DeleteAction() { putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete")); putValue(SHORT_DESCRIPTION, tr("Delete the selection in the tag table")); @@ -285,5 +285,5 @@ */ class AddAction extends RunnableAction implements PropertyChangeListener{ - public AddAction() { + AddAction() { putValue(SMALL_ICON, ImageProvider.get("dialogs", "add")); putValue(SHORT_DESCRIPTION, tr("Add a new tag")); @@ -320,5 +320,5 @@ */ class PasteAction extends RunnableAction implements PropertyChangeListener{ - public PasteAction() { + PasteAction() { putValue(SMALL_ICON, ImageProvider.get("", "pastetags")); putValue(SHORT_DESCRIPTION, tr("Paste tags from buffer")); @@ -618,5 +618,5 @@ private KeyboardFocusManager focusManager; - public CellEditorRemover(KeyboardFocusManager fm) { + CellEditorRemover(KeyboardFocusManager fm) { this.focusManager = fm; } Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (revision 8836) @@ -344,5 +344,5 @@ private static class PresetDialog extends ExtendedDialog { - public PresetDialog(Component content, String title, ImageIcon icon, boolean disableApply, boolean showNewRelation) { + PresetDialog(Component content, String title, ImageIcon icon, boolean disableApply, boolean showNewRelation) { super(Main.parent, title, showNewRelation ? Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java (revision 8836) @@ -264,5 +264,5 @@ * Enum denoting how a match (see {@link TaggingPresetItem#matches}) is performed. */ - public static enum MatchType { + public enum MatchType { /** Neutral, i.e., do not consider this item for matching. */ @@ -1435,5 +1435,5 @@ private String delimiter; - public ConcatenatingJList(String del, PresetListEntry[] o) { + ConcatenatingJList(String del, PresetListEntry[] o) { super(o); delimiter = del; Index: /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java (revision 8836) @@ -53,5 +53,5 @@ * @param comboBox the combobox */ - public AutoCompletingComboBoxDocument(final JosmComboBox comboBox) { + AutoCompletingComboBoxDocument(final JosmComboBox comboBox) { this.comboBox = comboBox; } Index: /trunk/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java (revision 8836) @@ -130,5 +130,5 @@ } - public LatitudeValidator(JTextComponent tc) { + LatitudeValidator(JTextComponent tc) { super(tc); } @@ -170,5 +170,5 @@ } - public LongitudeValidator(JTextComponent tc) { + LongitudeValidator(JTextComponent tc) { super(tc); } Index: /trunk/src/org/openstreetmap/josm/io/ChangesetClosedException.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/ChangesetClosedException.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/io/ChangesetClosedException.java (revision 8836) @@ -31,5 +31,5 @@ public static final String ERROR_HEADER_PATTERN = "The changeset (\\d+) was closed at (.*)"; - public static enum Source { + public enum Source { /** * The exception was thrown when a changeset was updated. This most likely means Index: /trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java (revision 8836) @@ -81,5 +81,5 @@ private final JsonObjectBuilder geomObj; - public GeometryPrimitiveVisitor(JsonObjectBuilder geomObj) { + GeometryPrimitiveVisitor(JsonObjectBuilder geomObj) { this.geomObj = geomObj; } Index: /trunk/src/org/openstreetmap/josm/io/NmeaReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/NmeaReader.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/io/NmeaReader.java (revision 8836) @@ -31,5 +31,5 @@ /** Handler for the different types that NMEA speaks. */ - public static enum NMEA_TYPE { + public enum NMEA_TYPE { /** RMC = recommended minimum sentence C. */ @@ -58,5 +58,5 @@ // GPVTG - public static enum GPVTG { + public enum GPVTG { COURSE(1), COURSE_REF(2), // true course COURSE_M(3), COURSE_M_REF(4), // magnetic course @@ -73,5 +73,5 @@ // The following only applies to GPRMC - public static enum GPRMC { + public enum GPRMC { TIME(1), /** Warning from the receiver (A = data ok, V = warning) */ @@ -97,5 +97,5 @@ // The following only applies to GPGGA - public static enum GPGGA { + public enum GPGGA { TIME(1), LATITUDE(2), LATITUDE_NAME(3), LONGITUDE(4), LONGITUDE_NAME(5), /** @@ -116,5 +116,5 @@ } - public static enum GPGSA { + public enum GPGSA { AUTOMATIC(1), FIX_TYPE(2), // 1 = not fixed, 2 = 2D fixed, 3 = 3D fixed) Index: /trunk/src/org/openstreetmap/josm/io/OsmApi.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 8836) @@ -168,5 +168,5 @@ private boolean fastFail; - public CapabilitiesCache(ProgressMonitor monitor, boolean fastFail) { + CapabilitiesCache(ProgressMonitor monitor, boolean fastFail) { super(CAPABILITIES + getBaseUrl().hashCode(), CacheCustomContent.INTERVAL_WEEKLY); this.monitor = monitor; Index: /trunk/src/org/openstreetmap/josm/io/OsmReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmReader.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/io/OsmReader.java (revision 8836) @@ -544,10 +544,10 @@ private static class OsmParsingException extends XMLStreamException { - public OsmParsingException(String msg, Location location) { + OsmParsingException(String msg, Location location) { super(msg); /* cannot use super(msg, location) because it messes with the message preventing localization */ this.location = location; } - public OsmParsingException(String msg, Location location, Throwable th) { + OsmParsingException(String msg, Location location, Throwable th) { super(msg, th); this.location = location; @@ -580,5 +580,5 @@ * @param location The parser location */ - public OsmParsingCanceledException(String msg, Location location) { + OsmParsingCanceledException(String msg, Location location) { super(msg, location); } Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (revision 8836) @@ -59,5 +59,5 @@ private int num; - public DeleteTagMarker(int num) { + DeleteTagMarker(int num) { this.num = num; } @@ -76,5 +76,5 @@ private final Map valueCount; - public ExistingValues(String tag) { + ExistingValues(String tag) { this.tag = tag; this.valueCount = new HashMap<>(); @@ -159,5 +159,5 @@ tm.setValueAt(tags[i][0], i, 1); tm.setValueAt(tags[i][1].isEmpty() ? new DeleteTagMarker(count[i]) : tags[i][1], i, 2); - tm.setValueAt(old , i, 3); + tm.setValueAt(old, i, 3); } @@ -226,5 +226,5 @@ } }); - tablePanel.add(c , GBC.eol().insets(20, 10, 0, 0)); + tablePanel.add(c, GBC.eol().insets(20, 10, 0, 0)); } setContent(tablePanel); Index: /trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java (revision 8836) @@ -62,5 +62,5 @@ private class LayerSaveAction extends AbstractAction { - public LayerSaveAction() { + LayerSaveAction() { putValue(SMALL_ICON, new ImageProvider("save").setWidth(16).get()); putValue(SHORT_DESCRIPTION, layer.requiresSaveToFile() ? Index: /trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java (revision 8836) @@ -52,10 +52,10 @@ static { - registerSessionLayerExporter(OsmDataLayer.class , OsmDataSessionExporter.class); - registerSessionLayerExporter(TMSLayer.class , ImagerySessionExporter.class); - registerSessionLayerExporter(WMSLayer.class , ImagerySessionExporter.class); - registerSessionLayerExporter(WMTSLayer.class , ImagerySessionExporter.class); - registerSessionLayerExporter(GpxLayer.class , GpxTracksSessionExporter.class); - registerSessionLayerExporter(GeoImageLayer.class , GeoImageSessionExporter.class); + registerSessionLayerExporter(OsmDataLayer.class, OsmDataSessionExporter.class); + registerSessionLayerExporter(TMSLayer.class, ImagerySessionExporter.class); + registerSessionLayerExporter(WMSLayer.class, ImagerySessionExporter.class); + registerSessionLayerExporter(WMTSLayer.class, ImagerySessionExporter.class); + registerSessionLayerExporter(GpxLayer.class, GpxTracksSessionExporter.class); + registerSessionLayerExporter(GeoImageLayer.class, GeoImageSessionExporter.class); registerSessionLayerExporter(MarkerLayer.class, MarkerSessionExporter.class); } Index: /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 8836) @@ -1471,5 +1471,5 @@ } - public UpdatePluginsMessagePanel() { + UpdatePluginsMessagePanel() { build(); } Index: /trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (revision 8836) @@ -133,5 +133,5 @@ * @param t the exception */ - public BugReporterThread(Throwable t) { + BugReporterThread(Throwable t) { super("Bug Reporter"); this.e = t; Index: /trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java (revision 8836) @@ -584,6 +584,6 @@ + "you tried to read, update, or delete. Either the respective object
" + "does not exist on the server or you are using an invalid URL to access
" - + "it. Please carefully check the server''s address ''{0}'' for typos." - , apiUrl); + + "it. Please carefully check the server''s address ''{0}'' for typos.", + apiUrl); Main.error(e); return "" + message + ""; Index: /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (revision 8836) @@ -95,5 +95,5 @@ * Position of an overlay icon */ - public static enum OverlayPosition { + public enum OverlayPosition { /** North west */ NORTHWEST, @@ -109,5 +109,5 @@ * Supported image types */ - public static enum ImageType { + public enum ImageType { /** Scalable vector graphics */ SVG, @@ -120,5 +120,5 @@ * @since 7687 */ - public static enum ImageSizes { + public enum ImageSizes { /** SMALL_ICON value of on Action */ SMALLICON, @@ -1075,5 +1075,5 @@ private final String result; - public SAXReturnException(String result) { + SAXReturnException(String result) { this.result = result; } Index: /trunk/src/org/openstreetmap/josm/tools/SubclassFilteredCollection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/SubclassFilteredCollection.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/tools/SubclassFilteredCollection.java (revision 8836) @@ -27,5 +27,5 @@ private S current; - public FilterIterator(Iterator iterator) { + FilterIterator(Iterator iterator) { this.iterator = iterator; } Index: /trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java (revision 8836) @@ -49,5 +49,5 @@ private final String namespace; - public AddNamespaceFilter(String namespace) { + AddNamespaceFilter(String namespace) { this.namespace = namespace; } @@ -60,7 +60,5 @@ super.startElement(uri, localName, qName, atts); } - - } - + } } @@ -190,5 +188,5 @@ private final Map methods = new HashMap<>(); - public Entry(Class klass, boolean onStart, boolean both) { + Entry(Class klass, boolean onStart, boolean both) { this.klass = klass; this.onStart = onStart; Index: /trunk/src/org/openstreetmap/josm/tools/date/FallbackDateParser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/date/FallbackDateParser.java (revision 8835) +++ /trunk/src/org/openstreetmap/josm/tools/date/FallbackDateParser.java (revision 8836) @@ -42,5 +42,5 @@ * Creates a new instance. */ - public FallbackDateParser() { + FallbackDateParser() { // Build a list of candidate date parsers. dateParsers = new ArrayList<>(formats.length); Index: /trunk/test/performance/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSourceFilterTest.java =================================================================== --- /trunk/test/performance/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSourceFilterTest.java (revision 8835) +++ /trunk/test/performance/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSourceFilterTest.java (revision 8836) @@ -27,5 +27,5 @@ * @param generator A generator to get the keys from. */ - public CssGenerator(KeyValueDataGenerator generator) { + CssGenerator(KeyValueDataGenerator generator) { this.generator = generator; } Index: /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java (revision 8835) +++ /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java (revision 8836) @@ -125,5 +125,5 @@ class SelectActionMock extends SelectAction { - public SelectActionMock(MapFrame mapFrame, DataSet dataSet, OsmDataLayer layer) { + SelectActionMock(MapFrame mapFrame, DataSet dataSet, OsmDataLayer layer) { super(mapFrame); try { Index: /trunk/test/unit/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJobTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJobTest.java (revision 8835) +++ /trunk/test/unit/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJobTest.java (revision 8836) @@ -17,5 +17,5 @@ private String url; - public TestCachedTileLoaderJob(String url) throws IOException { + TestCachedTileLoaderJob(String url) throws IOException { super(getCache(), 30000, 30000, null); this.url = url; Index: /trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java (revision 8835) +++ /trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java (revision 8836) @@ -229,5 +229,5 @@ LatLon expected = new LatLon(verifier.tileXYToLatLon(x, y, z + zoomOffset)); //System.out.println(z + "/" + x + "/" + y + " - result: " + result.toDisplayString() + " osmMercator: " + expected.toDisplayString()); - assertEquals("Longitude" , expected.lon(), result.lon(), 1e-04); + assertEquals("Longitude", expected.lon(), result.lon(), 1e-04); assertEquals("Latitude", expected.lat(), result.lat(), 1e-04); } Index: /trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java (revision 8835) +++ /trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java (revision 8836) @@ -47,5 +47,5 @@ public EastNorth en; - public ProjData(String name, double lon, double lat, double h1, double x, double y, double h2) { + ProjData(String name, double lon, double lat, double h1, double x, double y, double h2) { this.name = name; ll = new LatLon(lat, lon); Index: /trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java (revision 8835) +++ /trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java (revision 8836) @@ -92,5 +92,5 @@ Relation relation = getRelation("associatedStreet"); String actual = getConnections(wayConnectionTypeCalculator.updateLinks(relation.getMembers())); - Assert.assertEquals("[NONE, I, I, I, NONE, I]" , actual); + Assert.assertEquals("[NONE, I, I, I, NONE, I]", actual); actual = getConnections(wayConnectionTypeCalculator.updateLinks(sorter.sortMembers(relation.getMembers()))); Assert.assertEquals("[FORWARD, FORWARD, I, I, I, I]", actual); @@ -106,5 +106,3 @@ Assert.assertEquals("[BACKWARD, BACKWARD, BACKWARD, FPH FORWARD, FPH FORWARD, FPH FORWARD, FPH FORWARD]", actual); } - - } Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/ToolbarPreferencesTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/ToolbarPreferencesTest.java (revision 8835) +++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/ToolbarPreferencesTest.java (revision 8836) @@ -23,5 +23,5 @@ private static class TestAction extends AbstractAction implements ParameterizedAction { - public TestAction() { + TestAction() { putValue("toolbar", "action"); } Index: /trunk/test/unit/org/openstreetmap/josm/io/session/SessionWriterTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/io/session/SessionWriterTest.java (revision 8835) +++ /trunk/test/unit/org/openstreetmap/josm/io/session/SessionWriterTest.java (revision 8836) @@ -33,5 +33,5 @@ private static class OsmHeadlessJosExporter extends OsmDataSessionExporter { - public OsmHeadlessJosExporter(OsmDataLayer layer) { + OsmHeadlessJosExporter(OsmDataLayer layer) { super(layer); } @@ -44,5 +44,5 @@ private static class OsmHeadlessJozExporter extends OsmDataSessionExporter { - public OsmHeadlessJozExporter(OsmDataLayer layer) { + OsmHeadlessJozExporter(OsmDataLayer layer) { super(layer); } @@ -55,5 +55,5 @@ private static class GpxHeadlessJosExporter extends GpxTracksSessionExporter { - public GpxHeadlessJosExporter(GpxLayer layer) { + GpxHeadlessJosExporter(GpxLayer layer) { super(layer); } @@ -66,5 +66,5 @@ private static class GpxHeadlessJozExporter extends GpxTracksSessionExporter { - public GpxHeadlessJozExporter(GpxLayer layer) { + GpxHeadlessJozExporter(GpxLayer layer) { super(layer); } Index: /trunk/test/unit/org/openstreetmap/josm/tools/OsmUrlToBoundsTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/tools/OsmUrlToBoundsTest.java (revision 8835) +++ /trunk/test/unit/org/openstreetmap/josm/tools/OsmUrlToBoundsTest.java (revision 8836) @@ -55,5 +55,5 @@ public Bounds bounds; - public ParseTestItem(String url, Bounds bounds) { + ParseTestItem(String url, Bounds bounds) { this.url = url; this.bounds = bounds; @@ -79,4 +79,3 @@ } } - }