Changeset 8836 in josm for trunk


Ignore:
Timestamp:
2015-10-08T00:22:36+02:00 (9 years ago)
Author:
Don-vip
Message:

fix Checkstyle issues

Location:
trunk
Files:
196 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java

    r8513 r8836  
    6363         * Create an InvalidSelection exception with default message
    6464         */
    65         public InvalidSelection() {
     65        InvalidSelection() {
    6666            super(tr("Please select at least three nodes."));
    6767        }
    … …  
    7171         * @param msg Message that will be display to the user
    7272         */
    73         public InvalidSelection(String msg) {
     73        InvalidSelection(String msg) {
    7474            super(msg);
    7575        }
    … …  
    356356         * @throws InvalidSelection if nodes have same coordinates
    357357         */
    358         public Line(Node first, Node last) throws InvalidSelection {
     358        Line(Node first, Node last) throws InvalidSelection {
    359359            xM = first.getEastNorth().getX();
    360360            yM = first.getEastNorth().getY();
    … …  
    376376         * @throws InvalidSelection if nodes have same coordinates
    377377         */
    378         public Line(Way way) throws InvalidSelection {
     378        Line(Way way) throws InvalidSelection {
    379379            this(way.firstNode(), way.lastNode());
    380380        }

  • trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java

    r8513 r8836  
    364364        private TreeSelectionListener validatorSelectionListener;
    365365
    366         public MapFrameAdapter() {
     366        MapFrameAdapter() {
    367367            if ("conflict".equals(mode)) {
    368368                conflictSelectionListener = new ListSelectionListener() {

  • trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java

    r8513 r8836  
    191191         * Constructs a new {@code ImageryOffsetDialog}.
    192192         */
    193         public ImageryOffsetDialog() {
     193        ImageryOffsetDialog() {
    194194            super(Main.parent,
    195195                    tr("Adjust imagery offset"),

  • trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

    r8795 r8836  
    8585        public final String role;
    8686
    87         public RelationRole(Relation rel, String role) {
     87        RelationRole(Relation rel, String role) {
    8888            this.rel = rel;
    8989            this.role = role;
    … …  
    197197
    198198        /** Constructor */
    199         public WayTraverser(Collection<WayInPolygon> ways) {
     199        WayTraverser(Collection<WayInPolygon> ways) {
    200200            availableWays = new HashSet<>(ways);
    201201            lastWay = null;
    … …  
    381381        public final AssembledMultipolygon pol;
    382382
    383         public PolygonLevel(AssembledMultipolygon pol, int level) {
     383        PolygonLevel(AssembledMultipolygon pol, int level) {
    384384            this.pol = pol;
    385385            this.level = level;

  • trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java

    r8823 r8836  
    411411        public double heading;            // heading of segSum == approximate heading of the way
    412412
    413         public WayData(Way pWay) {
     413        WayData(Way pWay) {
    414414            way = pWay;
    415415            nNode = way.getNodes().size();

  • trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java

    r8540 r8836  
    193193        private Set<OsmPrimitive> hull;
    194194
    195         public UploadHullBuilder() {
     195        UploadHullBuilder() {
    196196            hull = new HashSet<>();
    197197        }
    … …  
    269269         * @param toUpload the collection of primitives to upload
    270270         */
    271         public DeletedParentsChecker(OsmDataLayer layer, Collection<OsmPrimitive> toUpload) {
     271        DeletedParentsChecker(OsmDataLayer layer, Collection<OsmPrimitive> toUpload) {
    272272            super(tr("Checking parents for deleted objects"));
    273273            this.toUpload = toUpload;

  • trunk/src/org/openstreetmap/josm/actions/ValidateAction.java

    r8510 r8836  
    124124         * @param formerValidatedPrimitives the last collection of primitives being validates. May be null.
    125125         */
    126         public ValidationTask(Collection<Test> tests, Collection<OsmPrimitive> validatedPrimitives,
     126        ValidationTask(Collection<Test> tests, Collection<OsmPrimitive> validatedPrimitives,
    127127                Collection<OsmPrimitive> formerValidatedPrimitives) {
    128128            super(tr("Validating"), false /*don't ignore exceptions */);

  • trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java

    r8510 r8836  
    102102        private final boolean newLayer;
    103103
    104         public DownloadTask(boolean newLayer, OsmServerReader reader, ProgressMonitor progressMonitor) {
     104        DownloadTask(boolean newLayer, OsmServerReader reader, ProgressMonitor progressMonitor) {
    105105            super(tr("Downloading GPS data"), progressMonitor, false);
    106106            this.reader = reader;

  • trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java

    r8318 r8836  
    9191        protected List<Note> notesData;
    9292
    93         public DownloadTask(OsmServerReader reader, ProgressMonitor progressMonitor) {
     93        DownloadTask(OsmServerReader reader, ProgressMonitor progressMonitor) {
    9494            super(tr("Downloading Notes"), progressMonitor, false);
    9595            this.reader = reader;
    … …  
    137137    class DownloadBoundingBoxTask extends DownloadTask {
    138138
    139         public DownloadBoundingBoxTask(OsmServerReader reader, ProgressMonitor progressMonitor) {
     139        DownloadBoundingBoxTask(OsmServerReader reader, ProgressMonitor progressMonitor) {
    140140            super(reader, progressMonitor);
    141141        }
    … …  
    173173    class DownloadRawUrlTask extends DownloadTask {
    174174
    175         public DownloadRawUrlTask(OsmServerReader reader, ProgressMonitor progressMonitor) {
     175        DownloadRawUrlTask(OsmServerReader reader, ProgressMonitor progressMonitor) {
    176176            super(reader, progressMonitor);
    177177        }
    … …  
    199199    class DownloadBzip2RawUrlTask extends DownloadTask {
    200200
    201         public DownloadBzip2RawUrlTask(OsmServerReader reader, ProgressMonitor progressMonitor) {
     201        DownloadBzip2RawUrlTask(OsmServerReader reader, ProgressMonitor progressMonitor) {
    202202            super(reader, progressMonitor);
    203203        }

  • trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java

    r8338 r8836  
    232232        private final boolean osmData;
    233233
    234         public PostDownloadProcessor(boolean osmData) {
     234        PostDownloadProcessor(boolean osmData) {
    235235            this.osmData = osmData;
    236236        }

  • trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

    r8645 r8836  
    17741774         * Constructs a new {@code SnapChangeAction}.
    17751775         */
    1776         public SnapChangeAction() {
     1776        SnapChangeAction() {
    17771777            super(tr("Angle snapping"), /* ICON() */ "anglesnap",
    17781778                    tr("Switch angle snapping mode while drawing"), null, false);

  • trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

    r8549 r8836  
    158158        public final boolean perpendicular;
    159159
    160         public ReferenceSegment(EastNorth en, EastNorth p1, EastNorth p2, boolean perpendicular) {
     160        ReferenceSegment(EastNorth en, EastNorth p1, EastNorth p2, boolean perpendicular) {
    161161            this.en = en;
    162162            this.p1 = p1;
    … …  
    189189
    190190    private class DualAlignChangeAction extends JosmAction {
    191         public DualAlignChangeAction() {
     191        DualAlignChangeAction() {
    192192            super(tr("Dual alignment"), /* ICON() */ "mapmode/extrude/dualalign",
    193193                    tr("Switch dual alignment mode while extruding"), null, false);
    … …  
    11791179                    + Math.abs(heightpoint.getX()) + Math.abs(heightpoint.getY());
    11801180
    1181             return new Line2D.Double(start, new Point2D.Double(start.getX() + (unitvector.getX() * linelength) , start.getY()
     1181            return new Line2D.Double(start, new Point2D.Double(start.getX() + (unitvector.getX() * linelength), start.getY()
    11821182                    + (unitvector.getY() * linelength)));
    11831183        } catch (NoninvertibleTransformException e) {
    1184             return new Line2D.Double(start, new Point2D.Double(start.getX() + (unitvector.getX() * 10) , start.getY()
     1184            return new Line2D.Double(start, new Point2D.Double(start.getX() + (unitvector.getX() * 10), start.getY()
    11851185                    + (unitvector.getY() * 10)));
    11861186        }

  • trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

    r8674 r8836  
    8484
    8585    // contains all possible cases the cursor can be in the SelectAction
    86     private static enum SelectActionCursor {
     86    private enum SelectActionCursor {
    8787        rect("normal", /* ICON(cursor/modifier/) */ "selection"),
    8888        rect_add("normal", /* ICON(cursor/modifier/) */ "select_add"),

  • trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

    r8821 r8836  
    6262    private static final String SEARCH_EXPRESSION = "searchExpression";
    6363
    64     public static enum SearchMode {
     64    public enum SearchMode {
    6565        replace('R'), add('A'), remove('D'), in_selection('S');
    6666
    … …  
    178178        private final HistoryComboBox hcb;
    179179
    180         public SearchKeywordRow(HistoryComboBox hcb) {
     180        SearchKeywordRow(HistoryComboBox hcb) {
    181181            super(new FlowLayout(FlowLayout.LEFT));
    182182            this.hcb = hcb;
    … …  
    352352                .addTitle(tr("basic examples"))
    353353                .addKeyword(tr("Baker Street"), null, tr("''Baker'' and ''Street'' in any key"))
    354                 .addKeyword(tr("\"Baker Street\""), "\"\"", tr("''Baker Street'' in any key"))
    355                 , GBC.eol());
     354                .addKeyword(tr("\"Baker Street\""), "\"\"", tr("''Baker Street'' in any key")),
     355                GBC.eol());
    356356        right.add(new SearchKeywordRow(hcbSearchString)
    357357                .addTitle(tr("basics"))
    … …  
    367367                        tr("to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be escaped " +
    368368                           "by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."),
    369                         "\"addr:street\"")
    370                 , GBC.eol());
     369                        "\"addr:street\""),
     370                GBC.eol());
    371371        right.add(new SearchKeywordRow(hcbSearchString)
    372372                .addTitle(tr("combinators"))
    … …  
    375375                .addKeyword("<i>expr</i> OR <i>expr</i>", "OR ", tr("logical or (at least one expression has to be satisfied)"))
    376376                .addKeyword("-<i>expr</i>", null, tr("logical not"))
    377                 .addKeyword("(<i>expr</i>)", "()", tr("use parenthesis to group expressions"))
    378                 , GBC.eol());
     377                .addKeyword("(<i>expr</i>)", "()", tr("use parenthesis to group expressions")),
     378                GBC.eol());
    379379
    380380        if (Main.pref.getBoolean("expert", false)) {
    … …  
    385385                .addKeyword("type:relation", "type:relation ", tr("all relations"))
    386386                .addKeyword("closed", "closed ", tr("all closed ways"))
    387                 .addKeyword("untagged", "untagged ", tr("object without useful tags"))
    388                 , GBC.eol());
     387                .addKeyword("untagged", "untagged ", tr("object without useful tags")),
     388                GBC.eol());
    389389            right.add(new SearchKeywordRow(hcbSearchString)
    390390                .addTitle(tr("metadata"))
    … …  
    395395                        "changeset:0 (objects without an assigned changeset)")
    396396                .addKeyword("timestamp:", "timestamp:", tr("objects with last modification timestamp within range"), "timestamp:2012/",
    397                         "timestamp:2008/2011-02-04T12")
    398                 , GBC.eol());
     397                        "timestamp:2008/2011-02-04T12"),
     398                GBC.eol());
    399399            right.add(new SearchKeywordRow(hcbSearchString)
    400400                .addTitle(tr("properties"))
    … …  
    404404                .addKeyword("role:", "role:", tr("objects with given role in a relation"))
    405405                .addKeyword("areasize:<i>-100</i>", "areasize:", tr("closed ways with an area of 100 m\u00b2"))
    406                 .addKeyword("waylength:<i>200-</i>", "waylength:", tr("ways with a length of 200 m or more"))
    407                 , GBC.eol());
     406                .addKeyword("waylength:<i>200-</i>", "waylength:", tr("ways with a length of 200 m or more")),
     407                GBC.eol());
    408408            right.add(new SearchKeywordRow(hcbSearchString)
    409409                .addTitle(tr("state"))
    … …  
    411411                .addKeyword("new", "new ", tr("all new objects"))
    412412                .addKeyword("selected", "selected ", tr("all selected objects"))
    413                 .addKeyword("incomplete", "incomplete ", tr("all incomplete objects"))
    414                 , GBC.eol());
     413                .addKeyword("incomplete", "incomplete ", tr("all incomplete objects")),
     414                GBC.eol());
    415415            right.add(new SearchKeywordRow(hcbSearchString)
    416416                .addTitle(tr("related objects"))
    … …  
    420420                        tr("n-th member of relation and/or n-th node of way"), "nth:5 (child type:relation)", "nth:-1")
    421421                .addKeyword("nth%:<i>7</i>", "nth%: ",
    422                         tr("every n-th member of relation and/or every n-th node of way"), "nth%:100 (child waterway)")
    423                 , GBC.eol());
     422                        tr("every n-th member of relation and/or every n-th node of way"), "nth%:100 (child waterway)"),
     423                GBC.eol());
    424424            right.add(new SearchKeywordRow(hcbSearchString)
    425425                .addTitle(tr("view"))
    … …  
    428428                .addKeyword("indownloadedarea", "indownloadedarea ", tr("objects in downloaded area"))
    429429                .addKeyword("allindownloadedarea", "allindownloadedarea ",
    430                         tr("objects (and all its way nodes / relation members) in downloaded area"))
    431                 , GBC.eol());
     430                        tr("objects (and all its way nodes / relation members) in downloaded area")),
     431                GBC.eol());
    432432        }
    433433    }

  • trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

    r8822 r8836  
    354354        private final boolean defaultValue;
    355355
    356         public BooleanMatch(String key, boolean defaultValue) {
     356        BooleanMatch(String key, boolean defaultValue) {
    357357            this.key = key;
    358358            this.defaultValue = defaultValue;
    … …  
    435435     */
    436436    private static class Id extends RangeMatch {
    437         public Id(Range range) {
     437        Id(Range range) {
    438438            super(range);
    439439        }
    440440
    441         public Id(PushbackTokenizer tokenizer) throws ParseError {
     441        Id(PushbackTokenizer tokenizer) throws ParseError {
    442442            this(tokenizer.readRange(tr("Range of primitive ids expected")));
    443443        }
    … …  
    458458     */
    459459    private static class ChangesetId extends RangeMatch {
    460         public ChangesetId(Range range) {
     460        ChangesetId(Range range) {
    461461            super(range);
    462462        }
    463463
    464         public ChangesetId(PushbackTokenizer tokenizer) throws ParseError {
     464        ChangesetId(PushbackTokenizer tokenizer) throws ParseError {
    465465            this(tokenizer.readRange(tr("Range of changeset ids expected")));
    466466        }
    … …  
    481481     */
    482482    private static class Version extends RangeMatch {
    483         public Version(Range range) {
     483        Version(Range range) {
    484484            super(range);
    485485        }
    486486
    487         public Version(PushbackTokenizer tokenizer) throws ParseError {
     487        Version(PushbackTokenizer tokenizer) throws ParseError {
    488488            this(tokenizer.readRange(tr("Range of versions expected")));
    489489        }
    … …  
    510510        private final boolean caseSensitive;
    511511
    512         public KeyValue(String key, String value, boolean regexSearch, boolean caseSensitive) throws ParseError {
    513         this.caseSensitive = caseSensitive;
     512        KeyValue(String key, String value, boolean regexSearch, boolean caseSensitive) throws ParseError {
     513            this.caseSensitive = caseSensitive;
    514514            if (regexSearch) {
    515515                int searchFlags = regexFlags(caseSensitive);
    … …  
    781781        private final boolean caseSensitive;
    782782
    783         public Any(String s, boolean regexSearch, boolean caseSensitive) throws ParseError {
     783        Any(String s, boolean regexSearch, boolean caseSensitive) throws ParseError {
    784784            s = Normalizer.normalize(s, Normalizer.Form.NFC);
    785785            this.caseSensitive = caseSensitive;
    … …  
    845845        private final OsmPrimitiveType type;
    846846
    847         public ExactType(String type) throws ParseError {
     847        ExactType(String type) throws ParseError {
    848848            this.type = OsmPrimitiveType.from(type);
    849849            if (this.type == null)
    … …  
    869869        private String user;
    870870
    871         public UserMatch(String user) {
     871        UserMatch(String user) {
    872872            if ("anonymous".equals(user)) {
    873873                this.user = null;
    … …  
    897897        private String role;
    898898
    899         public RoleMatch(String role) {
     899        RoleMatch(String role) {
    900900            if (role == null) {
    901901                this.role = "";
    … …  
    935935        private final boolean modulo;
    936936
    937         public Nth(PushbackTokenizer tokenizer, boolean modulo) throws ParseError {
     937        Nth(PushbackTokenizer tokenizer, boolean modulo) throws ParseError {
    938938            this((int) tokenizer.readNumber(tr("Positive integer expected")), modulo);
    939939        }
    … …  
    982982        private final long max;
    983983
    984         public RangeMatch(long min, long max) {
     984        RangeMatch(long min, long max) {
    985985            this.min = Math.min(min, max);
    986986            this.max = Math.max(min, max);
    987987        }
    988988
    989         public RangeMatch(Range range) {
     989        RangeMatch(Range range) {
    990990            this(range.getStart(), range.getEnd());
    991991        }
    … …  
    10141014     */
    10151015    private static class NodeCountRange extends RangeMatch {
    1016         public NodeCountRange(Range range) {
     1016        NodeCountRange(Range range) {
    10171017            super(range);
    10181018        }
    10191019
    1020         public NodeCountRange(PushbackTokenizer tokenizer) throws ParseError {
     1020        NodeCountRange(PushbackTokenizer tokenizer) throws ParseError {
    10211021            this(tokenizer.readRange(tr("Range of numbers expected")));
    10221022        }
    … …  
    10431043     */
    10441044    private static class WayCountRange extends RangeMatch {
    1045         public WayCountRange(Range range) {
     1045        WayCountRange(Range range) {
    10461046            super(range);
    10471047        }
    10481048
    1049         public WayCountRange(PushbackTokenizer tokenizer) throws ParseError {
     1049        WayCountRange(PushbackTokenizer tokenizer) throws ParseError {
    10501050            this(tokenizer.readRange(tr("Range of numbers expected")));
    10511051        }
    … …  
    10721072     */
    10731073    private static class TagCountRange extends RangeMatch {
    1074         public TagCountRange(Range range) {
     1074        TagCountRange(Range range) {
    10751075            super(range);
    10761076        }
    10771077
    1078         public TagCountRange(PushbackTokenizer tokenizer) throws ParseError {
     1078        TagCountRange(PushbackTokenizer tokenizer) throws ParseError {
    10791079            this(tokenizer.readRange(tr("Range of numbers expected")));
    10801080        }
    … …  
    10961096    private static class TimestampRange extends RangeMatch {
    10971097
    1098         public TimestampRange(long minCount, long maxCount) {
     1098        TimestampRange(long minCount, long maxCount) {
    10991099            super(minCount, maxCount);
    11001100        }
    … …  
    12661266    private static class AreaSize extends RangeMatch {
    12671267
    1268         public AreaSize(Range range) {
     1268        AreaSize(Range range) {
    12691269            super(range);
    12701270        }
    12711271
    1272         public AreaSize(PushbackTokenizer tokenizer) throws ParseError {
     1272        AreaSize(PushbackTokenizer tokenizer) throws ParseError {
    12731273            this(tokenizer.readRange(tr("Range of numbers expected")));
    12741274        }
    … …  
    12931293    private static class WayLength extends RangeMatch {
    12941294
    1295         public WayLength(Range range) {
     1295        WayLength(Range range) {
    12961296            super(range);
    12971297        }
    12981298
    1299         public WayLength(PushbackTokenizer tokenizer) throws ParseError {
     1299        WayLength(PushbackTokenizer tokenizer) throws ParseError {
    13001300            this(tokenizer.readRange(tr("Range of numbers expected")));
    13011301        }
    … …  
    13251325         * @param all if true, all way nodes or relation members have to be within source area;if false, one suffices.
    13261326         */
    1327         public InArea(boolean all) {
     1327        InArea(boolean all) {
    13281328            this.all = all;
    13291329        }
    … …  
    13751375    private static class InView extends InArea {
    13761376
    1377         public InView(boolean all) {
     1377        InView(boolean all) {
    13781378            super(all);
    13791379        }

  • trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java

    r8831 r8836  
    4848         * @param monitor progress monitor
    4949         */
    50         public UploadTask(String title, ProgressMonitor monitor) {
     50        UploadTask(String title, ProgressMonitor monitor) {
    5151            super(title, monitor, false);
    5252        }

  • trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java

    r8512 r8836  
    6666        private final Pattern pattern;
    6767
    68         public StringSwitcher(String a, String b) {
     68        StringSwitcher(String a, String b) {
    6969            this.a = a;
    7070            this.b = b;

  • trunk/src/org/openstreetmap/josm/data/APIDataSet.java

    r8510 r8836  
    276276        private final boolean newOrUndeleted;
    277277
    278         public RelationUploadDependencyGraph(Collection<Relation> relations, boolean newOrUndeleted) {
     278        RelationUploadDependencyGraph(Collection<Relation> relations, boolean newOrUndeleted) {
    279279            this.newOrUndeleted = newOrUndeleted;
    280280            build(relations);

  • trunk/src/org/openstreetmap/josm/data/Preferences.java

    r8817 r8836  
    522522        private final Setting<?> newValue;
    523523
    524         public DefaultPreferenceChangeEvent(String key, Setting<?> oldValue, Setting<?> newValue) {
     524        DefaultPreferenceChangeEvent(String key, Setting<?> oldValue, Setting<?> newValue) {
    525525            this.key = key;
    526526            this.oldValue = oldValue;
    … …  
    17211721        private String key;
    17221722
    1723         public SettingToXml(StringBuilder b, boolean noPassword) {
     1723        SettingToXml(StringBuilder b, boolean noPassword) {
    17241724            this.b = b;
    17251725            this.noPassword = noPassword;

  • trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java

    r8510 r8836  
    4646        private final Class<? extends OsmPrimitive> c;
    4747
    48         public FilterPredicate(Class<? extends OsmPrimitive> c) {
     48        FilterPredicate(Class<? extends OsmPrimitive> c) {
    4949            this.c = c;
    5050        }

  • trunk/src/org/openstreetmap/josm/data/imagery/CachedAttributionBingAerialTileSource.java

    r8718 r8836  
    4848    class BingAttributionData extends CacheCustomContent<IOException> {
    4949
    50         public BingAttributionData() {
     50        BingAttributionData() {
    5151            super("bing.attribution.xml", CacheCustomContent.INTERVAL_HOURLY);
    5252        }

  • trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java

    r8772 r8836  
    133133        private final JTable list;
    134134
    135         public SelectLayerDialog(Collection<Layer> layers) {
     135        SelectLayerDialog(Collection<Layer> layers) {
    136136            super(Main.parent, tr("Select WMTS layer"), new String[]{tr("Add layers"), tr("Cancel")});
    137137            this.layers = layers.toArray(new Layer[]{});

  • trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java

    r8512 r8836  
    1717public class ChangesetDataSet {
    1818
    19     public static enum ChangesetModificationType {
     19    public enum ChangesetModificationType {
    2020        CREATED,
    2121        UPDATED,
    … …  
    156156        private HistoryOsmPrimitive primitive;
    157157
    158         public DefaultChangesetDataSetEntry(ChangesetModificationType modificationType, HistoryOsmPrimitive primitive) {
     158        DefaultChangesetDataSetEntry(ChangesetModificationType modificationType, HistoryOsmPrimitive primitive) {
    159159            this.modificationType = modificationType;
    160160            this.primitive = primitive;
    … …  
    175175        private Iterator<Entry<PrimitiveId, ChangesetModificationType>> typeIterator;
    176176
    177         public DefaultIterator() {
     177        DefaultIterator() {
    178178            typeIterator = modificationTypes.entrySet().iterator();
    179179        }

  • trunk/src/org/openstreetmap/josm/data/osm/MultipolygonBuilder.java

    r8734 r8836  
    9999        public List<JoinedPolygon> innerWays;
    100100
    101         public PolygonLevel(JoinedPolygon pol, int level) {
     101        PolygonLevel(JoinedPolygon pol, int level) {
    102102            this.outerWay = pol;
    103103            this.level = level;
    … …  
    345345        private final List<PolygonLevel> output;
    346346
    347         public Worker(List<JoinedPolygon> input, int from, int to, List<PolygonLevel> output) {
     347        Worker(List<JoinedPolygon> input, int from, int to, List<PolygonLevel> output) {
    348348            this.input = input;
    349349            this.from = from;

  • trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java

    r8510 r8836  
    8686         * Constructor for root node
    8787         */
    88         public QBLevel(final QuadBuckets<T> buckets) {
     88        QBLevel(final QuadBuckets<T> buckets) {
    8989            level = 0;
    9090            index = 0;
    … …  
    9595        }
    9696
    97         public QBLevel(QBLevel<T> parent, int parent_index, final QuadBuckets<T> buckets) {
     97        QBLevel(QBLevel<T> parent, int parent_index, final QuadBuckets<T> buckets) {
    9898            this.parent = parent;
    9999            this.level = parent.level + 1;
    … …  
    508508        }
    509509
    510         public QuadBucketIterator(QuadBuckets<T> qb) {
     510        QuadBucketIterator(QuadBuckets<T> qb) {
    511511            if (!qb.root.hasChildren() || qb.root.hasContent()) {
    512512                currentNode = qb.root;

  • trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java

    r8533 r8836  
    108108        private final boolean consolidate;
    109109
    110         public ListenerInfo(DataSetListener listener, boolean consolidate) {
     110        ListenerInfo(DataSetListener listener, boolean consolidate) {
    111111            this.listener = listener;
    112112            this.consolidate = consolidate;

  • trunk/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java

    r8510 r8836  
    2929        private final SelectionChangedListener listener;
    3030
    31         public ListenerInfo(SelectionChangedListener listener) {
     31        ListenerInfo(SelectionChangedListener listener) {
    3232            this.listener = listener;
    3333        }

  • trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/LineClip.java

    r8510 r8836  
    3838            return false;
    3939        }
    40         return cohenSutherland(p1.x, p1.y, p2.x, p2.y, clipBounds.x , clipBounds.y,
     40        return cohenSutherland(p1.x, p1.y, p2.x, p2.y, clipBounds.x, clipBounds.y,
    4141                clipBounds.x + clipBounds.width, clipBounds.y + clipBounds.height);
    4242    }

  • trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

    r8734 r8836  
    110110        private int xPrev0, yPrev0;
    111111
    112         public OffsetIterator(List<Node> nodes, double offset) {
     112        OffsetIterator(List<Node> nodes, double offset) {
    113113            this.nodes = nodes;
    114114            this.offset = offset;
    … …  
    193193        private final int flags;
    194194
    195         public StyleRecord(ElemStyle style, OsmPrimitive osm, int flags) {
     195        StyleRecord(ElemStyle style, OsmPrimitive osm, int flags) {
    196196            this.style = style;
    197197            this.osm = osm;
    … …  
    15631563         * @param output the list of styles to which styles will be added
    15641564         */
    1565         public ComputeStyleListWorker(final List<? extends OsmPrimitive> input, int from, int to, List<StyleRecord> output) {
     1565        ComputeStyleListWorker(final List<? extends OsmPrimitive> input, int from, int to, List<StyleRecord> output) {
    15661566            this.input = input;
    15671567            this.from = from;
    … …  
    16401640        private final List<StyleRecord> allStyleElems;
    16411641
    1642         public ConcurrentTasksHelper(List<StyleRecord> allStyleElems) {
     1642        ConcurrentTasksHelper(List<StyleRecord> allStyleElems) {
    16431643            this.allStyleElems = allStyleElems;
    16441644        }

  • trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java

    r8638 r8836  
    5656     * @since 7370 (public)
    5757     */
    58     public static enum Param {
     58    public enum Param {
    5959
    6060        /** False easting */

  • trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java

    r8513 r8836  
    108108         * @param members The list of relation members
    109109         */
    110         public RelationMembers(List<RelationMember> members) {
     110        RelationMembers(List<RelationMember> members) {
    111111            this.members = new ArrayList<>(members.size());
    112112            for (RelationMember member : members) {
    … …  
    141141         * @param keys The set of tags of the relation
    142142         */
    143         public RelationPair(List<RelationMember> members, Map<String, String> keys) {
     143        RelationPair(List<RelationMember> members, Map<String, String> keys) {
    144144            this.members = new RelationMembers(members);
    145145            this.keys = keys;

  • trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java

    r8510 r8836  
    4242        private final Map<String, String> keys;
    4343
    44         public WayPair(List<LatLon> coor, Map<String, String> keys) {
     44        WayPair(List<LatLon> coor, Map<String, String> keys) {
    4545            this.coor = coor;
    4646            this.keys = keys;
    … …  
    6868        private final List<LatLon> coor;
    6969
    70         public WayPairNoTags(List<LatLon> coor) {
     70        WayPairNoTags(List<LatLon> coor) {
    7171            this.coor = coor;
    7272        }

  • trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java

    r8680 r8836  
    7878    }
    7979
    80     static enum CheckMode {
     80    enum CheckMode {
    8181        TIME_RANGE(0), POINTS_IN_TIME(1), BOTH(2);
    8282        private final int code;

  • trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java

    r8510 r8836  
    8888        private final String name;
    8989
    90         public RolePreset(List<Role> roles, String name) {
     90        RolePreset(List<Role> roles, String name) {
    9191            this.roles = roles;
    9292            this.name = name;

  • trunk/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java

    r8577 r8836  
    5656         * @param engMessage The English message
    5757         */
    58         public UnclosedWaysCheck(int code, String key, String engMessage) {
     58        UnclosedWaysCheck(int code, String key, String engMessage) {
    5959            this(code, key, engMessage, Collections.<String>emptySet());
    6060        }
    … …  
    6767         * @param ignoredValues The ignored values.
    6868         */
    69         public UnclosedWaysCheck(int code, String key, String engMessage, Set<String> ignoredValues) {
     69        UnclosedWaysCheck(int code, String key, String engMessage, Set<String> ignoredValues) {
    7070            this(code, key, engMessage, ignoredValues, true);
    7171        }
    … …  
    7979         * @param ignore indicates if special values must be ignored or considered only
    8080         */
    81         public UnclosedWaysCheck(int code, String key, String engMessage, Set<String> specialValues, boolean ignore) {
     81        UnclosedWaysCheck(int code, String key, String engMessage, Set<String> specialValues, boolean ignore) {
    8282            this.code = code;
    8383            this.key = key;
    … …  
    123123         * @param engMessage The English message
    124124         */
    125         public UnclosedWaysBooleanCheck(int code, String key, String engMessage) {
     125        UnclosedWaysBooleanCheck(int code, String key, String engMessage) {
    126126            super(code, key, engMessage);
    127127        }

  • trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java

    r8510 r8836  
    297297        private final Node n2;
    298298
    299         public MyWaySegment(Way w, Node n1, Node n2) {
     299        MyWaySegment(Way w, Node n1, Node n2) {
    300300            this.w = w;
    301301            String railway = w.get("railway");

  • trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java

    r8540 r8836  
    204204     * An enum designating how long to not show this message again, i.e., for how long to store
    205205     */
    206     static enum NotShowAgain {
     206    enum NotShowAgain {
    207207        NO, OPERATION, SESSION, PERMANENT;
    208208
    … …  
    262262         * @param displayImmediateOption whether to provide "Do not show again (this session)"
    263263         */
    264         public MessagePanel(Object message, boolean displayImmediateOption) {
     264        MessagePanel(Object message, boolean displayImmediateOption) {
    265265            cbStandard.setSelected(true);
    266266            ButtonGroup group = new ButtonGroup();

  • trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java

    r8510 r8836  
    657657         * Constructs a new {@code HelpAction}.
    658658         */
    659         public HelpAction() {
     659        HelpAction() {
    660660            putValue(SHORT_DESCRIPTION, tr("Show help information"));
    661661            putValue(NAME, tr("Help"));

  • trunk/src/org/openstreetmap/josm/gui/GettingStarted.java

    r8378 r8836  
    7373     */
    7474    private static class MotdContent extends CacheCustomContent<IOException> {
    75         public MotdContent() {
     75        MotdContent() {
    7676            super("motd.html", CacheCustomContent.INTERVAL_DAILY);
    7777        }

  • trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java

    r8512 r8836  
    111111        private int value;
    112112
    113         public DefaultAction(JDialog dialog, JOptionPane pane, int value) {
     113        DefaultAction(JDialog dialog, JOptionPane pane, int value) {
    114114            this.dialog = dialog;
    115115            this.pane = pane;

  • trunk/src/org/openstreetmap/josm/gui/MainApplication.java

    r8736 r8836  
    594594        private final DefaultProxySelector proxySelector;
    595595
    596         public GuiFinalizationWorker(Map<Option, Collection<String>> args, DefaultProxySelector proxySelector) {
     596        GuiFinalizationWorker(Map<Option, Collection<String>> args, DefaultProxySelector proxySelector) {
    597597            this.args = args;
    598598            this.proxySelector = proxySelector;

  • trunk/src/org/openstreetmap/josm/gui/MainMenu.java

    r8801 r8836  
    145145public class MainMenu extends JMenuBar {
    146146
    147     public static enum WINDOW_MENU_GROUP { ALWAYS, TOGGLE_DIALOG, VOLATILE }
     147    public enum WINDOW_MENU_GROUP { ALWAYS, TOGGLE_DIALOG, VOLATILE }
    148148
    149149    /* File menu */
    … …  
    343343     * @since 6082 (moved from Utilsplugin2)
    344344     */
     345    // CHECKSTYLE.OFF: LineLength
    345346    public final JMenu moreToolsMenu = addMenu("More tools", /* I18N: mnemonic: M */ trc("menu", "More tools"), KeyEvent.VK_M, 4, ht("/Menu/MoreTools"));
    346347    /**
    … …  
    367368     * imageryMenu contains all imagery-related actions
    368369     */
    369     // CHECKSTYLE.OFF: LineLength
    370370    public final ImageryMenu imageryMenu = addMenu(new ImageryMenu(imagerySubMenu), /* I18N: mnemonic: I */ "Imagery", KeyEvent.VK_I, 8, ht("/Menu/Imagery"));
    371371    // CHECKSTYLE.ON: LineLength
    … …  
    948948        private JMenu presetsMenu;
    949949
    950         public PresetsMenuEnabler(JMenu presetsMenu) {
     950        PresetsMenuEnabler(JMenu presetsMenu) {
    951951            MapView.addLayerChangeListener(this);
    952952            this.presetsMenu = presetsMenu;
    … …  
    10171017        private String currentSearchText = null;
    10181018
    1019         public SearchFieldTextListener(MainMenu mainMenu, JTextField searchField) {
     1019        SearchFieldTextListener(MainMenu mainMenu, JTextField searchField) {
    10201020            this.mainMenu = mainMenu;
    10211021            this.searchField = searchField;

  • trunk/src/org/openstreetmap/josm/gui/MapFrame.java

    r8719 r8836  
    548548        private transient Collection<? extends HideableButton> buttons;
    549549
    550         public ListAllButtonsAction(Collection<? extends HideableButton> buttons) {
     550        ListAllButtonsAction(Collection<? extends HideableButton> buttons) {
    551551            this.buttons = buttons;
    552552        }

  • trunk/src/org/openstreetmap/josm/gui/MapMover.java

    r8540 r8836  
    3838        private final String action;
    3939
    40         public ZoomerAction(String action) {
     40        ZoomerAction(String action) {
    4141            this.action = action;
    4242        }

  • trunk/src/org/openstreetmap/josm/gui/MapSlider.java

    r8510 r8836  
    1919    private boolean preventChange = false;
    2020
    21     public MapSlider(MapView mv) {
     21    MapSlider(MapView mv) {
    2222        super(35, 150);
    2323        setOpaque(false);

  • trunk/src/org/openstreetmap/josm/gui/MapStatus.java

    r8554 r8836  
    211211        private final String text;
    212212
    213         public StatusTextHistory(Object id, String text) {
     213        StatusTextHistory(Object id, String text) {
    214214            this.id = id;
    215215            this.text = text;
    … …  
    348348        private MapFrame parent;
    349349
    350         public Collector(MapFrame parent) {
     350        Collector(MapFrame parent) {
    351351            this.parent = parent;
    352352        }
    … …  
    751751        });
    752752
    753         public MapStatusPopupMenu() {
     753        MapStatusPopupMenu() {
    754754            for (final String key : new TreeSet<>(SystemOfMeasurement.ALL_SYSTEMS.keySet())) {
    755755                JCheckBoxMenuItem item = new JCheckBoxMenuItem(new AbstractAction(key) {

  • trunk/src/org/openstreetmap/josm/gui/MenuScroller.java

    r8510 r8836  
    428428    private class MenuScrollTimer extends Timer {
    429429
    430         public MenuScrollTimer(final int increment, int interval) {
     430        MenuScrollTimer(final int increment, int interval) {
    431431            super(interval, new ActionListener() {
    432432
    … …  
    445445        private MenuScrollTimer timer;
    446446
    447         public MenuScrollItem(MenuIcon icon, int increment) {
     447        MenuScrollItem(MenuIcon icon, int increment) {
    448448            setIcon(icon);
    449449            setDisabledIcon(icon);
    … …  
    467467    }
    468468
    469     private static enum MenuIcon implements Icon {
     469    private enum MenuIcon implements Icon {
    470470
    471471        UP(9, 1, 9),

  • trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

    r8736 r8836  
    635635        private final double scale;
    636636
    637         public ZoomData(EastNorth center, double scale) {
     637        ZoomData(EastNorth center, double scale) {
    638638            this.center = Projections.inverseProject(center);
    639639            this.scale = scale;

  • trunk/src/org/openstreetmap/josm/gui/NotificationManager.java

    r8510 r8836  
    8383    }
    8484
    85     public NotificationManager() {
     85    NotificationManager() {
    8686        queue = new LinkedList<>();
    8787        hideTimer = new Timer(defaultNotificationTime, new HideEvent());
    … …  
    186186        private JPanel innerPanel;
    187187
    188         public NotificationPanel(Notification note) {
     188        NotificationPanel(Notification note) {
    189189            setVisible(false);
    190190            build(note);
    … …  
    310310        class HideAction extends AbstractAction {
    311311
    312             public HideAction() {
     312            HideAction() {
    313313                putValue(SMALL_ICON, ImageProvider.get("misc", "grey_x"));
    314314            }
    … …  
    345345    public static class RoundedPanel extends JPanel {
    346346
    347         public RoundedPanel() {
     347        RoundedPanel() {
    348348            super();
    349349            setOpaque(false);

  • trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java

    r8510 r8836  
    4141        private int direction;
    4242
    43         public ScrollViewPortMouseListener(int direction) {
     43        ScrollViewPortMouseListener(int direction) {
    4444            this.direction = direction;
    4545        }
    4646
    47         @Override public void mouseExited(MouseEvent arg0) {
     47        @Override
     48        public void mouseExited(MouseEvent arg0) {
    4849            ScrollViewport.this.scrollDirection = NO_SCROLL;
    4950            timer.stop();
    5051        }
    5152
    52         @Override public void mouseReleased(MouseEvent arg0) {
     53        @Override
     54        public void mouseReleased(MouseEvent arg0) {
    5355            ScrollViewport.this.scrollDirection = NO_SCROLL;
    5456            timer.stop();

  • trunk/src/org/openstreetmap/josm/gui/SplashScreen.java

    r8525 r8836  
    155155        private String duration = "";
    156156
    157         public MeasurableTask(String name) {
     157        MeasurableTask(String name) {
    158158            this.name = name;
    159159            this.start = System.currentTimeMillis();
    … …  
    381381         * Constructs a new {@code SplashScreenProgressRenderer}.
    382382         */
    383         public SplashScreenProgressRenderer() {
     383        SplashScreenProgressRenderer() {
    384384            build();
    385385        }

  • trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java

    r8444 r8836  
    170170        private int direction;
    171171
    172         public MoveXAction(int direction) {
     172        MoveXAction(int direction) {
    173173            this.direction = direction;
    174174        }
    … …  
    184184        private int direction;
    185185
    186         public MoveYAction(int direction) {
     186        MoveYAction(int direction) {
    187187            this.direction = direction;
    188188        }

  • trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java

    r8771 r8836  
    333333        }
    334334
    335         public TileGridInputPanel() {
     335        TileGridInputPanel() {
    336336            build();
    337337        }
    … …  
    500500        }
    501501
    502         public TileAddressInputPanel() {
     502        TileAddressInputPanel() {
    503503            setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
    504504            build();
    … …  
    510510
    511511        class ApplyTileAddressAction extends AbstractAction {
    512             public ApplyTileAddressAction() {
     512            ApplyTileAddressAction() {
    513513                putValue(SMALL_ICON, ImageProvider.get("apply"));
    514514                putValue(SHORT_DESCRIPTION, tr("Apply the tile address"));
    … …  
    532532        private TileBounds tileBounds = null;
    533533
    534         public TileAddressValidator(JTextComponent tc) {
     534        TileAddressValidator(JTextComponent tc) {
    535535            super(tc);
    536536        }
    … …  
    591591        private int tileIndex;
    592592
    593         public TileCoordinateValidator(JTextComponent tc) {
     593        TileCoordinateValidator(JTextComponent tc) {
    594594            super(tc);
    595595        }

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java

    r8512 r8836  
    435435    class CopyStartLeftAction extends CopyAction {
    436436
    437         public CopyStartLeftAction() {
     437        CopyStartLeftAction() {
    438438            super(/* ICON(dialogs/conflict/)*/ "copystartleft", tr("> top"),
    439439                tr("Copy my selected nodes to the start of the merged node list"));
    … …  
    457457    class CopyEndLeftAction extends CopyAction {
    458458
    459         public CopyEndLeftAction() {
     459        CopyEndLeftAction() {
    460460            super(/* ICON(dialogs/conflict/)*/ "copyendleft", tr("> bottom"),
    461461                tr("Copy my selected elements to the end of the list of merged elements."));
    … …  
    479479    class CopyBeforeCurrentLeftAction extends CopyAction {
    480480
    481         public CopyBeforeCurrentLeftAction() {
     481        CopyBeforeCurrentLeftAction() {
    482482            super(/* ICON(dialogs/conflict/)*/ "copybeforecurrentleft", tr("> before"),
    483483                    tr("Copy my selected elements before the first selected element in the list of merged elements."));
    … …  
    509509    class CopyAfterCurrentLeftAction extends CopyAction {
    510510
    511         public CopyAfterCurrentLeftAction() {
     511        CopyAfterCurrentLeftAction() {
    512512            super(/* ICON(dialogs/conflict/)*/ "copyaftercurrentleft", tr("> after"),
    513513                    tr("Copy my selected elements after the first selected element in the list of merged elements."));
    … …  
    535535    class CopyStartRightAction extends CopyAction {
    536536
    537         public CopyStartRightAction() {
     537        CopyStartRightAction() {
    538538            super(/* ICON(dialogs/conflict/)*/ "copystartright", tr("< top"),
    539539                tr("Copy their selected element to the start of the list of merged elements."));
    … …  
    553553    class CopyEndRightAction extends CopyAction {
    554554
    555         public CopyEndRightAction() {
     555        CopyEndRightAction() {
    556556            super(/* ICON(dialogs/conflict/)*/ "copyendright", tr("< bottom"),
    557557                tr("Copy their selected elements to the end of the list of merged elements."));
    … …  
    571571    class CopyBeforeCurrentRightAction extends CopyAction {
    572572
    573         public CopyBeforeCurrentRightAction() {
     573        CopyBeforeCurrentRightAction() {
    574574            super(/* ICON(dialogs/conflict/)*/ "copybeforecurrentright", tr("< before"),
    575575                    tr("Copy their selected elements before the first selected element in the list of merged elements."));
    … …  
    597597    class CopyAfterCurrentRightAction extends CopyAction {
    598598
    599         public CopyAfterCurrentRightAction() {
     599        CopyAfterCurrentRightAction() {
    600600            super(/* ICON(dialogs/conflict/)*/ "copyaftercurrentright", tr("< after"),
    601601                    tr("Copy their selected element after the first selected element in the list of merged elements"));
    … …  
    623623    class CopyAllLeft extends AbstractAction implements Observer, PropertyChangeListener {
    624624
    625         public CopyAllLeft() {
     625        CopyAllLeft() {
    626626            ImageIcon icon = ImageProvider.get("dialogs/conflict", "useallleft");
    627627            putValue(Action.SMALL_ICON, icon);
    … …  
    652652    class CopyAllRight extends AbstractAction implements Observer, PropertyChangeListener {
    653653
    654         public CopyAllRight() {
     654        CopyAllRight() {
    655655            ImageIcon icon = ImageProvider.get("dialogs/conflict", "useallright");
    656656            putValue(Action.SMALL_ICON, icon);
    … …  
    681681    class MoveUpMergedAction extends AbstractAction implements ListSelectionListener {
    682682
    683         public MoveUpMergedAction() {
     683        MoveUpMergedAction() {
    684684            ImageIcon icon = ImageProvider.get("dialogs/conflict", "moveup");
    685685            putValue(Action.SMALL_ICON, icon);
    … …  
    715715    class MoveDownMergedAction extends AbstractAction implements ListSelectionListener {
    716716
    717         public MoveDownMergedAction() {
     717        MoveDownMergedAction() {
    718718            ImageIcon icon = ImageProvider.get("dialogs/conflict", "movedown");
    719719            putValue(Action.SMALL_ICON, icon);
    … …  
    749749    class RemoveMergedAction extends AbstractAction implements ListSelectionListener {
    750750
    751         public RemoveMergedAction() {
     751        RemoveMergedAction() {
    752752            ImageIcon icon = ImageProvider.get("dialogs/conflict", "remove");
    753753            putValue(Action.SMALL_ICON, icon);

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java

    r8785 r8836  
    392392
    393393    class KeepMyCoordinatesAction extends AbstractAction implements Observer {
    394         public KeepMyCoordinatesAction() {
     394        KeepMyCoordinatesAction() {
    395395            putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagkeepmine"));
    396396            putValue(Action.SHORT_DESCRIPTION, tr("Keep my coordinates"));
    … …  
    409409
    410410    class KeepTheirCoordinatesAction extends AbstractAction implements Observer {
    411         public KeepTheirCoordinatesAction() {
     411        KeepTheirCoordinatesAction() {
    412412            putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagkeeptheir"));
    413413            putValue(Action.SHORT_DESCRIPTION, tr("Keep their coordinates"));
    … …  
    426426
    427427    class UndecideCoordinateConflictAction extends AbstractAction implements Observer {
    428         public UndecideCoordinateConflictAction() {
     428        UndecideCoordinateConflictAction() {
    429429            putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagundecide"));
    430430            putValue(Action.SHORT_DESCRIPTION, tr("Undecide conflict between different coordinates"));
    … …  
    443443
    444444    class KeepMyDeletedStateAction extends AbstractAction implements Observer {
    445         public KeepMyDeletedStateAction() {
     445        KeepMyDeletedStateAction() {
    446446            putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagkeepmine"));
    447447            putValue(Action.SHORT_DESCRIPTION, tr("Keep my deleted state"));
    … …  
    460460
    461461    class KeepTheirDeletedStateAction extends AbstractAction implements Observer {
    462         public KeepTheirDeletedStateAction() {
     462        KeepTheirDeletedStateAction() {
    463463            putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagkeeptheir"));
    464464            putValue(Action.SHORT_DESCRIPTION, tr("Keep their deleted state"));
    … …  
    477477
    478478    class UndecideDeletedStateConflictAction extends AbstractAction implements Observer {
    479         public UndecideDeletedStateConflictAction() {
     479        UndecideDeletedStateConflictAction() {
    480480            putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagundecide"));
    481481            putValue(Action.SHORT_DESCRIPTION, tr("Undecide conflict between deleted state"));

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java

    r8510 r8836  
    270270     */
    271271    class KeepMineAction extends AbstractAction implements ListSelectionListener {
    272         public KeepMineAction() {
     272        KeepMineAction() {
    273273            ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagkeepmine");
    274274            if (icon != null) {
    … …  
    302302     */
    303303    class KeepTheirAction extends AbstractAction implements ListSelectionListener {
    304         public KeepTheirAction() {
     304        KeepTheirAction() {
    305305            ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagkeeptheir");
    306306            if (icon != null) {
    … …  
    339339        private final Set<Adjustable> synchronizedAdjustables;
    340340
    341         public AdjustmentSynchronizer() {
     341        AdjustmentSynchronizer() {
    342342            synchronizedAdjustables = new HashSet<>();
    343343        }
    … …  
    400400    class UndecideAction extends AbstractAction implements ListSelectionListener  {
    401401
    402         public UndecideAction() {
     402        UndecideAction() {
    403403            ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagundecide");
    404404            if (icon != null) {

  • trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java

    r8540 r8836  
    406406    class CancelAction extends AbstractAction {
    407407
    408         public CancelAction() {
     408        CancelAction() {
    409409            putValue(Action.SHORT_DESCRIPTION, tr("Cancel conflict resolution"));
    410410            putValue(Action.NAME, tr("Cancel"));
    … …  
    465465        private double dividerLocation;
    466466
    467         public AutoAdjustingSplitPane(int newOrientation) {
     467        AutoAdjustingSplitPane(int newOrientation) {
    468468            super(newOrientation);
    469469            addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, this);

  • trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java

    r8540 r8836  
    196196         * Construct a new {@link EditorCellRenderer}.
    197197         */
    198         public EditorCellRenderer() {
     198        EditorCellRenderer() {
    199199            setOpaque(true);
    200200        }

  • trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java

    r8510 r8836  
    154154
    155155    class ApplyRoleAction extends AbstractAction {
    156         public ApplyRoleAction() {
     156        ApplyRoleAction() {
    157157            putValue(NAME, tr("Apply"));
    158158            putValue(SMALL_ICON, ImageProvider.get("ok"));

  • trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java

    r8514 r8836  
    293293    class SelectObjectsAction extends AbstractAction implements ListSelectionListener, ItemListener{
    294294
    295         public SelectObjectsAction() {
     295        SelectObjectsAction() {
    296296            putValue(NAME, tr("Select"));
    297297            putValue(SHORT_DESCRIPTION, tr("Select all objects assigned to the currently selected changesets"));
    … …  
    346346     */
    347347    class ReadChangesetsAction extends AbstractAction implements ListSelectionListener, ItemListener{
    348         public ReadChangesetsAction() {
     348        ReadChangesetsAction() {
    349349            putValue(NAME, tr("Download"));
    350350            putValue(SHORT_DESCRIPTION, tr("Download information about the selected changesets from the OSM server"));
    … …  
    384384     */
    385385    class CloseOpenChangesetsAction extends AbstractAction implements ListSelectionListener, ItemListener {
    386         public CloseOpenChangesetsAction() {
     386        CloseOpenChangesetsAction() {
    387387            putValue(NAME, tr("Close open changesets"));
    388388            putValue(SHORT_DESCRIPTION, tr("Closes the selected open changesets"));
    … …  
    419419     */
    420420    class ShowChangesetInfoAction extends AbstractAction implements ListSelectionListener, ItemListener {
    421         public ShowChangesetInfoAction() {
     421        ShowChangesetInfoAction() {
    422422            putValue(NAME, tr("Show info"));
    423423            putValue(SHORT_DESCRIPTION, tr("Open a web page for each selected changeset"));
    … …  
    462462     */
    463463    class LaunchChangesetManagerAction extends AbstractAction {
    464         public LaunchChangesetManagerAction() {
     464        LaunchChangesetManagerAction() {
    465465            putValue(NAME, tr("Details"));
    466466            putValue(SHORT_DESCRIPTION, tr("Opens the Changeset Manager window for the selected changesets"));
    … …  
    561561
    562562    class ChangesetDialogPopup extends ListPopupMenu {
    563         public ChangesetDialogPopup(JList<?> ... lists) {
     563        ChangesetDialogPopup(JList<?> ... lists) {
    564564            super(lists);
    565565            add(selectObjectsAction);

  • trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java

    r8633 r8836  
    169169        private JTree source;
    170170
    171         public UndoRedoSelectionListener(JTree source) {
     171        UndoRedoSelectionListener(JTree source) {
    172172            this.source = source;
    173173        }
    … …  
    486486    class MouseEventHandler extends PopupMenuLauncher {
    487487
    488         public MouseEventHandler() {
     488        MouseEventHandler() {
    489489            super(new CommandStackPopup());
    490490        }
    … …  
    499499
    500500    private class CommandStackPopup extends JPopupMenu {
    501         public CommandStackPopup() {
     501        CommandStackPopup() {
    502502            add(selectAction);
    503503            add(selectAndZoomAction);

  • trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

    r8512 r8836  
    352352         * Constructs a new {@code MouseEventHandler}.
    353353         */
    354         public MouseEventHandler() {
     354        MouseEventHandler() {
    355355            super(popupMenu);
    356356        }
    … …  
    374374         * Constructs a new {@code ConflictListModel}.
    375375         */
    376         public ConflictListModel() {
     376        ConflictListModel() {
    377377            listeners = new CopyOnWriteArrayList<>();
    378378        }
    … …  
    431431
    432432    class ResolveAction extends AbstractAction implements ListSelectionListener {
    433         public ResolveAction() {
     433        ResolveAction() {
    434434            putValue(NAME, tr("Resolve"));
    435435            putValue(SHORT_DESCRIPTION,  tr("Open a merge dialog of all selected items in the list above."));

  • trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java

    r8510 r8836  
    155155     */
    156156    class CancelAction extends AbstractAction {
    157         public CancelAction() {
     157        CancelAction() {
    158158            putValue(Action.SHORT_DESCRIPTION, tr("Cancel conflict resolution and close the dialog"));
    159159            putValue(Action.NAME, tr("Cancel"));
    … …  
    172172     */
    173173    static class HelpAction extends AbstractAction {
    174         public HelpAction() {
     174        HelpAction() {
    175175            putValue(Action.SHORT_DESCRIPTION, tr("Show help information"));
    176176            putValue(Action.NAME, tr("Help"));
    … …  
    190190     */
    191191    class ApplyResolutionAction extends AbstractAction implements PropertyChangeListener {
    192         public ApplyResolutionAction() {
     192        ApplyResolutionAction() {
    193193            putValue(Action.SHORT_DESCRIPTION, tr("Apply resolved conflicts and close the dialog"));
    194194            putValue(Action.NAME, tr("Apply Resolution"));
    … …  
    213213                                + "Click <strong>{0}</strong> to close anyway.<strong> Already<br>"
    214214                                + "resolved differences will not be applied.</strong><br>"
    215                                 + "Click <strong>{1}</strong> to return to resolving conflicts.</html>"
    216                                 , options[0].toString(), options[1].toString()
     215                                + "Click <strong>{1}</strong> to return to resolving conflicts.</html>",
     216                                options[0].toString(), options[1].toString()
    217217                        ),
    218218                        tr("Conflict not resolved completely"),

  • trunk/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java

    r8510 r8836  
    316316        }
    317317
    318         public RelationMemberTableColumnModel() {
     318        RelationMemberTableColumnModel() {
    319319            createColumns();
    320320        }
    … …  
    322322
    323323    class OKAction extends AbstractAction {
    324         public OKAction() {
     324        OKAction() {
    325325            putValue(NAME, tr("OK"));
    326326            putValue(SMALL_ICON, ImageProvider.get("ok"));
    … …  
    336336
    337337    class CancelAction extends AbstractAction {
    338         public CancelAction() {
     338        CancelAction() {
    339339            putValue(NAME, tr("Cancel"));
    340340            putValue(SMALL_ICON, ImageProvider.get("cancel"));

  • trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java

    r8510 r8836  
    431431    private class HidingFilterAction extends AbstractFilterAction {
    432432
    433         public HidingFilterAction() {
     433        HidingFilterAction() {
    434434            putValue(SHORT_DESCRIPTION, tr("Hiding filter"));
    435435            HIDING_FILTER_SHORTCUT.setAccelerator(this);
    … …  
    451451            }
    452452        }
    453 
    454453    }
    455454}

  • trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java

    r8510 r8836  
    349349     */
    350350    private static class OSDLabel extends JLabel {
    351         public OSDLabel(String text) {
     351        OSDLabel(String text) {
    352352            super(text);
    353353            setOpaque(true);

  • trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

    r8818 r8836  
    125125        private int layerIndex = -1;
    126126
    127         public ToggleLayerIndexVisibility(int layerIndex) {
     127        ToggleLayerIndexVisibility(int layerIndex) {
    128128            this.layerIndex = layerIndex;
    129129        }
    … …  
    981981
    982982    private static class ActiveLayerCheckBox extends JCheckBox {
    983         public ActiveLayerCheckBox() {
     983        ActiveLayerCheckBox() {
    984984            setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
    985985            ImageIcon blank = ImageProvider.get("dialogs/layerlist", "blank");
    … …  
    10011001         * Constructs a new {@code LayerVisibleCheckBox}.
    10021002         */
    1003         public LayerVisibleCheckBox() {
     1003        LayerVisibleCheckBox() {
    10041004            setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
    10051005            iconEye = ImageProvider.get("dialogs/layerlist", "eye");
    … …  
    10371037         * Constructs a new {@code ActiveLayerCellRenderer}.
    10381038         */
    1039         public ActiveLayerCellRenderer() {
     1039        ActiveLayerCellRenderer() {
    10401040            cb = new ActiveLayerCheckBox();
    10411041        }
    … …  
    10561056         * Constructs a new {@code LayerVisibleCellRenderer}.
    10571057         */
    1058         public LayerVisibleCellRenderer() {
     1058        LayerVisibleCellRenderer() {
    10591059            this.cb = new LayerVisibleCheckBox();
    10601060        }
    … …  
    10721072        private final LayerVisibleCheckBox cb;
    10731073
    1074         public LayerVisibleCellEditor(LayerVisibleCheckBox cb) {
     1074        LayerVisibleCellEditor(LayerVisibleCheckBox cb) {
    10751075            super(cb);
    10761076            this.cb = cb;
    … …  
    11321132
    11331133    private static class LayerNameCellEditor extends DefaultCellEditor {
    1134         public LayerNameCellEditor(DisableShortcutsOnFocusGainedTextField tf) {
     1134        LayerNameCellEditor(DisableShortcutsOnFocusGainedTextField tf) {
    11351135            super(tf);
    11361136        }
    … …  
    11571157     */
    11581158    class MoveUpAction extends AbstractAction implements  IEnabledStateUpdating{
    1159         public MoveUpAction() {
     1159        MoveUpAction() {
    11601160            putValue(NAME, tr("Move up"));
    11611161            putValue(SMALL_ICON, ImageProvider.get("dialogs", "up"));
    … …  
    11791179     */
    11801180    class MoveDownAction extends AbstractAction implements IEnabledStateUpdating {
    1181         public MoveDownAction() {
     1181        MoveDownAction() {
    11821182            putValue(NAME, tr("Move down"));
    11831183            putValue(SMALL_ICON, ImageProvider.get("dialogs", "down"));
    … …  
    16661666
    16671667    static class LayerList extends JTable {
    1668         public LayerList(TableModel dataModel) {
     1668        LayerList(TableModel dataModel) {
    16691669            super(dataModel);
    16701670        }

  • trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java

    r8510 r8836  
    296296         * Constructs a new {@code MyCheckBoxRenderer}.
    297297         */
    298         public MyCheckBoxRenderer() {
     298        MyCheckBoxRenderer() {
    299299            setHorizontalAlignment(SwingConstants.CENTER);
    300300            setVerticalAlignment(SwingConstants.CENTER);
    … …  
    493493            private boolean error;
    494494
    495             public SaveToFileTask(StyleSource s, File file) {
     495            SaveToFileTask(StyleSource s, File file) {
    496496                super(tr("Reloading style sources"));
    497497                this.s = s;
    … …  
    536536                            se.url = file.getPath();
    537537                            MapPaintStyles.addStyle(se);
    538                             tblStyles.getSelectionModel().setSelectionInterval(model.getRowCount() - 1 , model.getRowCount() - 1);
     538                            tblStyles.getSelectionModel().setSelectionInterval(model.getRowCount() - 1, model.getRowCount() - 1);
    539539                            model.ensureSelectedIsVisible();
    540540                        }

  • trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java

    r8510 r8836  
    268268         * Constructs a new {@code NoteTableModel}.
    269269         */
    270         public NoteTableModel() {
     270        NoteTableModel() {
    271271            data = new ArrayList<>();
    272272        }
    … …  
    303303         * Constructs a new {@code AddCommentAction}.
    304304         */
    305         public AddCommentAction() {
     305        AddCommentAction() {
    306306            putValue(SHORT_DESCRIPTION, tr("Add comment"));
    307307            putValue(NAME, tr("Comment"));
    … …  
    335335         * Constructs a new {@code CloseAction}.
    336336         */
    337         public CloseAction() {
     337        CloseAction() {
    338338            putValue(SHORT_DESCRIPTION, tr("Close note"));
    339339            putValue(NAME, tr("Close"));
    … …  
    360360         * Constructs a new {@code NewAction}.
    361361         */
    362         public NewAction() {
     362        NewAction() {
    363363            putValue(SHORT_DESCRIPTION, tr("Create a new note"));
    364364            putValue(NAME, tr("Create"));
    … …  
    380380         * Constructs a new {@code ReopenAction}.
    381381         */
    382         public ReopenAction() {
     382        ReopenAction() {
    383383            putValue(SHORT_DESCRIPTION, tr("Reopen note"));
    384384            putValue(NAME, tr("Reopen"));
    … …  
    406406         * Constructs a new {@code SortAction}.
    407407         */
    408         public SortAction() {
     408        SortAction() {
    409409            putValue(SHORT_DESCRIPTION, tr("Sort notes"));
    410410            putValue(NAME, tr("Sort"));

  • trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

    r8811 r8836  
    317317    class MouseEventHandler extends PopupMenuLauncher {
    318318
    319         public MouseEventHandler() {
     319        MouseEventHandler() {
    320320            super(popupMenu);
    321321        }
    … …  
    352352     */
    353353    static class NewAction extends AbstractAction implements LayerChangeListener{
    354         public NewAction() {
     354        NewAction() {
    355355            putValue(SHORT_DESCRIPTION, tr("Create a new relation"));
    356356            putValue(NAME, tr("New"));
    … …  
    398398        private transient SearchCompiler.Match filter;
    399399
    400         public RelationListModel(DefaultListSelectionModel selectionModel) {
     400        RelationListModel(DefaultListSelectionModel selectionModel) {
    401401            this.selectionModel = selectionModel;
    402402        }

  • trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

    r8510 r8836  
    200200        private boolean highlightEnabled = Main.pref.getBoolean("draw.target-highlight", true);
    201201
    202         public MouseEventHandler() {
     202        MouseEventHandler() {
    203203            super(popupMenu);
    204204        }
    … …  
    293293         * Constructs a new {@code SearchAction}.
    294294         */
    295         public SearchAction() {
     295        SearchAction() {
    296296            putValue(NAME, tr("Search"));
    297297            putValue(SHORT_DESCRIPTION,   tr("Search for objects"));
    … …  
    324324         * Constructs a new {@code SelectAction}.
    325325         */
    326         public SelectAction() {
     326        SelectAction() {
    327327            updateEnabledState();
    328328        }
    … …  
    355355         * Constructs a new {@code ShowHistoryAction}.
    356356         */
    357         public ShowHistoryAction() {
     357        ShowHistoryAction() {
    358358            putValue(NAME, tr("History"));
    359359            putValue(SHORT_DESCRIPTION, tr("Display the history of the selected objects."));
    … …  
    395395    class ZoomToJOSMSelectionAction extends AbstractAction implements ListDataListener {
    396396
    397         public ZoomToJOSMSelectionAction() {
     397        ZoomToJOSMSelectionAction() {
    398398            putValue(NAME, tr("Zoom to selection"));
    399399            putValue(SHORT_DESCRIPTION, tr("Zoom to selection"));
    … …  
    436436         * Constructs a new {@code ZoomToListSelection}.
    437437         */
    438         public ZoomToListSelection() {
     438        ZoomToListSelection() {
    439439            putValue(NAME, tr("Zoom to selected element(s)"));
    440440            putValue(SHORT_DESCRIPTION, tr("Zoom to selected element(s)"));
    … …  
    486486         * @param selectionModel the selection model used in the list
    487487         */
    488         public SelectionListModel(DefaultListSelectionModel selectionModel) {
     488        SelectionListModel(DefaultListSelectionModel selectionModel) {
    489489            this.selectionModel = selectionModel;
    490490        }

  • trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java

    r8510 r8836  
    610610             * Constructs a new {@code DialogPopupMenu}.
    611611             */
    612             public DialogPopupMenu() {
     612            DialogPopupMenu() {
    613613                alwaysShown.setSelected(buttonHiding == ButtonHidingType.ALWAYS_SHOWN);
    614614                dynamic.setSelected(buttonHiding == ButtonHidingType.DYNAMIC);
    … …  
    636636             * Constructs a new {@code MouseEventHandler}.
    637637             */
    638             public MouseEventHandler() {
     638            MouseEventHandler() {
    639639                super(popupMenu);
    640640            }
    … …  
    660660     */
    661661    private class DetachedDialog extends JDialog {
    662         public DetachedDialog() {
     662        DetachedDialog() {
    663663            super(JOptionPane.getFrameForComponent(Main.parent));
    664664            getContentPane().add(ToggleDialog.this);

  • trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java

    r8510 r8836  
    137137            public void run() {
    138138                if (model.getRowCount() != 0) {
    139                     setTitle(trn("{0} Author", "{0} Authors", model.getRowCount() , model.getRowCount()));
     139                    setTitle(trn("{0} Author", "{0} Authors", model.getRowCount(), model.getRowCount()));
    140140                } else {
    141141                    setTitle(tr("Authors"));
    … …  
    156156
    157157    class SelectUsersPrimitivesAction extends AbstractAction implements ListSelectionListener{
    158         public SelectUsersPrimitivesAction() {
     158
     159        /**
     160         * Constructs a new {@code SelectUsersPrimitivesAction}.
     161         */
     162        SelectUsersPrimitivesAction() {
    159163            putValue(NAME, tr("Select"));
    160164            putValue(SHORT_DESCRIPTION, tr("Select objects submitted by this user"));
    … …  
    189193    class ShowUserInfoAction extends AbstractInfoAction implements ListSelectionListener {
    190194
    191         public ShowUserInfoAction() {
     195        ShowUserInfoAction() {
    192196            super(false);
    193197            putValue(NAME, tr("Show info"));
    … …  
    286290        private transient List<UserInfo> data;
    287291
    288         public UserTableModel() {
     292        UserTableModel() {
    289293            setColumnIdentifiers(new String[]{tr("Author"), tr("# Objects"), "%"});
    290294            data = new ArrayList<>();

  • trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java

    r8683 r8836  
    474474    class MouseEventHandler extends PopupMenuLauncher {
    475475
    476         public MouseEventHandler() {
     476        MouseEventHandler() {
    477477            super(popupMenu);
    478478        }
    … …  
    589589        private boolean canceled;
    590590
    591         public FixTask(Collection<TestError> testErrors) {
     591        FixTask(Collection<TestError> testErrors) {
    592592            super(tr("Fixing errors ..."), false /* don't ignore exceptions */);
    593593            this.testErrors = testErrors == null ? new ArrayList<TestError>() : testErrors;

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java

    r8510 r8836  
    349349     */
    350350    static class CancelAction extends AbstractAction {
    351         public CancelAction() {
     351        CancelAction() {
    352352            putValue(NAME, tr("Close"));
    353353            putValue(SMALL_ICON, ImageProvider.get("cancel"));
    … …  
    369369     */
    370370    class QueryAction extends AbstractAction {
    371         public QueryAction() {
     371        QueryAction() {
    372372            putValue(NAME, tr("Query"));
    373373            putValue(SMALL_ICON, ImageProvider.get("dialogs", "search"));
    … …  
    400400     */
    401401    class RemoveFromCacheAction extends AbstractAction implements ListSelectionListener{
    402         public RemoveFromCacheAction() {
     402        RemoveFromCacheAction() {
    403403            putValue(NAME, tr("Remove from cache"));
    404404            putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
    … …  
    420420        public void valueChanged(ListSelectionEvent e) {
    421421            updateEnabledState();
    422 
    423422        }
    424423    }
    … …  
    429428     */
    430429    class CloseSelectedChangesetsAction extends AbstractAction implements ListSelectionListener{
    431         public CloseSelectedChangesetsAction() {
     430        CloseSelectedChangesetsAction() {
    432431            putValue(NAME, tr("Close"));
    433432            putValue(SMALL_ICON, ImageProvider.get("closechangeset"));
    … …  
    471470     */
    472471    class DownloadSelectedChangesetsAction extends AbstractAction implements ListSelectionListener{
    473         public DownloadSelectedChangesetsAction() {
     472        DownloadSelectedChangesetsAction() {
    474473            putValue(NAME, tr("Update changeset"));
    475474            putValue(SMALL_ICON, ImageProvider.get("dialogs/changeset", "updatechangeset"));
    … …  
    500499     */
    501500    class DownloadSelectedChangesetContentAction extends AbstractAction implements ListSelectionListener{
    502         public DownloadSelectedChangesetContentAction() {
     501        DownloadSelectedChangesetContentAction() {
    503502            putValue(NAME, tr("Download changeset content"));
    504503            putValue(SMALL_ICON, DOWNLOAD_CONTENT_ICON);
    … …  
    538537
    539538    class DownloadMyChangesets extends AbstractAction {
    540         public DownloadMyChangesets() {
     539        DownloadMyChangesets() {
    541540            putValue(NAME, tr("My changesets"));
    542541            putValue(SMALL_ICON, ImageProvider.get("dialogs/changeset", "downloadchangeset"));
    … …  
    578577    class MouseEventHandler extends PopupMenuLauncher {
    579578
    580         public MouseEventHandler() {
     579        MouseEventHandler() {
    581580            super(new ChangesetTablePopupMenu());
    582581        }
    … …  
    591590
    592591    class ChangesetTablePopupMenu extends JPopupMenu {
    593         public ChangesetTablePopupMenu() {
     592        ChangesetTablePopupMenu() {
    594593            add(actRemoveFromCacheAction);
    595594            add(actCloseSelectedChangesetsAction);

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java

    r8512 r8836  
    192192     */
    193193    class DownloadChangesetContentAction extends AbstractAction{
    194         public DownloadChangesetContentAction() {
     194        DownloadChangesetContentAction() {
    195195            putValue(NAME, tr("Download content"));
    196196            putValue(SMALL_ICON, ChangesetCacheManager.DOWNLOAD_CONTENT_ICON);
    … …  
    225225
    226226    class ChangesetContentTablePopupMenu extends JPopupMenu {
    227         public ChangesetContentTablePopupMenu() {
     227        ChangesetContentTablePopupMenu() {
    228228            add(actDownloadContentAction);
    229229            add(actShowHistory);
    … …  
    269269        }
    270270
    271         public ShowHistoryAction() {
     271        ShowHistoryAction() {
    272272            putValue(NAME, tr("Show history"));
    273273            putValue(SMALL_ICON, ImageProvider.get("dialogs", "history"));
    … …  
    319319    class SelectInCurrentLayerAction extends AbstractAction implements ListSelectionListener, EditLayerChangeListener{
    320320
    321         public SelectInCurrentLayerAction() {
     321        SelectInCurrentLayerAction() {
    322322            putValue(NAME, tr("Select in layer"));
    323323            putValue(SMALL_ICON, ImageProvider.get("dialogs", "select"));
    … …  
    369369    class ZoomInCurrentLayerAction extends AbstractAction implements ListSelectionListener, EditLayerChangeListener{
    370370
    371         public ZoomInCurrentLayerAction() {
     371        ZoomInCurrentLayerAction() {
    372372            putValue(NAME, tr("Zoom to in layer"));
    373373            putValue(SMALL_ICON, ImageProvider.get("dialogs/autoscale", "selection"));
    … …  
    433433        }
    434434
    435         public HeaderPanel() {
     435        HeaderPanel() {
    436436            build();
    437437        }
    … …  
    443443
    444444        private class DownloadAction extends AbstractAction {
    445             public DownloadAction() {
     445            DownloadAction() {
    446446                putValue(NAME, tr("Download now"));
    447447                putValue(SHORT_DESCRIPTION, tr("Download the changeset content"));

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java

    r8510 r8836  
    143143        private final HistoryOsmPrimitive primitive;
    144144
    145         public ChangesetContentEntry(ChangesetModificationType modificationType, HistoryOsmPrimitive primitive) {
     145        ChangesetContentEntry(ChangesetModificationType modificationType, HistoryOsmPrimitive primitive) {
    146146            this.modificationType = modificationType;
    147147            this.primitive = primitive;
    148148        }
    149149
    150         public ChangesetContentEntry(ChangesetDataSetEntry entry) {
     150        ChangesetContentEntry(ChangesetDataSetEntry entry) {
    151151            this(entry.getModificationType(), entry.getPrimitive());
    152152        }

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java

    r8510 r8836  
    268268     */
    269269    class RemoveFromCacheAction extends AbstractAction {
    270         public RemoveFromCacheAction() {
     270        RemoveFromCacheAction() {
    271271            putValue(NAME, tr("Remove from cache"));
    272272            putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
    … …  
    291291     */
    292292    class DownloadChangesetContentAction extends AbstractAction {
    293         public DownloadChangesetContentAction() {
     293        DownloadChangesetContentAction() {
    294294            putValue(NAME, tr("Download content"));
    295295            putValue(SMALL_ICON, ChangesetCacheManager.DOWNLOAD_CONTENT_ICON);
    … …  
    328328     */
    329329    class UpdateChangesetAction extends AbstractAction{
    330         public UpdateChangesetAction() {
     330        UpdateChangesetAction() {
    331331            putValue(NAME, tr("Update changeset"));
    332332            putValue(SMALL_ICON, ChangesetCacheManager.UPDATE_CONTENT_ICON);
    … …  
    357357    class SelectInCurrentLayerAction extends AbstractAction implements EditLayerChangeListener{
    358358
    359         public SelectInCurrentLayerAction() {
     359        SelectInCurrentLayerAction() {
    360360            putValue(NAME, tr("Select in layer"));
    361361            putValue(SMALL_ICON, ImageProvider.get("dialogs", "select"));
    … …  
    418418    class ZoomInCurrentLayerAction extends AbstractAction implements EditLayerChangeListener{
    419419
    420         public ZoomInCurrentLayerAction() {
     420        ZoomInCurrentLayerAction() {
    421421            putValue(NAME, tr("Zoom to in layer"));
    422422            putValue(SMALL_ICON, ImageProvider.get("dialogs/autoscale", "selection"));

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionPanel.java

    r8510 r8836  
    6060     */
    6161    class UpdateChangesetDiscussionAction extends AbstractAction {
    62         public UpdateChangesetDiscussionAction() {
     62        UpdateChangesetDiscussionAction() {
    6363            putValue(NAME, tr("Update changeset discussion"));
    6464            putValue(SMALL_ICON, ChangesetCacheManager.UPDATE_CONTENT_ICON);

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java

    r8510 r8836  
    7878    class DownloadAction extends AbstractAction implements DocumentListener{
    7979
    80         public DownloadAction() {
     80        DownloadAction() {
    8181            putValue(SMALL_ICON, ChangesetCacheManager.DOWNLOAD_CONTENT_ICON);
    8282            putValue(SHORT_DESCRIPTION, tr("Download the changeset with the specified id, including the changeset content"));

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java

    r8540 r8836  
    329329        }
    330330
    331         public OpenAndCloseStateRestrictionPanel() {
     331        OpenAndCloseStateRestrictionPanel() {
    332332            build();
    333333        }
    … …  
    490490        }
    491491
    492         public UserRestrictionPanel() {
     492        UserRestrictionPanel() {
    493493            build();
    494494        }
    … …  
    807807        }
    808808
    809         public TimeRestrictionPanel() {
     809        TimeRestrictionPanel() {
    810810            build();
    811811        }
    … …  
    928928
    929929    private static class BBoxRestrictionPanel extends BoundingBoxSelectionPanel {
    930         public BBoxRestrictionPanel() {
     930        BBoxRestrictionPanel() {
    931931            setBorder(BorderFactory.createCompoundBorder(
    932932                    BorderFactory.createEmptyBorder(3, 3, 3, 3),
    … …  
    972972        }
    973973
    974         public UidInputFieldValidator(JTextComponent tc) {
     974        UidInputFieldValidator(JTextComponent tc) {
    975975            super(tc);
    976976        }
    … …  
    10191019        }
    10201020
    1021         public UserNameInputValidator(JTextComponent tc) {
     1021        UserNameInputValidator(JTextComponent tc) {
    10221022            super(tc);
    10231023        }
    … …  
    10501050        }
    10511051
    1052         public DateValidator(JTextComponent tc) {
     1052        DateValidator(JTextComponent tc) {
    10531053            super(tc);
    10541054        }
    … …  
    11171117        }
    11181118
    1119         public TimeValidator(JTextComponent tc) {
     1119        TimeValidator(JTextComponent tc) {
    11201120            super(tc);
    11211121        }

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java

    r8510 r8836  
    3535     * Enumeration of basic, predefined queries
    3636     */
    37     private static enum BasicQuery {
     37    private enum BasicQuery {
    3838        MOST_RECENT_CHANGESETS,
    3939        MY_OPEN_CHANGESETS,

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java

    r8510 r8836  
    158158
    159159    class QueryAction extends AbstractAction {
    160         public QueryAction() {
     160        QueryAction() {
    161161            putValue(NAME, tr("Query"));
    162162            putValue(SMALL_ICON, ImageProvider.get("dialogs", "search"));
    … …  
    207207    class CancelAction extends AbstractAction {
    208208
    209         public CancelAction() {
     209        CancelAction() {
    210210            putValue(NAME, tr("Cancel"));
    211211            putValue(SMALL_ICON, ImageProvider.get("cancel"));

  • trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

    r8811 r8836  
    5656import org.openstreetmap.josm.actions.relation.SelectMembersAction;
    5757import org.openstreetmap.josm.actions.relation.SelectRelationAction;
    58 import org.openstreetmap.josm.actions.search.SearchAction.SearchMode;
    5958import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting;
    6059import org.openstreetmap.josm.command.ChangeCommand;
    … …  
    894893        private static final String DELETE_FROM_RELATION_PREF = "delete_from_relation";
    895894
    896         public DeleteAction() {
     895        DeleteAction() {
    897896            super(tr("Delete"), /* ICON() */ "dialogs/delete", tr("Delete the selected key in all objects"),
    898897                    Shortcut.registerShortcut("properties:delete", tr("Delete Tags"), KeyEvent.VK_D,
    … …  
    10021001     */
    10031002    class AddAction extends JosmAction {
    1004         public AddAction() {
     1003        AddAction() {
    10051004            super(tr("Add"), /* ICON() */ "dialogs/add", tr("Add a new key/value pair to all objects"),
    10061005                    Shortcut.registerShortcut("properties:add", tr("Add Tag"), KeyEvent.VK_A,
    … …  
    10191018     */
    10201019    class EditAction extends JosmAction implements ListSelectionListener {
    1021         public EditAction() {
     1020        EditAction() {
    10221021            super(tr("Edit"), /* ICON() */ "dialogs/edit", tr("Edit the value of the selected key for all objects"),
    10231022                    Shortcut.registerShortcut("properties:edit", tr("Edit Tags"), KeyEvent.VK_S,
    … …  
    10541053
    10551054    class HelpAction extends AbstractAction {
    1056         public HelpAction() {
     1055        HelpAction() {
    10571056            putValue(NAME, tr("Go to OSM wiki for tag help (F1)"));
    10581057            putValue(SHORT_DESCRIPTION, tr("Launch browser with wiki help for selected object"));
    … …  
    11551154        final StringProperty TAGINFO_URL_PROP = new StringProperty("taginfo.url", "https://taginfo.openstreetmap.org/");
    11561155
    1157         public TaginfoAction() {
     1156        TaginfoAction() {
    11581157            super(tr("Go to Taginfo"), "dialogs/taginfo", tr("Launch browser with Taginfo statistics for selected object"), null, false);
    11591158        }
    … …  
    11841183
    11851184    class PasteValueAction extends AbstractAction {
    1186         public PasteValueAction() {
     1185        PasteValueAction() {
    11871186            putValue(NAME, tr("Paste Value"));
    11881187            putValue(SHORT_DESCRIPTION, tr("Paste the value of the selected tag from clipboard"));
    … …  
    12351234         * Constructs a new {@code CopyValueAction}.
    12361235         */
    1237         public CopyValueAction() {
     1236        CopyValueAction() {
    12381237            putValue(NAME, tr("Copy Value"));
    12391238            putValue(SHORT_DESCRIPTION, tr("Copy the value of the selected tag to clipboard"));
    … …  
    12491248    class CopyKeyValueAction extends AbstractCopyAction {
    12501249
    1251         public CopyKeyValueAction() {
     1250        CopyKeyValueAction() {
    12521251            putValue(NAME, tr("Copy selected Key(s)/Value(s)"));
    12531252            putValue(SHORT_DESCRIPTION, tr("Copy the key and value of the selected tag(s) to clipboard"));
    … …  
    12631262    class CopyAllKeyValueAction extends AbstractCopyAction {
    12641263
    1265         public CopyAllKeyValueAction() {
     1264        CopyAllKeyValueAction() {
    12661265            putValue(NAME, tr("Copy all Keys/Values"));
    12671266            putValue(SHORT_DESCRIPTION, tr("Copy the key and value of all the tags to clipboard"));
    … …  
    12811280        private final boolean sameType;
    12821281
    1283         public SearchAction(boolean sameType) {
     1282        SearchAction(boolean sameType) {
    12841283            this.sameType = sameType;
    12851284            if (sameType) {

  • trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

    r8540 r8836  
    424424        protected Component componentUnderMouse;
    425425
    426         public AbstractTagsDialog(Component parent, String title, String[] buttonTexts) {
     426        AbstractTagsDialog(Component parent, String title, String[] buttonTexts) {
    427427            super(parent, title, buttonTexts);
    428428            addMouseListener(new PopupMenuLauncher(popupMenu));
    … …  
    541541        private int commandCount;
    542542
    543         public AddTagsDialog() {
     543        AddTagsDialog() {
    544544            super(Main.parent, tr("Add value?"), new String[] {tr("OK"), tr("Cancel")});
    545545            setButtonIcons(new String[] {"ok", "cancel"});

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java

    r8510 r8836  
    173173     */
    174174    class EditAction extends AbstractAction implements TreeSelectionListener {
    175         public EditAction() {
     175        EditAction() {
    176176            putValue(SHORT_DESCRIPTION, tr("Edit the relation the currently selected relation member refers to."));
    177177            putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit"));
    … …  
    218218     */
    219219    class DownloadAllChildRelationsAction extends AbstractAction{
    220         public DownloadAllChildRelationsAction() {
     220        DownloadAllChildRelationsAction() {
    221221            putValue(SHORT_DESCRIPTION, tr("Download all child relations (recursively)"));
    222222            putValue(SMALL_ICON, ImageProvider.get("download"));
    … …  
    240240     */
    241241    class DownloadSelectedAction extends AbstractAction implements TreeSelectionListener {
    242         public DownloadSelectedAction() {
     242        DownloadSelectedAction() {
    243243            putValue(SHORT_DESCRIPTION, tr("Download selected relations"));
    244244            // FIXME: replace with better icon
    … …  
    283283        protected Exception lastException;
    284284
    285         public DownloadTask(String title, Dialog parent) {
     285        DownloadTask(String title, Dialog parent) {
    286286            super(title, new PleaseWaitProgressMonitor(parent), false);
    287287        }
    … …  
    332332        private final Set<Long> downloadedRelationIds;
    333333
    334         public DownloadAllChildrenTask(Dialog parent, Relation r) {
     334        DownloadAllChildrenTask(Dialog parent, Relation r) {
    335335            super(tr("Download relation members"), parent);
    336336            this.relation = r;
    … …  
    443443        private final Set<Relation> relations;
    444444
    445         public DownloadRelationSetTask(Dialog parent, Set<Relation> relations) {
     445        DownloadRelationSetTask(Dialog parent, Set<Relation> relations) {
    446446            super(tr("Download relation members"), parent);
    447447            this.relations = relations;

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

    r8540 r8836  
    827827
    828828    class AddSelectedAtStartAction extends AddFromSelectionAction implements TableModelListener {
    829         public AddSelectedAtStartAction() {
     829        AddSelectedAtStartAction() {
    830830            putValue(SHORT_DESCRIPTION,
    831831                    tr("Add all objects selected in the current dataset before the first member"));
    … …  
    858858
    859859    class AddSelectedAtEndAction extends AddFromSelectionAction implements TableModelListener {
    860         public AddSelectedAtEndAction() {
     860        AddSelectedAtEndAction() {
    861861            putValue(SHORT_DESCRIPTION, tr("Add all objects selected in the current dataset after the last member"));
    862862            putValue(SMALL_ICON, ImageProvider.get("dialogs/conflict", "copyendright"));
    … …  
    891891         * Constructs a new {@code AddSelectedBeforeSelection}.
    892892         */
    893         public AddSelectedBeforeSelection() {
     893        AddSelectedBeforeSelection() {
    894894            putValue(SHORT_DESCRIPTION,
    895895                    tr("Add all objects selected in the current dataset before the first selected member"));
    … …  
    929929
    930930    class AddSelectedAfterSelection extends AddFromSelectionAction implements TableModelListener, ListSelectionListener {
    931         public AddSelectedAfterSelection() {
     931        AddSelectedAfterSelection() {
    932932            putValue(SHORT_DESCRIPTION,
    933933                    tr("Add all objects selected in the current dataset after the last selected member"));
    … …  
    970970         * Constructs a new {@code RemoveSelectedAction}.
    971971         */
    972         public RemoveSelectedAction() {
     972        RemoveSelectedAction() {
    973973            putValue(SHORT_DESCRIPTION, tr("Remove all members referring to one of the selected objects"));
    974974            putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "deletemembers"));
    … …  
    10051005     */
    10061006    class SelectedMembersForSelectionAction extends AbstractAction implements TableModelListener {
    1007         public SelectedMembersForSelectionAction() {
     1007        SelectedMembersForSelectionAction() {
    10081008            putValue(SHORT_DESCRIPTION, tr("Select relation members which refer to objects in the current selection"));
    10091009            putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "selectmembers"));
    … …  
    10411041     */
    10421042    class SelectPrimitivesForSelectedMembersAction extends AbstractAction implements ListSelectionListener {
    1043         public SelectPrimitivesForSelectedMembersAction() {
     1043        SelectPrimitivesForSelectedMembersAction() {
    10441044            putValue(SHORT_DESCRIPTION, tr("Select objects for selected relation members"));
    10451045            putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "selectprimitives"));
    … …  
    10631063
    10641064    class SortAction extends AbstractAction implements TableModelListener {
    1065         public SortAction() {
     1065        SortAction() {
    10661066            String tooltip = tr("Sort the relation members");
    10671067            putValue(SMALL_ICON, ImageProvider.get("dialogs", "sort"));
    … …  
    10901090
    10911091    class SortBelowAction extends AbstractAction implements TableModelListener, ListSelectionListener {
    1092         public SortBelowAction() {
     1092        SortBelowAction() {
    10931093            putValue(SMALL_ICON, ImageProvider.get("dialogs", "sort_below"));
    10941094            putValue(NAME, tr("Sort below"));
    … …  
    11181118
    11191119    class ReverseAction extends AbstractAction implements TableModelListener {
    1120         public ReverseAction() {
     1120        ReverseAction() {
    11211121            putValue(SHORT_DESCRIPTION, tr("Reverse the order of the relation members"));
    11221122            putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "reverse"));
    … …  
    11431143
    11441144    class MoveUpAction extends AbstractAction implements ListSelectionListener {
    1145         public MoveUpAction() {
     1145        MoveUpAction() {
    11461146            String tooltip = tr("Move the currently selected members up");
    11471147            putValue(SMALL_ICON, ImageProvider.get("dialogs", "moveup"));
    … …  
    11651165
    11661166    class MoveDownAction extends AbstractAction implements ListSelectionListener {
    1167         public MoveDownAction() {
     1167        MoveDownAction() {
    11681168            String tooltip = tr("Move the currently selected members down");
    11691169            putValue(SMALL_ICON, ImageProvider.get("dialogs", "movedown"));
    … …  
    11871187
    11881188    class RemoveAction extends AbstractAction implements ListSelectionListener {
    1189         public RemoveAction() {
     1189        RemoveAction() {
    11901190            String tooltip = tr("Remove the currently selected members from this relation");
    11911191            putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
    … …  
    12101210
    12111211    class DeleteCurrentRelationAction extends AbstractAction implements PropertyChangeListener{
    1212         public DeleteCurrentRelationAction() {
     1212        DeleteCurrentRelationAction() {
    12131213            putValue(SHORT_DESCRIPTION, tr("Delete the currently edited relation"));
    12141214            putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
    … …  
    13221322                            tr("Yes, create a conflict and close"),
    13231323                            ImageProvider.get("ok"),
    1324                             tr("Click to create a conflict and close this relation editor") ,
     1324                            tr("Click to create a conflict and close this relation editor"),
    13251325                            null /* no specific help topic */
    13261326                    ),
    … …  
    13281328                            tr("No, continue editing"),
    13291329                            ImageProvider.get("cancel"),
    1330                             tr("Click to return to the relation editor and to resume relation editing") ,
     1330                            tr("Click to return to the relation editor and to resume relation editing"),
    13311331                            null /* no specific help topic */
    13321332                    )
    … …  
    13651365
    13661366    class ApplyAction extends SavingAction {
    1367         public ApplyAction() {
     1367        ApplyAction() {
    13681368            putValue(SHORT_DESCRIPTION, tr("Apply the current updates"));
    13691369            putValue(SMALL_ICON, ImageProvider.get("save"));
    … …  
    13991399
    14001400    class OKAction extends SavingAction {
    1401         public OKAction() {
     1401        OKAction() {
    14021402            putValue(SHORT_DESCRIPTION, tr("Apply the updates and close the dialog"));
    14031403            putValue(SMALL_ICON, ImageProvider.get("ok"));
    … …  
    14361436
    14371437    class CancelAction extends SavingAction {
    1438         public CancelAction() {
     1438        CancelAction() {
    14391439            putValue(SHORT_DESCRIPTION, tr("Cancel the updates and close the dialog"));
    14401440            putValue(SMALL_ICON, ImageProvider.get("cancel"));
    … …  
    14871487                            tr("Yes, save the changes and close"),
    14881488                            ImageProvider.get("ok"),
    1489                             tr("Click to save the changes and close this relation editor") ,
     1489                            tr("Click to save the changes and close this relation editor"),
    14901490                            null /* no specific help topic */
    14911491                    ),
    … …  
    14931493                            tr("No, discard the changes and close"),
    14941494                            ImageProvider.get("cancel"),
    1495                             tr("Click to discard the changes and close this relation editor") ,
     1495                            tr("Click to discard the changes and close this relation editor"),
    14961496                            null /* no specific help topic */
    14971497                    ),
    … …  
    14991499                            tr("Cancel, continue editing"),
    15001500                            ImageProvider.get("cancel"),
    1501                             tr("Click to return to the relation editor and to resume relation editing") ,
     1501                            tr("Click to return to the relation editor and to resume relation editing"),
    15021502                            null /* no specific help topic */
    15031503                    )
    … …  
    15201520
    15211521    class AddTagAction extends AbstractAction {
    1522         public AddTagAction() {
     1522        AddTagAction() {
    15231523            putValue(SHORT_DESCRIPTION, tr("Add an empty tag"));
    15241524            putValue(SMALL_ICON, ImageProvider.get("dialogs", "add"));
    … …  
    15331533
    15341534    class DownloadIncompleteMembersAction extends AbstractAction implements TableModelListener {
    1535         public DownloadIncompleteMembersAction() {
     1535        DownloadIncompleteMembersAction() {
    15361536            String tooltip = tr("Download all incomplete members");
    15371537            putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "downloadincomplete"));
    … …  
    15671567
    15681568    class DownloadSelectedIncompleteMembersAction extends AbstractAction implements ListSelectionListener, TableModelListener{
    1569         public DownloadSelectedIncompleteMembersAction() {
     1569        DownloadSelectedIncompleteMembersAction() {
    15701570            putValue(SHORT_DESCRIPTION, tr("Download selected incomplete members"));
    15711571            putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "downloadincompleteselected"));
    … …  
    16041604
    16051605    class SetRoleAction extends AbstractAction implements ListSelectionListener, DocumentListener {
    1606         public SetRoleAction() {
     1606        SetRoleAction() {
    16071607            putValue(SHORT_DESCRIPTION, tr("Sets a role for the selected members"));
    16081608            putValue(SMALL_ICON, ImageProvider.get("apply"));
    … …  
    16841684     */
    16851685    class DuplicateRelationAction extends AbstractAction {
    1686         public DuplicateRelationAction() {
     1686        DuplicateRelationAction() {
    16871687            putValue(SHORT_DESCRIPTION, tr("Create a copy of this relation and open it in another editor window"));
    16881688            // FIXME provide an icon
    … …  
    17061706     */
    17071707    class EditAction extends AbstractAction implements ListSelectionListener {
    1708         public EditAction() {
     1708        EditAction() {
    17091709            putValue(SHORT_DESCRIPTION, tr("Edit the relation the currently selected relation member refers to"));
    17101710            putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit"));

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java

    r8677 r8836  
    231231    private class SelectPreviousGapAction extends AbstractAction {
    232232
    233         public SelectPreviousGapAction() {
     233        SelectPreviousGapAction() {
    234234            putValue(NAME, tr("Select previous Gap"));
    235235            putValue(SHORT_DESCRIPTION, tr("Select the previous relation member which gives rise to a gap"));
    … …  
    250250    private class SelectNextGapAction extends AbstractAction {
    251251
    252         public SelectNextGapAction() {
     252        SelectNextGapAction() {
    253253            putValue(NAME, tr("Select next Gap"));
    254254            putValue(SHORT_DESCRIPTION, tr("Select the next relation member which gives rise to a gap"));
    … …  
    272272         * Constructs a new {@code ZoomToGapAction}.
    273273         */
    274         public ZoomToGapAction() {
     274        ZoomToGapAction() {
    275275            putValue(NAME, tr("Zoom to Gap"));
    276276            putValue(SHORT_DESCRIPTION, tr("Zoom to the gap in the way sequence"));

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java

    r8510 r8836  
    8686     */
    8787    class ReloadAction extends AbstractAction implements ListDataListener {
    88         public ReloadAction() {
     88        ReloadAction() {
    8989            putValue(SHORT_DESCRIPTION, tr("Load parent relations"));
    9090            putValue(SMALL_ICON, ImageProvider.get("dialogs", "refresh"));
    … …  
    140140     */
    141141    class EditAction extends AbstractAction implements ListSelectionListener {
    142         public EditAction() {
     142        EditAction() {
    143143            putValue(SHORT_DESCRIPTION, tr("Edit the currently selected relation"));
    144144            putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit"));

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java

    r8510 r8836  
    4747        public final OsmDataLayer layer;
    4848
    49         public DialogContext(OsmDataLayer layer, Relation relation) {
     49        DialogContext(OsmDataLayer layer, Relation relation) {
    5050            this.layer = layer;
    5151            this.relation = relation;

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java

    r8540 r8836  
    109109        private TreePath path;
    110110
    111         public RelationLoader(Dialog dialog, Relation relation, TreePath path) {
     111        RelationLoader(Dialog dialog, Relation relation, TreePath path) {
    112112            super(
    113113                    tr("Load relation"),

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java

    r8510 r8836  
    3636        public final boolean oneWay;
    3737
    38         public NodesWays(boolean oneWay) {
     38        NodesWays(boolean oneWay) {
    3939            this.oneWay = oneWay;
    4040        }

  • trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java

    r8682 r8836  
    5151    private static final class GroupTreeNode extends DefaultMutableTreeNode {
    5252
    53         public GroupTreeNode(Object userObject) {
     53        GroupTreeNode(Object userObject) {
    5454            super(userObject);
    5555        }

  • trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java

    r8510 r8836  
    198198         * Constructs a new {@code BookmarkCellRenderer}.
    199199         */
    200         public BookmarkCellRenderer() {
     200        BookmarkCellRenderer() {
    201201            setOpaque(true);
    202202            setIcon(ImageProvider.get("dialogs", "bookmark"));

  • trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java

    r8510 r8836  
    176176     */
    177177    class AddAction extends AbstractAction {
    178         public AddAction() {
     178        AddAction() {
    179179            putValue(NAME, tr("Create bookmark"));
    180180            putValue(SMALL_ICON, ImageProvider.get("dialogs", "bookmark-new"));
    … …  
    212212         * Constructs a new {@code RemoveAction}.
    213213         */
    214         public RemoveAction() {
     214        RemoveAction() {
    215215            putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
    216216            putValue(SHORT_DESCRIPTION, tr("Remove the currently selected bookmarks"));
    … …  
    243243         * Constructs a new {@code RenameAction}.
    244244         */
    245         public RenameAction() {
     245        RenameAction() {
    246246            putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit"));
    247247            putValue(SHORT_DESCRIPTION, tr("Rename the currently selected bookmark"));

  • trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java

    r8510 r8836  
    191191        private JosmTextField tfLatValue;
    192192
    193         public LatValueChecker(JosmTextField tfLatValue) {
     193        LatValueChecker(JosmTextField tfLatValue) {
    194194            this.tfLatValue = tfLatValue;
    195195        }
    … …  
    224224        private JosmTextField tfLonValue;
    225225
    226         public LonValueChecker(JosmTextField tfLonValue) {
     226        LonValueChecker(JosmTextField tfLonValue) {
    227227            this.tfLonValue = tfLonValue;
    228228        }
    … …  
    257257        private JTextComponent tfTarget;
    258258
    259         public SelectAllOnFocusHandler(JTextComponent tfTarget) {
     259        SelectAllOnFocusHandler(JTextComponent tfTarget) {
    260260            this.tfTarget = tfTarget;
    261261        }

  • trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java

    r8713 r8836  
    474474
    475475    class CancelAction extends AbstractAction {
    476         public CancelAction() {
     476        CancelAction() {
    477477            putValue(NAME, tr("Cancel"));
    478478            putValue(SMALL_ICON, ImageProvider.get("cancel"));
    … …  
    492492
    493493    class DownloadAction extends AbstractAction {
    494         public DownloadAction() {
     494        DownloadAction() {
    495495            putValue(NAME, tr("Download"));
    496496            putValue(SMALL_ICON, ImageProvider.get("download"));

  • trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java

    r8510 r8836  
    8585        public final String fourthcol;
    8686
    87         public Server(String n, String u, String t, String f) {
     87        Server(String n, String u, String t, String f) {
    8888            name = n;
    8989            url = u;
    … …  
    288288    class SearchAction extends AbstractAction implements DocumentListener {
    289289
    290         public SearchAction() {
     290        SearchAction() {
    291291            putValue(NAME, tr("Search ..."));
    292292            putValue(SMALL_ICON, ImageProvider.get("dialogs", "search"));
    … …  
    334334        private Exception lastException;
    335335
    336         public NameQueryTask(String searchExpression) {
     336        NameQueryTask(String searchExpression) {
    337337            super(tr("Querying name server"), false /* don't ignore exceptions */);
    338338            this.searchExpression = searchExpression;
    … …  
    413413        private transient ListSelectionModel selectionModel;
    414414
    415         public NamedResultTableModel(ListSelectionModel selectionModel) {
     415        NamedResultTableModel(ListSelectionModel selectionModel) {
    416416            data = new ArrayList<>();
    417417            this.selectionModel = selectionModel;
    … …  
    497497        }
    498498
    499         public NamedResultTableColumnModel() {
     499        NamedResultTableColumnModel() {
    500500            createColumns();
    501501        }
    … …  
    517517         * Constructs a new {@code NamedResultCellRenderer}.
    518518         */
    519         public NamedResultCellRenderer() {
     519        NamedResultCellRenderer() {
    520520            setOpaque(true);
    521521            setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));

  • trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java

    r8510 r8836  
    427427
    428428    class OpenInBrowserAction extends AbstractAction {
    429         public OpenInBrowserAction() {
     429        OpenInBrowserAction() {
    430430            putValue(SHORT_DESCRIPTION, tr("Open the current help page in an external browser"));
    431431            putValue(SMALL_ICON, ImageProvider.get("help", "internet"));
    … …  
    442442         * Constructs a new {@code EditAction}.
    443443         */
    444         public EditAction() {
     444        EditAction() {
    445445            putValue(SHORT_DESCRIPTION, tr("Edit the current help page"));
    446446            putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit"));
    … …  
    474474
    475475    class ReloadAction extends AbstractAction {
    476         public ReloadAction() {
     476        ReloadAction() {
    477477            putValue(SHORT_DESCRIPTION, tr("Reload the current help page"));
    478478            putValue(SMALL_ICON, ImageProvider.get("dialogs", "refresh"));
    … …  
    488488        private transient HelpBrowserHistory history;
    489489
    490         public BackAction(HelpBrowserHistory history) {
     490        BackAction(HelpBrowserHistory history) {
    491491            this.history = history;
    492492            history.addObserver(this);
    … …  
    510510        private transient HelpBrowserHistory history;
    511511
    512         public ForwardAction(HelpBrowserHistory history) {
     512        ForwardAction(HelpBrowserHistory history) {
    513513            this.history = history;
    514514            history.addObserver(this);
    … …  
    533533         * Constructs a new {@code HomeAction}.
    534534         */
    535         public HomeAction() {
     535        HomeAction() {
    536536            putValue(SHORT_DESCRIPTION, tr("Go to the JOSM help home page"));
    537537            putValue(SMALL_ICON, ImageProvider.get("help", "home"));

  • trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java

    r8510 r8836  
    246246         * @param role the role for this viewer.
    247247         */
    248         public LatLonViewer(HistoryBrowserModel model, PointInTimeType role) {
     248        LatLonViewer(HistoryBrowserModel model, PointInTimeType role) {
    249249            build();
    250250            this.model = model;
    … …  
    297297        private JLabel lblDistance;
    298298
    299         public DistanceViewer(HistoryBrowserModel model) {
     299        DistanceViewer(HistoryBrowserModel model) {
    300300            super(model, PointInTimeType.REFERENCE_POINT_IN_TIME);
    301301        }

  • trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java

    r8686 r8836  
    154154
    155155    class CloseAction extends AbstractAction {
    156         public CloseAction() {
     156        CloseAction() {
    157157            putValue(NAME, tr("Close"));
    158158            putValue(SHORT_DESCRIPTION, tr("Close the dialog"));
    … …  
    173173
    174174    class ReloadAction extends AbstractAction {
    175         public ReloadAction() {
     175        ReloadAction() {
    176176            putValue(NAME, tr("Reload"));
    177177            putValue(SHORT_DESCRIPTION, tr("Reload the history from the server"));

  • trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java

    r8702 r8836  
    201201        private final ShowHistoryAction showHistoryAction;
    202202
    203         public NodeListPopupMenu() {
     203        NodeListPopupMenu() {
    204204            zoomToNodeAction = new ZoomToNodeAction();
    205205            add(zoomToNodeAction);
    … …  
    223223         * Constructs a new {@code ZoomToNodeAction}.
    224224         */
    225         public ZoomToNodeAction() {
     225        ZoomToNodeAction() {
    226226            putValue(NAME, tr("Zoom to node"));
    227227            putValue(SHORT_DESCRIPTION, tr("Zoom to this node in the current data layer"));
    … …  
    269269         * Constructs a new {@code ShowHistoryAction}.
    270270         */
    271         public ShowHistoryAction() {
     271        ShowHistoryAction() {
    272272            putValue(NAME, tr("Show history"));
    273273            putValue(SHORT_DESCRIPTION, tr("Open a history browser with the history of this node"));
    … …  
    319319
    320320    class InternalPopupMenuLauncher extends PopupMenuLauncher {
    321         public InternalPopupMenuLauncher() {
     321        InternalPopupMenuLauncher() {
    322322            super(popupMenu);
    323323        }
    324324
    325         @Override protected int checkTableSelection(JTable table, Point p) {
     325        @Override
     326        protected int checkTableSelection(JTable table, Point p) {
    326327            int row = super.checkTableSelection(table, p);
    327328            popupMenu.prepare(primitiveIdAtRow(table.getModel(), row));
    … …  
    334335        private ShowHistoryAction showHistoryAction;
    335336
    336         public DoubleClickAdapter(JTable table) {
     337        DoubleClickAdapter(JTable table) {
    337338            this.table = table;
    338339            showHistoryAction = new ShowHistoryAction();

  • trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java

    r8702 r8836  
    4949        }
    5050
    51         public Item(DiffItemType state, Object value) {
     51        Item(DiffItemType state, Object value) {
    5252            this.state = state;
    5353            this.value = state == DiffItemType.EMPTY ? null : value;
    … …  
    6464    boolean referenceReversed = false;
    6565
    66     public TwoColumnDiff(Object[] reference, Object[] current) {
     66    TwoColumnDiff(Object[] reference, Object[] current) {
    6767        this.reference = Utils.copyArray(reference);
    6868        this.current = Utils.copyArray(current);

  • trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java

    r8510 r8836  
    248248        private Integer id;
    249249
    250         public OpenChangesetDialogAction() {
     250        OpenChangesetDialogAction() {
    251251            super(tr("Changeset"), new ImageProvider("dialogs/changeset", "changesetmanager").resetMaxSize(new Dimension(16, 16)).get());
    252252            putValue(SHORT_DESCRIPTION, tr("Opens the Changeset Manager window for the selected changesets"));

  • trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java

    r8510 r8836  
    155155         * Constructs a new {@code ChangesetInfoAction}.
    156156         */
    157         public ChangesetInfoAction() {
     157        ChangesetInfoAction() {
    158158            super(true);
    159159            putValue(NAME, tr("Changeset info"));
    … …  
    192192         * Constructs a new {@code UserInfoAction}.
    193193         */
    194         public UserInfoAction() {
     194        UserInfoAction() {
    195195            super(true);
    196196            putValue(NAME, tr("User info"));
    … …  
    233233         * Constructs a new {@code VersionTablePopupMenu}.
    234234         */
    235         public VersionTablePopupMenu() {
     235        VersionTablePopupMenu() {
    236236            super();
    237237            build();

  • trunk/src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java

    r8510 r8836  
    5050     * Constructs a new {@code ActionFlagsTableCell}.
    5151     */
    52     public ActionFlagsTableCell() {
     52    ActionFlagsTableCell() {
    5353        checkBoxes[0] = new JCheckBox(tr("Upload"));
    5454        checkBoxes[1] = new JCheckBox(tr("Save"));

  • trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java

    r8510 r8836  
    301301     */
    302302    class RefreshAction extends AbstractAction {
    303         public RefreshAction() {
     303        RefreshAction() {
    304304            putValue(SHORT_DESCRIPTION, tr("Load the list of your open changesets from the server"));
    305305            putValue(SMALL_ICON, ImageProvider.get("dialogs", "refresh"));
    … …  
    318318     */
    319319    class CloseChangesetAction extends AbstractAction implements ItemListener{
    320         public CloseChangesetAction() {
     320        CloseChangesetAction() {
    321321            putValue(SMALL_ICON, ImageProvider.get("closechangeset"));
    322322            putValue(SHORT_DESCRIPTION, tr("Close the currently selected open changeset"));

  • trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java

    r8510 r8836  
    119119
    120120    class CloseAction extends AbstractAction implements ListSelectionListener {
    121         public CloseAction() {
     121        CloseAction() {
    122122            putValue(NAME, tr("Close changesets"));
    123123            putValue(SMALL_ICON, ImageProvider.get("closechangeset"));
    … …  
    145145    class CancelAction extends AbstractAction {
    146146
    147         public CancelAction() {
     147        CancelAction() {
    148148            putValue(NAME, tr("Cancel"));
    149149            putValue(SMALL_ICON, ImageProvider.get("cancel"));

  • trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java

    r8510 r8836  
    278278        }
    279279
    280         public OsmApiCredentialsPanel(CredentialDialog owner) {
     280        OsmApiCredentialsPanel(CredentialDialog owner) {
    281281            super(owner);
    282282            build();
    … …  
    299299        }
    300300
    301         public OtherHostCredentialsPanel(CredentialDialog owner, String host) {
     301        OtherHostCredentialsPanel(CredentialDialog owner, String host) {
    302302            super(owner);
    303303            this.host = host;
    … …  
    321321        }
    322322
    323         public HttpProxyCredentialsPanel(CredentialDialog owner) {
     323        HttpProxyCredentialsPanel(CredentialDialog owner) {
    324324            super(owner);
    325325            build();
    … …  
    349349        protected JTextField nextTF;
    350350
    351         public TFKeyListener(CredentialDialog owner, JTextField currentTF, JTextField nextTF) {
     351        TFKeyListener(CredentialDialog owner, JTextField currentTF, JTextField nextTF) {
    352352            this.owner = owner;
    353353            this.currentTF = currentTF;
    … …  
    382382
    383383    class OKAction extends AbstractAction {
    384         public OKAction() {
     384        OKAction() {
    385385            putValue(NAME, tr("Authenticate"));
    386386            putValue(SHORT_DESCRIPTION, tr("Authenticate with the supplied username and password"));
    … …  
    396396
    397397    class CancelAction extends AbstractAction {
    398         public CancelAction() {
     398        CancelAction() {
    399399            putValue(NAME, tr("Cancel"));
    400400            putValue(SHORT_DESCRIPTION, tr("Cancel authentication"));

  • trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java

    r8510 r8836  
    6262         *         permitted, and indicates that the cause is nonexistent or unknown.)
    6363         */
    64         public DownloadException(String message, Throwable cause) {
     64        DownloadException(String message, Throwable cause) {
    6565            super(message, cause);
    6666        }

  • trunk/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java

    r8510 r8836  
    4646
    4747    /** constructor that sets the default on each element **/
    48     public LayerNameAndFilePathTableCell() {
     48    LayerNameAndFilePathTableCell() {
    4949        setLayout(new GridBagLayout());
    5050
    … …  
    217217
    218218    private class LaunchFileChooserAction extends AbstractAction {
    219         public LaunchFileChooserAction() {
     219        LaunchFileChooserAction() {
    220220            putValue(NAME, "...");
    221221            putValue(SHORT_DESCRIPTION, tr("Launch a file chooser to select a file"));

  • trunk/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java

    r8377 r8836  
    8181    private static class ClearAction extends AbstractAction {
    8282
    83         public ClearAction() {
     83        ClearAction() {
    8484            super(tr("Clear"));
    8585            putValue(SHORT_DESCRIPTION, tr("Clear the list of recently opened files"));

  • trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java

    r8291 r8836  
    2828     * @throws IllegalArgumentException if layer is null
    2929     */
    30     public SaveLayerInfo(AbstractModifiableLayer layer) {
     30    SaveLayerInfo(AbstractModifiableLayer layer) {
    3131        CheckParameterUtil.ensureParameterNotNull(layer, "layer");
    3232        this.layer = layer;

  • trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java

    r8736 r8836  
    5555
    5656public class SaveLayersDialog extends JDialog implements TableModelListener {
    57     public static enum UserAction {
     57    public enum UserAction {
    5858        /** save/upload layers was successful, proceed with operation */
    5959        PROCEED,
    … …  
    196196        }
    197197
    198         public LayerListWarningMessagePanel(String msg, List<SaveLayerInfo> infos) {
     198        LayerListWarningMessagePanel(String msg, List<SaveLayerInfo> infos) {
    199199            build();
    200200            lblMessage.setText(msg);
    … …  
    301301
    302302    class CancelAction extends AbstractAction {
    303         public CancelAction() {
     303        CancelAction() {
    304304            putValue(NAME, tr("Cancel"));
    305305            putValue(SHORT_DESCRIPTION, tr("Close this dialog and resume editing in JOSM"));
    … …  
    333333
    334334    class DiscardAndProceedAction extends AbstractAction  implements PropertyChangeListener {
    335         public DiscardAndProceedAction() {
     335        DiscardAndProceedAction() {
    336336            initForDiscardAndExit();
    337337        }
    … …  
    375375        private final transient Image upldDis = new BufferedImage(is, is, BufferedImage.TYPE_4BYTE_ABGR);
    376376
    377         public SaveAndProceedAction() {
     377        SaveAndProceedAction() {
    378378            // get disabled versions of icons
    379379            new JLabel(ImageProvider.get("save")).getDisabledIcon().paintIcon(new JPanel(), saveDis.getGraphics(), 0, 0);

  • trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTable.java

    r8510 r8836  
    1111
    1212class SaveLayersTable extends JTable implements PropertyChangeListener {
    13     public SaveLayersTable(SaveLayersModel model) {
     13    SaveLayersTable(SaveLayersModel model) {
    1414        super(model, new SaveLayersTableColumnModel());
    1515        putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);

  • trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java

    r8510 r8836  
    2828         * Constructs a new {@code RecommendedActionsTableCell}.
    2929         */
    30         public RecommendedActionsTableCell() {
     30        RecommendedActionsTableCell() {
    3131            pnlEmpty.setPreferredSize(new Dimension(1, 19));
    3232            needsUpload.setPreferredSize(new Dimension(needsUpload.getPreferredSize().width, 19));
    … …  
    7272     * Constructs a new {@code SaveLayersTableColumnModel}.
    7373     */
    74     public SaveLayersTableColumnModel() {
     74    SaveLayersTableColumnModel() {
    7575        build();
    7676    }

  • trunk/src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java

    r8510 r8836  
    2424     * Constructs a new {@code UploadAndSaveProgressRenderer}.
    2525     */
    26     public UploadAndSaveProgressRenderer() {
     26    UploadAndSaveProgressRenderer() {
    2727        build();
    2828        // initially not visible

  • trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

    r8510 r8836  
    381381     */
    382382    class UploadAction extends AbstractAction {
    383         public UploadAction() {
     383        UploadAction() {
    384384            putValue(NAME, tr("Upload Changes"));
    385385            putValue(SMALL_ICON, ImageProvider.get("upload"));
    … …  
    504504     */
    505505    class CancelAction extends AbstractAction {
    506         public CancelAction() {
     506        CancelAction() {
    507507            putValue(NAME, tr("Cancel"));
    508508            putValue(SMALL_ICON, ImageProvider.get("cancel"));

  • trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java

    r8510 r8836  
    184184        }
    185185
    186         public OsmPrimitiveList() {
     186        OsmPrimitiveList() {
    187187            this(new OsmPrimitiveListModel());
    188188        }
    189189
    190         public OsmPrimitiveList(OsmPrimitiveListModel model) {
     190        OsmPrimitiveList(OsmPrimitiveListModel model) {
    191191            super(model);
    192192            init();
    … …  
    257257
    258258    class CancelAction extends AbstractAction {
    259         public CancelAction() {
     259        CancelAction() {
    260260            putValue(Action.SHORT_DESCRIPTION, tr("Cancel uploading"));
    261261            putValue(Action.NAME, tr("Cancel"));
    … …  
    275275
    276276    class ContinueAction extends AbstractAction implements ListSelectionListener {
    277         public ContinueAction() {
     277        ContinueAction() {
    278278            putValue(Action.SHORT_DESCRIPTION, tr("Continue uploading"));
    279279            putValue(Action.NAME, tr("Continue"));

  • trunk/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java

    r8510 r8836  
    147147         * Constructs a new {@code PrimitiveList}.
    148148         */
    149         public PrimitiveList() {
     149        PrimitiveList() {
    150150            super(new PrimitiveListModel());
    151151        }
    … …  
    165165         * Constructs a new {@code PrimitiveListModel}.
    166166         */
    167         public PrimitiveListModel() {
     167        PrimitiveListModel() {
    168168            primitives = new ArrayList<>();
    169169        }
    170170
    171         public PrimitiveListModel(List<OsmPrimitive> primitives) {
     171        PrimitiveListModel(List<OsmPrimitive> primitives) {
    172172            setPrimitives(primitives);
    173173        }

  • trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

    r8764 r8836  
    377377
    378378    private class AutoZoomAction extends AbstractAction implements LayerAction {
    379         public AutoZoomAction() {
     379        AutoZoomAction() {
    380380            super(tr("Auto Zoom"));
    381381        }
    … …  
    400400
    401401    private class AutoLoadTilesAction extends AbstractAction implements LayerAction {
    402         public AutoLoadTilesAction() {
     402        AutoLoadTilesAction() {
    403403            super(tr("Auto load tiles"));
    404404        }
    … …  
    422422
    423423    private class LoadAllTilesAction extends AbstractAction {
    424         public LoadAllTilesAction() {
     424        LoadAllTilesAction() {
    425425            super(tr("Load All Tiles"));
    426426        }
    … …  
    434434
    435435    private class LoadErroneusTilesAction extends AbstractAction {
    436         public LoadErroneusTilesAction() {
     436        LoadErroneusTilesAction() {
    437437            super(tr("Load All Error Tiles"));
    438438        }
    … …  
    446446
    447447    private class ZoomToNativeLevelAction extends AbstractAction {
    448         public ZoomToNativeLevelAction() {
     448        ZoomToNativeLevelAction() {
    449449            super(tr("Zoom to native resolution"));
    450450        }
    … …  
    459459
    460460    private class ZoomToBestAction extends AbstractAction {
    461         public ZoomToBestAction() {
     461        ZoomToBestAction() {
    462462            super(tr("Change resolution"));
    463463        }
    … …  
    487487        private Field field;
    488488
    489         public BooleanButtonModel(Field field) {
     489        BooleanButtonModel(Field field) {
    490490            this.field = field;
    491491        }
    … …  
    12361236                    Tile t;
    12371237                    if (create) {
    1238                         t = getOrCreateTile(x, y , zoom);
     1238                        t = getOrCreateTile(x, y, zoom);
    12391239                    } else {
    12401240                        t = getTile(x, y, zoom);
    … …  
    13291329        private final TileSet[] tileSets;
    13301330        private final TileSetInfo[] tileSetInfos;
    1331         public DeepTileSet(EastNorth topLeft, EastNorth botRight, int minZoom, int maxZoom) {
     1331        DeepTileSet(EastNorth topLeft, EastNorth botRight, int minZoom, int maxZoom) {
    13321332            this.topLeft = topLeft;
    13331333            this.botRight = botRight;

  • trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java

    r8832 r8836  
    266266        /**
    267267         * Returns the currently set gamma value.
     268         * @return the currently set gamma value
    268269         */
    269270        public double getGamma() {
    … …  
    273274        /**
    274275         * Sets a new gamma value, {@code 1} stands for no correction.
     276         * @param gamma new gamma value
    275277         */
    276278        public void setGamma(double gamma) {
    … …  
    294296                }
    295297            } catch (IllegalArgumentException ignore) {
     298                if (Main.isTraceEnabled()) {
     299                    Main.trace(ignore.getMessage());
     300                }
    296301            }
    297302            final int type = image.getTransparency() == Transparency.OPAQUE ? BufferedImage.TYPE_INT_RGB : BufferedImage.TYPE_INT_ARGB;
    … …  
    304309    /**
    305310     * Returns the currently set gamma value.
     311     * @return the currently set gamma value
    306312     */
    307313    public double getGamma() {
    … …  
    311317    /**
    312318     * Sets a new gamma value, {@code 1} stands for no correction.
     319     * @param gamma new gamma value
    313320     */
    314321    public void setGamma(double gamma) {

  • trunk/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java

    r8510 r8836  
    4949        private transient WeakReference<Layer> lastLayer;
    5050
    51         public JumpToMarker(JumpToMarkerLayer layer, Shortcut shortcut) {
     51        JumpToMarker(JumpToMarkerLayer layer, Shortcut shortcut) {
    5252            this.layer = (Layer) layer;
    5353            this.multikeyShortcut = shortcut;

  • trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

    r8830 r8836  
    825825    private class ConsistencyTestAction extends AbstractAction {
    826826
    827         public ConsistencyTestAction() {
     827        ConsistencyTestAction() {
    828828            super(tr("Dataset consistency test"));
    829829        }

  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

    r8660 r8836  
    213213        private File file;
    214214
    215         public GpxDataWrapper(String name, GpxData data, File file) {
     215        GpxDataWrapper(String name, GpxData data, File file) {
    216216            this.name = name;
    217217            this.data = data;
    … …  
    779779        private boolean doRepaint;
    780780
    781         public StatusBarUpdater(boolean doRepaint) {
     781        StatusBarUpdater(boolean doRepaint) {
    782782            this.doRepaint = doRepaint;
    783783        }

  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

    r8818 r8836  
    120120        }
    121121
    122         public Loader(Collection<File> selection, GpxLayer gpxLayer) {
     122        Loader(Collection<File> selection, GpxLayer gpxLayer) {
    123123            super(tr("Extracting GPS locations from EXIF"));
    124124            this.selection = selection;
    … …  
    127127        }
    128128
    129         @Override protected void realRun() throws IOException {
     129        @Override
     130        protected void realRun() throws IOException {
    130131
    131132            progressMonitor.subTask(tr("Starting directory scan"));

  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java

    r8736 r8836  
    6262        private int orientation;
    6363
    64         public LoadImageRunnable(File file, Integer orientation) {
     64        LoadImageRunnable(File file, Integer orientation) {
    6565            this.file = file;
    6666            this.orientation = orientation == null ? -1 : orientation;

  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

    r8510 r8836  
    204204        private final String action;
    205205
    206         public ImageAction(String action, ImageIcon icon, String toolTipText) {
     206        ImageAction(String action, ImageIcon icon, String toolTipText) {
    207207            this.action = action;
    208208            putValue(SHORT_DESCRIPTION, toolTipText);

  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java

    r8765 r8836  
    3030    private GeoImageLayer layer;
    3131    private MediaTracker tracker;
    32     private ICacheAccess<String , BufferedImageCacheEntry> cache;
     32    private ICacheAccess<String, BufferedImageCacheEntry> cache;
    3333    private boolean cacheOff = Main.pref.getBoolean("geoimage.noThumbnailCache", false);
    3434

  • trunk/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java

    r8510 r8836  
    7373    };
    7474
    75     private Timer t = new Timer(200 , new ActionListener() {
     75    private Timer t = new Timer(200, new ActionListener() {
    7676        @Override  public void actionPerformed(ActionEvent e) {
    7777            applyFilter();

  • trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java

    r8510 r8836  
    106106            private Rectangle2D r = new Rectangle2D.Double();
    107107
    108             public CalculateDownloadArea() {
     108            CalculateDownloadArea() {
    109109                super(tr("Calculating Download Area"), displayProgress ? null : NullProgressMonitor.INSTANCE, false);
    110110            }

  • trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java

    r8806 r8836  
    196196                }
    197197
    198                 URL url = null;
    199                 if (uri != null) {
    200                     try {
    201                         url = new URL(uri);
    202                     } catch (MalformedURLException e) {
    203                         // Try a relative file:// url, if the link is not in an URL-compatible form
    204                         if (relativePath != null) {
    205                             url = Utils.fileToURL(new File(relativePath.getParentFile(), uri));
    206                         }
    207                     }
    208                 }
     198                URL url = uriToUrl(uri, relativePath);
    209199
    210200                String urlStr = url == null ? "" : url.toString();
    … …  
    229219                    return Arrays.asList(marker, audioMarker);
    230220                } else if (urlStr.endsWith(".png") || urlStr.endsWith(".jpg") || urlStr.endsWith(".jpeg") || urlStr.endsWith(".gif")) {
    231                     final ImageMarker imageMarker = new ImageMarker(wpt.getCoor(), url, parentLayer, time, offset);
    232                     return Arrays.asList(marker, imageMarker);
     221                    return Arrays.asList(marker, new ImageMarker(wpt.getCoor(), url, parentLayer, time, offset));
    233222                } else {
    234                     final WebMarker webMarker = new WebMarker(wpt.getCoor(), url, parentLayer, time, offset);
    235                     return Arrays.asList(marker, webMarker);
     223                    return Arrays.asList(marker, new WebMarker(wpt.getCoor(), url, parentLayer, time, offset));
    236224                }
    237225            }
    238226        });
     227    }
     228
     229    private static URL uriToUrl(String uri, File relativePath) {
     230        URL url = null;
     231        if (uri != null) {
     232            try {
     233                url = new URL(uri);
     234            } catch (MalformedURLException e) {
     235                // Try a relative file:// url, if the link is not in an URL-compatible form
     236                if (relativePath != null) {
     237                    url = Utils.fileToURL(new File(relativePath.getParentFile(), uri));
     238                }
     239            }
     240        }
     241        return url;
    239242    }
    240243

  • trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

    r8818 r8836  
    505505         * Constructs a new {@code SynchronizeAudio} action.
    506506         */
    507         public SynchronizeAudio() {
     507        SynchronizeAudio() {
    508508            super(tr("Synchronize Audio"), ImageProvider.get("audio-sync"));
    509509            putValue("help", ht("/Action/SynchronizeAudio"));
    … …  
    542542    private class MoveAudio extends AbstractAction {
    543543
    544         public MoveAudio() {
     544        MoveAudio() {
    545545            super(tr("Make Audio Marker at Play Head"), ImageProvider.get("addmarkers"));
    546546            putValue("help", ht("/Action/MakeAudioMarkerAtPlayHead"));
    … …  
    565565        }
    566566    }
    567 
    568567}

  • trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java

    r8510 r8836  
    132132        public int size;
    133133
    134         public FontDescriptor(String name, int style, int size) {
     134        FontDescriptor(String name, int style, int size) {
    135135            this.name = name;
    136136            this.style = style;

  • trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java

    r8510 r8836  
    3333        private JCheckBoxMenuItem button;
    3434
    35         public MapPaintAction(StyleSource style) {
     35        MapPaintAction(StyleSource style) {
    3636            super(style.getDisplayString(), style.getIconProvider(),
    3737                    tr("Select the map painting styles"), null, true, "mappaint/" + style.getDisplayString(), true);

  • trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java

    r8654 r8836  
    8787     * This is the operation that {@link KeyValueCondition} uses to match.
    8888     */
    89     public static enum Op {
     89    public enum Op {
    9090        /** The value equals the given reference. */
    9191        EQ,
    … …  
    170170     * Context, where the condition applies.
    171171     */
    172     public static enum Context {
     172    public enum Context {
    173173        /**
    174174         * normal primitive selector, e.g. way[highway=residential]
    … …  
    340340     * This defines how {@link KeyCondition} matches a given key.
    341341     */
    342     public static enum KeyMatchType {
     342    public enum KeyMatchType {
    343343        /**
    344344         * The key needs to be equal to the given label.

  • trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

    r8833 r8836  
    128128             * @param e the environment against which we match
    129129             */
    130             public MatchingReferrerFinder(Environment e) {
     130            MatchingReferrerFinder(Environment e) {
    131131                this.e = e;
    132132            }
    … …  
    227227            }
    228228
    229             public MultipolygonOpenEndFinder(Environment e) {
     229            MultipolygonOpenEndFinder(Environment e) {
    230230                super(e);
    231231            }
    … …  
    245245                }
    246246            };
    247 
    248247        }
    249248

  • trunk/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java

    r7509 r8836  
    2525
    2626    private static class AuthorisationProcedureCellRenderer extends JLabel implements ListCellRenderer<AuthorizationProcedure> {
    27         public AuthorisationProcedureCellRenderer() {
     27        AuthorisationProcedureCellRenderer() {
    2828            setOpaque(true);
    2929        }

  • trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java

    r8510 r8836  
    337337     */
    338338    class RunAuthorisationAction extends AbstractAction implements DocumentListener{
    339         public RunAuthorisationAction() {
     339        RunAuthorisationAction() {
    340340            putValue(NAME, tr("Authorize now"));
    341341            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small"));
    … …  
    373373     */
    374374    class BackAction extends AbstractAction {
    375         public BackAction() {
     375        BackAction() {
    376376            putValue(NAME, tr("Back"));
    377377            putValue(SHORT_DESCRIPTION, tr("Run the automatic authorization steps again"));
    … …  
    389389     */
    390390    class TestAccessTokenAction extends AbstractAction {
    391         public TestAccessTokenAction() {
     391        TestAccessTokenAction() {
    392392            putValue(NAME, tr("Test Access Token"));
    393393            putValue(SMALL_ICON, ImageProvider.get("logo"));
    … …  
    406406
    407407    private static class UserNameValidator extends AbstractTextComponentValidator {
    408         public UserNameValidator(JTextComponent tc) {
     408        UserNameValidator(JTextComponent tc) {
    409409            super(tc);
    410410        }
    … …  
    427427    private static class PasswordValidator extends AbstractTextComponentValidator {
    428428
    429         public PasswordValidator(JTextComponent tc) {
     429        PasswordValidator(JTextComponent tc) {
    430430            super(tc);
    431431        }
    … …  
    450450        private OsmOAuthAuthorizationClient authClient;
    451451
    452         public FullyAutomaticAuthorisationTask(Component parent) {
     452        FullyAutomaticAuthorisationTask(Component parent) {
    453453            super(parent, tr("Authorize JOSM to access the OSM API"), false /* don't ignore exceptions */);
    454454        }

  • trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java

    r8510 r8836  
    7676    private static class UserNameValidator extends AbstractTextComponentValidator {
    7777
    78         public UserNameValidator(JTextComponent tc) {
     78        UserNameValidator(JTextComponent tc) {
    7979            super(tc);
    8080        }

  • trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java

    r8510 r8836  
    177177    private static class AccessTokenKeyValidator extends AbstractTextComponentValidator {
    178178
    179         public AccessTokenKeyValidator(JTextComponent tc) {
     179        AccessTokenKeyValidator(JTextComponent tc) {
    180180            super(tc);
    181181        }
    … …  
    197197
    198198    private static class AccessTokenSecretValidator extends AbstractTextComponentValidator {
    199         public AccessTokenSecretValidator(JTextComponent tc) {
     199        AccessTokenSecretValidator(JTextComponent tc) {
    200200            super(tc);
    201201        }
    … …  
    246246     */
    247247    class TestAccessTokenAction extends AbstractAction implements PropertyChangeListener {
    248         public TestAccessTokenAction() {
     248        TestAccessTokenAction() {
    249249            putValue(NAME, tr("Test Access Token"));
    250250            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small"));

  • trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java

    r8510 r8836  
    323323         * Constructs a new {@code CancelAction}.
    324324         */
    325         public CancelAction() {
     325        CancelAction() {
    326326            putValue(NAME, tr("Cancel"));
    327327            putValue(SMALL_ICON, ImageProvider.get("cancel"));
    … …  
    345345         * Constructs a new {@code AcceptAccessTokenAction}.
    346346         */
    347         public AcceptAccessTokenAction() {
     347        AcceptAccessTokenAction() {
    348348            putValue(NAME, tr("Accept Access Token"));
    349349            putValue(SMALL_ICON, ImageProvider.get("ok"));

  • trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java

    r8510 r8836  
    117117         * Constructs a new {@code RetrieveRequestTokenPanel}.
    118118         */
    119         public RetrieveRequestTokenPanel() {
     119        RetrieveRequestTokenPanel() {
    120120            build();
    121121        }
    … …  
    214214         * Constructs a new {@code RetrieveAccessTokenPanel}.
    215215         */
    216         public RetrieveAccessTokenPanel() {
     216        RetrieveAccessTokenPanel() {
    217217            build();
    218218        }
    … …  
    284284         */
    285285        class BackAction extends AbstractAction {
    286             public BackAction() {
     286            BackAction() {
    287287                putValue(NAME, tr("Back"));
    288288                putValue(SHORT_DESCRIPTION, tr("Go back to step 1/3"));
    … …  
    305305         * Constructs a new {@code ShowAccessTokenPanel}.
    306306         */
    307         public ShowAccessTokenPanel() {
     307        ShowAccessTokenPanel() {
    308308            build();
    309309        }
    … …  
    362362         */
    363363        class RestartAction extends AbstractAction {
    364             public RestartAction() {
     364            RestartAction() {
    365365                putValue(NAME, tr("Restart"));
    366366                putValue(SHORT_DESCRIPTION, tr("Go back to step 1/3"));
    … …  
    384384    class RetrieveRequestTokenAction extends AbstractAction{
    385385
    386         public RetrieveRequestTokenAction() {
     386        RetrieveRequestTokenAction() {
    387387            putValue(NAME, tr("Retrieve Request Token"));
    388388            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small"));
    … …  
    420420    class RetrieveAccessTokenAction extends AbstractAction {
    421421
    422         public RetrieveAccessTokenAction() {
     422        RetrieveAccessTokenAction() {
    423423            putValue(NAME, tr("Retrieve Access Token"));
    424424            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small"));
    … …  
    457457    class TestAccessTokenAction extends AbstractAction {
    458458
    459         public TestAccessTokenAction() {
     459        TestAccessTokenAction() {
    460460            putValue(NAME, tr("Test Access Token"));
    461461            putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small"));

  • trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java

    r8510 r8836  
    140140
    141141    class CancelAction extends AbstractAction {
    142         public CancelAction() {
     142        CancelAction() {
    143143            putValue(NAME, tr("Cancel"));
    144144            putValue(SMALL_ICON, ImageProvider.get("cancel"));
    … …  
    159159
    160160    class OKAction extends AbstractAction {
    161         public OKAction() {
     161        OKAction() {
    162162            putValue(NAME, tr("OK"));
    163163            putValue(SMALL_ICON, ImageProvider.get("ok"));

  • trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

    r8835 r8836  
    821821
    822822        class LaunchFileChooserAction extends AbstractAction {
    823             public LaunchFileChooserAction() {
     823            LaunchFileChooserAction() {
    824824                putValue(SMALL_ICON, ImageProvider.get("open"));
    825825                putValue(SHORT_DESCRIPTION, tr("Launch a file chooser to select a file"));
    … …  
    870870
    871871    class NewActiveSourceAction extends AbstractAction {
    872         public NewActiveSourceAction() {
     872        NewActiveSourceAction() {
    873873            putValue(NAME, tr("New"));
    874874            putValue(SHORT_DESCRIPTION, getStr(I18nString.NEW_SOURCE_ENTRY_TOOLTIP));
    … …  
    900900    class RemoveActiveSourcesAction extends AbstractAction implements ListSelectionListener {
    901901
    902         public RemoveActiveSourcesAction() {
     902        RemoveActiveSourcesAction() {
    903903            putValue(NAME, tr("Remove"));
    904904            putValue(SHORT_DESCRIPTION, getStr(I18nString.REMOVE_SOURCE_TOOLTIP));
    … …  
    923923
    924924    class EditActiveSourceAction extends AbstractAction implements ListSelectionListener {
    925         public EditActiveSourceAction() {
     925        EditActiveSourceAction() {
    926926            putValue(NAME, tr("Edit"));
    927927            putValue(SHORT_DESCRIPTION, getStr(I18nString.EDIT_SOURCE_TOOLTIP));
    … …  
    970970        private final int increment;
    971971
    972         public MoveUpDownAction(boolean isDown) {
     972        MoveUpDownAction(boolean isDown) {
    973973            increment = isDown ? 1 : -1;
    974974            putValue(SMALL_ICON, isDown ? ImageProvider.get("dialogs", "down") : ImageProvider.get("dialogs", "up"));
    … …  
    998998
    999999    class ActivateSourcesAction extends AbstractAction implements ListSelectionListener {
    1000         public ActivateSourcesAction() {
     1000        ActivateSourcesAction() {
    10011001            putValue(SHORT_DESCRIPTION, getStr(I18nString.ACTIVATE_TOOLTIP));
    10021002            putValue(SMALL_ICON, ImageProvider.get("preferences", "activate-right"));
    … …  
    10511051    class ResetAction extends AbstractAction {
    10521052
    1053         public ResetAction() {
     1053        ResetAction() {
    10541054            putValue(NAME, tr("Reset"));
    10551055            putValue(SHORT_DESCRIPTION, tr("Reset to default"));
    … …  
    10671067        private final transient List<SourceProvider> sourceProviders;
    10681068
    1069         public ReloadSourcesAction(String url, List<SourceProvider> sourceProviders) {
     1069        ReloadSourcesAction(String url, List<SourceProvider> sourceProviders) {
    10701070            putValue(NAME, tr("Reload"));
    10711071            putValue(SHORT_DESCRIPTION, tr(getStr(I18nString.RELOAD_ALL_AVAILABLE), url));
    … …  
    11851185
    11861186    class NewIconPathAction extends AbstractAction {
    1187         public NewIconPathAction() {
     1187        NewIconPathAction() {
    11881188            putValue(NAME, tr("New"));
    11891189            putValue(SHORT_DESCRIPTION, tr("Add a new icon path"));
    … …  
    11991199
    12001200    class RemoveIconPathAction extends AbstractAction implements ListSelectionListener {
    1201         public RemoveIconPathAction() {
     1201        RemoveIconPathAction() {
    12021202            putValue(NAME, tr("Remove"));
    12031203            putValue(SHORT_DESCRIPTION, tr("Remove the selected icon paths"));
    … …  
    12221222
    12231223    class EditIconPathAction extends AbstractAction implements ListSelectionListener {
    1224         public EditIconPathAction() {
     1224        EditIconPathAction() {
    12251225            putValue(NAME, tr("Edit"));
    12261226            putValue(SHORT_DESCRIPTION, tr("Edit the selected icon path"));
    … …  
    12901290        private final List<ExtendedSourceEntry> sources = new ArrayList<>();
    12911291
    1292         public SourceLoader(String url, List<SourceProvider> sourceProviders) {
     1292        SourceLoader(String url, List<SourceProvider> sourceProviders) {
    12931293            super(tr(getStr(I18nString.LOADING_SOURCES_FROM), url));
    12941294            this.url = url;
    … …  
    14781478        }
    14791479
    1480         public FileOrUrlCellEditor(boolean isFile) {
     1480        FileOrUrlCellEditor(boolean isFile) {
    14811481            this.isFile = isFile;
    14821482            listeners = new CopyOnWriteArrayList<>();
    … …  
    15541554
    15551555        class LaunchFileChooserAction extends AbstractAction {
    1556             public LaunchFileChooserAction() {
     1556            LaunchFileChooserAction() {
    15571557                putValue(NAME, "...");
    15581558                putValue(SHORT_DESCRIPTION, tr("Launch a file chooser to select a file"));

  • trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

    r8510 r8836  
    644644            private final List<ActionDefinition> actions;
    645645
    646             public ActionTransferable(List<ActionDefinition> actions) {
     646            ActionTransferable(List<ActionDefinition> actions) {
    647647                this.actions = actions;
    648648            }

  • trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java

    r8510 r8836  
    411411        private final String type;
    412412
    413         public ImportProfileAction(String name, File file, String type) {
     413        ImportProfileAction(String name, File file, String type) {
    414414            super(name);
    415415            this.file = file;

  • trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java

    r8510 r8836  
    138138
    139139    class NewEntryAction extends AbstractAction {
    140         public NewEntryAction() {
     140        NewEntryAction() {
    141141            putValue(NAME, tr("New"));
    142142            putValue(SHORT_DESCRIPTION, tr("add entry"));
    … …  
    151151
    152152    class RemoveEntryAction extends AbstractAction implements ListSelectionListener {
    153         public RemoveEntryAction() {
     153        RemoveEntryAction() {
    154154            putValue(NAME, tr("Remove"));
    155155            putValue(SHORT_DESCRIPTION, tr("Remove the selected entry"));

  • trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java

    r8510 r8836  
    158158
    159159    class NewEntryAction extends AbstractAction {
    160         public NewEntryAction() {
     160        NewEntryAction() {
    161161            putValue(NAME, tr("New"));
    162162            putValue(SHORT_DESCRIPTION, tr("add entry"));
    … …  
    171171
    172172    class RemoveEntryAction extends AbstractAction implements ListSelectionListener {
    173         public RemoveEntryAction() {
     173        RemoveEntryAction() {
    174174            putValue(NAME, tr("Remove"));
    175175            putValue(SHORT_DESCRIPTION, tr("Remove the selected entry"));

  • trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java

    r8510 r8836  
    264264    private class AllSettingsTableModel extends DefaultTableModel {
    265265
    266         public AllSettingsTableModel() {
     266        AllSettingsTableModel() {
    267267            setColumnIdentifiers(new String[]{tr("Key"), tr("Value")});
    268268        }
    … …  
    347347
    348348    private static class SettingCellEditor extends DefaultCellEditor {
    349         public SettingCellEditor() {
     349        SettingCellEditor() {
    350350            super(new JosmTextField());
    351351        }

  • trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java

    r8510 r8836  
    7979        private final List<Locale> data = new ArrayList<>();
    8080
    81         public LanguageComboBoxModel() {
     81        LanguageComboBoxModel() {
    8282            data.add(0, null);
    8383            data.addAll(Arrays.asList(I18n.getAvailableTranslations()));
    … …  
    117117         * Constructs a new {@code LanguageCellRenderer}.
    118118         */
    119         public LanguageCellRenderer() {
     119        LanguageCellRenderer() {
    120120            this.dispatch = new DefaultListCellRenderer();
    121121        }

  • trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java

    r8598 r8836  
    131131        pane.addTab(tr("Settings"), buildSettingsPanel());
    132132        pane.addTab(tr("Offset bookmarks"), new OffsetBookmarksPanel(gui));
    133         pane.addTab(tr("Cache contents") , new CacheContentsPanel());
     133        pane.addTab(tr("Cache contents"), new CacheContentsPanel());
    134134        loadSettings();
    135135        p.add(pane, GBC.std().fill(GBC.BOTH));
    … …  
    239239            private transient List<ImageryInfo> layers;
    240240
    241             public ImageryURLTableCellRenderer(List<ImageryInfo> layers) {
     241            ImageryURLTableCellRenderer(List<ImageryInfo> layers) {
    242242                this.layers = layers;
    243243            }
    … …  
    480480            private final ImageryInfo.ImageryType type;
    481481
    482             public NewEntryAction(ImageryInfo.ImageryType type) {
     482            NewEntryAction(ImageryInfo.ImageryType type) {
    483483                putValue(NAME, type.toString());
    484484                putValue(SHORT_DESCRIPTION, tr("Add a new {0} entry by entering the URL", type.toString()));
    … …  
    542542             * Constructs a new {@code RemoveEntryAction}.
    543543             */
    544             public RemoveEntryAction() {
     544            RemoveEntryAction() {
    545545                putValue(NAME, tr("Remove"));
    546546                putValue(SHORT_DESCRIPTION, tr("Remove entry"));
    … …  
    572572             * Constructs a new {@code ActivateAction}.
    573573             */
    574             public ActivateAction() {
     574            ActivateAction() {
    575575                putValue(NAME, tr("Activate"));
    576576                putValue(SHORT_DESCRIPTION, tr("copy selected defaults"));
    … …  
    639639             * Constructs a new {@code ReloadAction}.
    640640             */
    641             public ReloadAction() {
     641            ReloadAction() {
    642642                putValue(SHORT_DESCRIPTION, tr("reload defaults"));
    643643                putValue(SMALL_ICON, ImageProvider.get("dialogs", "refresh"));
    … …  
    813813         * Constructs a new {@code OffsetBookmarksPanel}.
    814814         */
    815         public OffsetBookmarksPanel(final PreferenceTabbedPane gui) {
     815        OffsetBookmarksPanel(final PreferenceTabbedPane gui) {
    816816            super(new GridBagLayout());
    817817            final JTable list = new JTable(model) {
    … …  
    872872             * Constructs a new {@code OffsetsBookmarksModel}.
    873873             */
    874             public OffsetsBookmarksModel() {
     874            OffsetsBookmarksModel() {
    875875                setColumnIdentifiers(new String[] {tr("Projection"), tr("Layer"), tr("Name"), tr("Easting"), tr("Northing")});
    876876            }

  • trunk/src/org/openstreetmap/josm/gui/preferences/imagery/WMSLayerTree.java

    r7937 r8836  
    133133                }
    134134            }
    135             layerTree.firePropertyChange("selectedLayers", /*dummy values*/ false , true);
     135            layerTree.firePropertyChange("selectedLayers", /*dummy values*/ false, true);
    136136        }
    137137    }

  • trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java

    r8835 r8836  
    8888        private static final String iconpref = "mappaint.icon.sources";
    8989
    90         public MapPaintSourceEditor() {
     90        MapPaintSourceEditor() {
    9191            super(SourceType.MAP_PAINT_STYLE, Main.getJOSMWebsite()+"/styles", styleSourceProviders, true);
    9292        }
    … …  
    176176            }
    177177        } catch (RuntimeException ignore) {
     178            if (Main.isTraceEnabled()) {
     179                Main.trace(ignore.getMessage());
     180            }
    178181        }
    179182        return null;

  • trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java

    r8513 r8836  
    185185        private static final String iconpref = "taggingpreset.icon.sources";
    186186
    187         public TaggingPresetSourceEditor() {
     187        TaggingPresetSourceEditor() {
    188188            super(SourceType.TAGGING_PRESET, Main.getJOSMWebsite()+"/presets", presetSourceProviders, true);
    189189        }

  • trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java

    r8510 r8836  
    112112        public final transient PluginInformation pi;
    113113
    114         public JPluginCheckBox(final PluginInformation pi, boolean selected) {
     114        JPluginCheckBox(final PluginInformation pi, boolean selected) {
    115115            this.pi = pi;
    116116            setSelected(selected);
    … …  
    127127        private final JPluginCheckBox cb;
    128128
    129         public PluginCbActionListener(JPluginCheckBox cb) {
     129        PluginCbActionListener(JPluginCheckBox cb) {
    130130            this.cb = cb;
    131131        }

  • trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java

    r8510 r8836  
    329329         * Constructs a new {@code DownloadAvailablePluginsAction}.
    330330         */
    331         public DownloadAvailablePluginsAction() {
     331        DownloadAvailablePluginsAction() {
    332332            putValue(NAME, tr("Download list"));
    333333            putValue(SHORT_DESCRIPTION, tr("Download the list of available plugins"));
    … …  
    365365     */
    366366    class UpdateSelectedPluginsAction extends AbstractAction {
    367         public UpdateSelectedPluginsAction() {
     367        UpdateSelectedPluginsAction() {
    368368            putValue(NAME, tr("Update plugins"));
    369369            putValue(SHORT_DESCRIPTION, tr("Update the selected plugins"));
    … …  
    467467     */
    468468    class ConfigureSitesAction extends AbstractAction {
    469         public ConfigureSitesAction() {
     469        ConfigureSitesAction() {
    470470            putValue(NAME, tr("Configure sites..."));
    471471            putValue(SHORT_DESCRIPTION, tr("Configure the list of sites where plugins are downloaded from"));
    … …  
    581581        }
    582582
    583         public PluginConfigurationSitesPanel() {
     583        PluginConfigurationSitesPanel() {
    584584            build();
    585585        }

  • trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java

    r8510 r8836  
    5656        private transient ActionListener listener;
    5757
    58         public CodeSelectionPanel(String initialCode, ActionListener listener) {
     58        CodeSelectionPanel(String initialCode, ActionListener listener) {
    5959            this.listener = listener;
    6060            data = new ArrayList<>(Projections.getAllProjectionCodes());

  • trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java

    r8533 r8836  
    5151        private HistoryComboBox cbInput;
    5252
    53         public PreferencePanel(String initialText, ActionListener listener) {
     53        PreferencePanel(String initialText, ActionListener listener) {
    5454            build(initialText, listener);
    5555        }

  • trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java

    r8510 r8836  
    3737
    3838    private class LambertCC9CBPanel extends CBPanel {
    39         public LambertCC9CBPanel(String[] entries, int initialIndex, String label, ActionListener listener) {
     39        LambertCC9CBPanel(String[] entries, int initialIndex, String label, ActionListener listener) {
    4040            super(entries, initialIndex, label, listener);
    4141            this.add(new JLabel(ImageProvider.get("data/projection", "LambertCC9Zones.png")), GBC.eol().fill(GBC.HORIZONTAL));

  • trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java

    r8510 r8836  
    3232
    3333    private class LambertCBPanel extends CBPanel {
    34         public LambertCBPanel(String[] entries, int initialIndex, String label, ActionListener listener) {
     34        LambertCBPanel(String[] entries, int initialIndex, String label, ActionListener listener) {
    3535            super(entries, initialIndex, label, listener);
    3636            this.add(new JLabel(ImageProvider.get("data/projection", "Departements_Lambert4Zones.png")), GBC.eol().fill(GBC.HORIZONTAL));

  • trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java

    r8510 r8836  
    5151        public JRadioButton north, south;
    5252
    53         public UTMPanel(String[] entries, int initialIndex, String label, ActionListener listener) {
     53        UTMPanel(String[] entries, int initialIndex, String label, ActionListener listener) {
    5454            super(entries, initialIndex, label, listener);
    5555

  • trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java

    r8510 r8836  
    183183         * Constructs a new {@code NotYetAuthorisedPanel}.
    184184         */
    185         public NotYetAuthorisedPanel() {
     185        NotYetAuthorisedPanel() {
    186186            build();
    187187        }
    … …  
    305305         * Constructs a new {@code AlreadyAuthorisedPanel}.
    306306         */
    307         public AlreadyAuthorisedPanel() {
     307        AlreadyAuthorisedPanel() {
    308308            build();
    309309            refreshView();
    … …  
    315315     */
    316316    private class AuthoriseNowAction extends AbstractAction {
    317         public AuthoriseNowAction() {
     317        AuthoriseNowAction() {
    318318            putValue(NAME, tr("Authorize now"));
    319319            putValue(SHORT_DESCRIPTION, tr("Click to step through the OAuth authorization process"));
    … …  
    344344         * Constructs a new {@code RenewAuthorisationAction}.
    345345         */
    346         public RenewAuthorisationAction() {
     346        RenewAuthorisationAction() {
    347347            putValue(NAME, tr("New Access Token"));
    348348            putValue(SHORT_DESCRIPTION, tr("Click to step through the OAuth authorization process and generate a new Access Token"));
    … …  
    374374         * Constructs a new {@code TestAuthorisationAction}.
    375375         */
    376         public TestAuthorisationAction() {
     376        TestAuthorisationAction() {
    377377            putValue(NAME, tr("Test Access Token"));
    378378            putValue(SHORT_DESCRIPTION, tr("Click test access to the OSM server with the current access token"));

  • trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java

    r8510 r8836  
    170170        private String lastTestedUrl = null;
    171171
    172         public ValidateApiUrlAction() {
     172        ValidateApiUrlAction() {
    173173            putValue(NAME, tr("Validate"));
    174174            putValue(SHORT_DESCRIPTION, tr("Test the API URL"));
    … …  
    243243
    244244    private static class ApiUrlValidator extends AbstractTextComponentValidator {
    245         public ApiUrlValidator(JTextComponent tc) {
     245        ApiUrlValidator(JTextComponent tc) {
    246246            super(tc);
    247247        }

  • trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java

    r8540 r8836  
    128128         * Constructs a new {@code ScListModel}.
    129129         */
    130         public ScListModel() {
     130        ScListModel() {
    131131            data = Shortcut.listAll();
    132132        }
    … …  
    157157        private boolean name;
    158158
    159         public ShortcutTableCellRenderer(boolean name) {
     159        ShortcutTableCellRenderer(boolean name) {
    160160            this.name = name;
    161161        }
    … …  
    288288        private PrefJPanel panel;
    289289
    290         public CbAction(PrefJPanel panel) {
     290        CbAction(PrefJPanel panel) {
    291291            this.panel = panel;
    292292        }

  • trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java

    r8835 r8836  
    5555        return false;
    5656    }
    57    
     57
    5858    static class TagCheckerRulesSourceEditor extends SourceEditor {
    5959
    60         public TagCheckerRulesSourceEditor() {
     60        TagCheckerRulesSourceEditor() {
    6161            super(SourceType.TAGCHECKER_RULE, Main.getJOSMWebsite()+"/rules", ruleSourceProviders, false);
    6262        }
    … …  
    122122        }
    123123    }
    124    
     124
    125125    /**
    126126     * Helper class for validator tag checker rules preferences.
    … …  
    143143        public Collection<ExtendedSourceEntry> getDefault() {
    144144            List<ExtendedSourceEntry> def = new ArrayList<>();
    145            
     145
    146146            addDefault(def, "addresses",    tr("Addresses"),           tr("Checks for errors on addresses"));
    147147            addDefault(def, "combinations", tr("Tag combinations"),    tr("Checks for missing tag or suspicious combinations"));
    … …  
    156156            addDefault(def, "unnecessary",  tr("Unnecessary tags"),    tr("Checks for unnecessary tags"));
    157157            addDefault(def, "wikipedia",    tr("Wikipedia"),           tr("Checks for wrong wikipedia tags"));
    158            
     158
    159159            return def;
    160160        }
    161        
     161
    162162        private void addDefault(List<ExtendedSourceEntry> defaults, String filename, String title, String description) {
    163163            ExtendedSourceEntry i = new ExtendedSourceEntry(filename+".mapcss", "resource://data/validator/"+filename+".mapcss");
    … …  
    188188        final ValidatorPreference valPref = gui.getValidatorPreference();
    189189        sources = new TagCheckerRulesSourceEditor();
    190        
     190
    191191        valPref.addSubTab(this, tr("Tag checker rules"),
    192192                sources, tr("Choose Tag checker rules to enable"));

  • trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java

    r8581 r8836  
    612612        private int colMax;
    613613
    614         public SelectionStateMemento() {
     614        SelectionStateMemento() {
    615615            rowMin = rowSelectionModel.getMinSelectionIndex();
    616616            rowMax = rowSelectionModel.getMaxSelectionIndex();

  • trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java

    r8760 r8836  
    7373     */
    7474    static class TagTableColumnModel extends DefaultTableColumnModel {
    75         public TagTableColumnModel(DefaultListSelectionModel selectionModel) {
     75        TagTableColumnModel(DefaultListSelectionModel selectionModel) {
    7676            setSelectionModel(selectionModel);
    7777            TableColumn col = null;
    … …  
    196196    class DeleteAction extends RunnableAction implements ListSelectionListener {
    197197
    198         public DeleteAction() {
     198        DeleteAction() {
    199199            putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
    200200            putValue(SHORT_DESCRIPTION, tr("Delete the selection in the tag table"));
    … …  
    285285     */
    286286    class AddAction extends RunnableAction implements PropertyChangeListener{
    287         public AddAction() {
     287        AddAction() {
    288288            putValue(SMALL_ICON, ImageProvider.get("dialogs", "add"));
    289289            putValue(SHORT_DESCRIPTION, tr("Add a new tag"));
    … …  
    320320     */
    321321    class PasteAction extends RunnableAction implements PropertyChangeListener{
    322         public PasteAction() {
     322        PasteAction() {
    323323            putValue(SMALL_ICON, ImageProvider.get("", "pastetags"));
    324324            putValue(SHORT_DESCRIPTION, tr("Paste tags from buffer"));
    … …  
    618618        private KeyboardFocusManager focusManager;
    619619
    620         public CellEditorRemover(KeyboardFocusManager fm) {
     620        CellEditorRemover(KeyboardFocusManager fm) {
    621621            this.focusManager = fm;
    622622        }

  • trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

    r8814 r8836  
    344344
    345345    private static class PresetDialog extends ExtendedDialog {
    346         public PresetDialog(Component content, String title, ImageIcon icon, boolean disableApply, boolean showNewRelation) {
     346        PresetDialog(Component content, String title, ImageIcon icon, boolean disableApply, boolean showNewRelation) {
    347347            super(Main.parent, title,
    348348                    showNewRelation ?

  • trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java

    r8828 r8836  
    264264     * Enum denoting how a match (see {@link TaggingPresetItem#matches}) is performed.
    265265     */
    266     public static enum MatchType {
     266    public enum MatchType {
    267267
    268268        /** Neutral, i.e., do not consider this item for matching. */
    … …  
    14351435        private String delimiter;
    14361436
    1437         public ConcatenatingJList(String del, PresetListEntry[] o) {
     1437        ConcatenatingJList(String del, PresetListEntry[] o) {
    14381438            super(o);
    14391439            delimiter = del;

  • trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java

    r8510 r8836  
    5353         * @param comboBox the combobox
    5454         */
    55         public AutoCompletingComboBoxDocument(final JosmComboBox<AutoCompletionListItem> comboBox) {
     55        AutoCompletingComboBoxDocument(final JosmComboBox<AutoCompletionListItem> comboBox) {
    5656            this.comboBox = comboBox;
    5757        }

  • trunk/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java

    r8513 r8836  
    130130        }
    131131
    132         public LatitudeValidator(JTextComponent tc) {
     132        LatitudeValidator(JTextComponent tc) {
    133133            super(tc);
    134134        }
    … …  
    170170        }
    171171
    172         public LongitudeValidator(JTextComponent tc) {
     172        LongitudeValidator(JTextComponent tc) {
    173173            super(tc);
    174174        }

  • trunk/src/org/openstreetmap/josm/io/ChangesetClosedException.java

    r8510 r8836  
    3131    public static final String ERROR_HEADER_PATTERN = "The changeset (\\d+) was closed at (.*)";
    3232
    33     public static enum Source {
     33    public enum Source {
    3434        /**
    3535         * The exception was thrown when a changeset was updated. This most likely means

  • trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java

    r8813 r8836  
    8181        private final JsonObjectBuilder geomObj;
    8282
    83         public GeometryPrimitiveVisitor(JsonObjectBuilder geomObj) {
     83        GeometryPrimitiveVisitor(JsonObjectBuilder geomObj) {
    8484            this.geomObj = geomObj;
    8585        }

  • trunk/src/org/openstreetmap/josm/io/NmeaReader.java

    r8510 r8836  
    3131
    3232    /** Handler for the different types that NMEA speaks. */
    33     public static enum NMEA_TYPE {
     33    public enum NMEA_TYPE {
    3434
    3535        /** RMC = recommended minimum sentence C. */
    … …  
    5858
    5959    // GPVTG
    60     public static enum GPVTG {
     60    public enum GPVTG {
    6161        COURSE(1), COURSE_REF(2), // true course
    6262        COURSE_M(3), COURSE_M_REF(4), // magnetic course
    … …  
    7373
    7474    // The following only applies to GPRMC
    75     public static enum GPRMC {
     75    public enum GPRMC {
    7676        TIME(1),
    7777        /** Warning from the receiver (A = data ok, V = warning) */
    … …  
    9797
    9898    // The following only applies to GPGGA
    99     public static enum GPGGA {
     99    public enum GPGGA {
    100100        TIME(1), LATITUDE(2), LATITUDE_NAME(3), LONGITUDE(4), LONGITUDE_NAME(5),
    101101        /**
    … …  
    116116    }
    117117
    118     public static enum GPGSA {
     118    public enum GPGSA {
    119119        AUTOMATIC(1),
    120120        FIX_TYPE(2), // 1 = not fixed, 2 = 2D fixed, 3 = 3D fixed)

  • trunk/src/org/openstreetmap/josm/io/OsmApi.java

    r8510 r8836  
    168168        private boolean fastFail;
    169169
    170         public CapabilitiesCache(ProgressMonitor monitor, boolean fastFail) {
     170        CapabilitiesCache(ProgressMonitor monitor, boolean fastFail) {
    171171            super(CAPABILITIES + getBaseUrl().hashCode(), CacheCustomContent.INTERVAL_WEEKLY);
    172172            this.monitor = monitor;

  • trunk/src/org/openstreetmap/josm/io/OsmReader.java

    r8582 r8836  
    544544    private static class OsmParsingException extends XMLStreamException {
    545545
    546         public OsmParsingException(String msg, Location location) {
     546        OsmParsingException(String msg, Location location) {
    547547            super(msg); /* cannot use super(msg, location) because it messes with the message preventing localization */
    548548            this.location = location;
    549549        }
    550550
    551         public OsmParsingException(String msg, Location location, Throwable th) {
     551        OsmParsingException(String msg, Location location, Throwable th) {
    552552            super(msg, th);
    553553            this.location = location;
    … …  
    580580         * @param location The parser location
    581581         */
    582         public OsmParsingCanceledException(String msg, Location location) {
     582        OsmParsingCanceledException(String msg, Location location) {
    583583            super(msg, location);
    584584        }

  • trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java

    r8540 r8836  
    5959        private int num;
    6060
    61         public DeleteTagMarker(int num) {
     61        DeleteTagMarker(int num) {
    6262            this.num = num;
    6363        }
    … …  
    7676        private final Map<String, Integer> valueCount;
    7777
    78         public ExistingValues(String tag) {
     78        ExistingValues(String tag) {
    7979            this.tag = tag;
    8080            this.valueCount = new HashMap<>();
    … …  
    159159            tm.setValueAt(tags[i][0], i, 1);
    160160            tm.setValueAt(tags[i][1].isEmpty() ? new DeleteTagMarker(count[i]) : tags[i][1], i, 2);
    161             tm.setValueAt(old , i, 3);
     161            tm.setValueAt(old, i, 3);
    162162        }
    163163
    … …  
    226226                }
    227227            });
    228             tablePanel.add(c , GBC.eol().insets(20, 10, 0, 0));
     228            tablePanel.add(c, GBC.eol().insets(20, 10, 0, 0));
    229229        }
    230230        setContent(tablePanel);

  • trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java

    r8510 r8836  
    6262
    6363    private class LayerSaveAction extends AbstractAction {
    64         public LayerSaveAction() {
     64        LayerSaveAction() {
    6565            putValue(SMALL_ICON, new ImageProvider("save").setWidth(16).get());
    6666            putValue(SHORT_DESCRIPTION, layer.requiresSaveToFile() ?

  • trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java

    r8625 r8836  
    5252
    5353    static {
    54         registerSessionLayerExporter(OsmDataLayer.class , OsmDataSessionExporter.class);
    55         registerSessionLayerExporter(TMSLayer.class , ImagerySessionExporter.class);
    56         registerSessionLayerExporter(WMSLayer.class , ImagerySessionExporter.class);
    57         registerSessionLayerExporter(WMTSLayer.class , ImagerySessionExporter.class);
    58         registerSessionLayerExporter(GpxLayer.class , GpxTracksSessionExporter.class);
    59         registerSessionLayerExporter(GeoImageLayer.class , GeoImageSessionExporter.class);
     54        registerSessionLayerExporter(OsmDataLayer.class, OsmDataSessionExporter.class);
     55        registerSessionLayerExporter(TMSLayer.class, ImagerySessionExporter.class);
     56        registerSessionLayerExporter(WMSLayer.class, ImagerySessionExporter.class);
     57        registerSessionLayerExporter(WMTSLayer.class, ImagerySessionExporter.class);
     58        registerSessionLayerExporter(GpxLayer.class, GpxTracksSessionExporter.class);
     59        registerSessionLayerExporter(GeoImageLayer.class, GeoImageSessionExporter.class);
    6060        registerSessionLayerExporter(MarkerLayer.class, MarkerSessionExporter.class);
    6161    }

  • trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

    r8795 r8836  
    14711471        }
    14721472
    1473         public UpdatePluginsMessagePanel() {
     1473        UpdatePluginsMessagePanel() {
    14741474            build();
    14751475        }

  • trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java

    r8510 r8836  
    133133         * @param t the exception
    134134         */
    135         public BugReporterThread(Throwable t) {
     135        BugReporterThread(Throwable t) {
    136136            super("Bug Reporter");
    137137            this.e = t;

  • trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java

    r8756 r8836  
    584584                + "you tried to read, update, or delete. Either the respective object<br>"
    585585                + "does not exist on the server or you are using an invalid URL to access<br>"
    586                 + "it. Please carefully check the server''s address ''{0}'' for typos."
    587                 , apiUrl);
     586                + "it. Please carefully check the server''s address ''{0}'' for typos.",
     587                apiUrl);
    588588        Main.error(e);
    589589        return "<html>" + message + "</html>";

  • trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

    r8734 r8836  
    9595     * Position of an overlay icon
    9696     */
    97     public static enum OverlayPosition {
     97    public enum OverlayPosition {
    9898        /** North west */
    9999        NORTHWEST,
    … …  
    109109     * Supported image types
    110110     */
    111     public static enum ImageType {
     111    public enum ImageType {
    112112        /** Scalable vector graphics */
    113113        SVG,
    … …  
    120120     * @since 7687
    121121     */
    122     public static enum ImageSizes {
     122    public enum ImageSizes {
    123123        /** SMALL_ICON value of on Action */
    124124        SMALLICON,
    … …  
    10751075        private final String result;
    10761076
    1077         public SAXReturnException(String result) {
     1077        SAXReturnException(String result) {
    10781078            this.result = result;
    10791079        }

  • trunk/src/org/openstreetmap/josm/tools/SubclassFilteredCollection.java

    r8285 r8836  
    2727        private S current;
    2828
    29         public FilterIterator(Iterator<? extends S> iterator) {
     29        FilterIterator(Iterator<? extends S> iterator) {
    3030            this.iterator = iterator;
    3131        }

  • trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java

    r8510 r8836  
    4949        private final String namespace;
    5050
    51         public AddNamespaceFilter(String namespace) {
     51        AddNamespaceFilter(String namespace) {
    5252            this.namespace = namespace;
    5353        }
    … …  
    6060                super.startElement(uri, localName, qName, atts);
    6161            }
    62 
    63         }
    64 
     62        }
    6563    }
    6664
    … …  
    190188        private final Map<String, Method> methods = new HashMap<>();
    191189
    192         public Entry(Class<?> klass, boolean onStart, boolean both) {
     190        Entry(Class<?> klass, boolean onStart, boolean both) {
    193191            this.klass = klass;
    194192            this.onStart = onStart;

  • trunk/src/org/openstreetmap/josm/tools/date/FallbackDateParser.java

    r8513 r8836  
    4242     * Creates a new instance.
    4343     */
    44     public FallbackDateParser() {
     44    FallbackDateParser() {
    4545        // Build a list of candidate date parsers.
    4646        dateParsers = new ArrayList<>(formats.length);

  • trunk/test/performance/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSourceFilterTest.java

    r8623 r8836  
    2727         * @param generator A generator to get the keys from.
    2828         */
    29         public CssGenerator(KeyValueDataGenerator generator) {
     29        CssGenerator(KeyValueDataGenerator generator) {
    3030            this.generator = generator;
    3131        }

  • trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java

    r8624 r8836  
    125125
    126126    class SelectActionMock extends SelectAction {
    127         public SelectActionMock(MapFrame mapFrame, DataSet dataSet, OsmDataLayer layer) {
     127        SelectActionMock(MapFrame mapFrame, DataSet dataSet, OsmDataLayer layer) {
    128128            super(mapFrame);
    129129            try {

  • trunk/test/unit/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJobTest.java

    r8624 r8836  
    1717        private String url;
    1818
    19         public TestCachedTileLoaderJob(String url) throws IOException {
     19        TestCachedTileLoaderJob(String url) throws IOException {
    2020            super(getCache(), 30000, 30000, null);
    2121            this.url = url;

  • trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java

    r8752 r8836  
    229229        LatLon expected = new LatLon(verifier.tileXYToLatLon(x, y, z + zoomOffset));
    230230        //System.out.println(z + "/" + x + "/" + y + " - result: " + result.toDisplayString() + " osmMercator: " +  expected.toDisplayString());
    231         assertEquals("Longitude" , expected.lon(), result.lon(), 1e-04);
     231        assertEquals("Longitude", expected.lon(), result.lon(), 1e-04);
    232232        assertEquals("Latitude", expected.lat(), result.lat(), 1e-04);
    233233    }

  • trunk/test/unit/org/openstreetmap/josm/data/projection/SwissGridTest.java

    r8540 r8836  
    4747        public EastNorth en;
    4848
    49         public ProjData(String name, double lon, double lat, double h1, double x, double y, double h2) {
     49        ProjData(String name, double lon, double lat, double h1, double x, double y, double h2) {
    5050            this.name = name;
    5151            ll = new LatLon(lat, lon);

  • trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java

    r8510 r8836  
    9292        Relation relation = getRelation("associatedStreet");
    9393        String actual = getConnections(wayConnectionTypeCalculator.updateLinks(relation.getMembers()));
    94         Assert.assertEquals("[NONE, I, I, I, NONE, I]" , actual);
     94        Assert.assertEquals("[NONE, I, I, I, NONE, I]", actual);
    9595        actual = getConnections(wayConnectionTypeCalculator.updateLinks(sorter.sortMembers(relation.getMembers())));
    9696        Assert.assertEquals("[FORWARD, FORWARD, I, I, I, I]", actual);
    … …  
    106106        Assert.assertEquals("[BACKWARD, BACKWARD, BACKWARD, FPH FORWARD, FPH FORWARD, FPH FORWARD, FPH FORWARD]", actual);
    107107    }
    108 
    109 
    110108}

  • trunk/test/unit/org/openstreetmap/josm/gui/preferences/ToolbarPreferencesTest.java

    r8510 r8836  
    2323    private static class TestAction extends AbstractAction implements ParameterizedAction {
    2424
    25         public TestAction() {
     25        TestAction() {
    2626            putValue("toolbar", "action");
    2727        }

  • trunk/test/unit/org/openstreetmap/josm/io/session/SessionWriterTest.java

    r8803 r8836  
    3333
    3434    private static class OsmHeadlessJosExporter extends OsmDataSessionExporter {
    35         public OsmHeadlessJosExporter(OsmDataLayer layer) {
     35        OsmHeadlessJosExporter(OsmDataLayer layer) {
    3636            super(layer);
    3737        }
    … …  
    4444
    4545    private static class OsmHeadlessJozExporter extends OsmDataSessionExporter {
    46         public OsmHeadlessJozExporter(OsmDataLayer layer) {
     46        OsmHeadlessJozExporter(OsmDataLayer layer) {
    4747            super(layer);
    4848        }
    … …  
    5555
    5656    private static class GpxHeadlessJosExporter extends GpxTracksSessionExporter {
    57         public GpxHeadlessJosExporter(GpxLayer layer) {
     57        GpxHeadlessJosExporter(GpxLayer layer) {
    5858            super(layer);
    5959        }
    … …  
    6666
    6767    private static class GpxHeadlessJozExporter extends GpxTracksSessionExporter {
    68         public GpxHeadlessJozExporter(GpxLayer layer) {
     68        GpxHeadlessJozExporter(GpxLayer layer) {
    6969            super(layer);
    7070        }

  • trunk/test/unit/org/openstreetmap/josm/tools/OsmUrlToBoundsTest.java

    r8513 r8836  
    5555        public Bounds bounds;
    5656
    57         public ParseTestItem(String url, Bounds bounds) {
     57        ParseTestItem(String url, Bounds bounds) {
    5858            this.url = url;
    5959            this.bounds = bounds;
    … …  
    7979        }
    8080    }
    81 
    8281}
Note: See TracChangeset for help on using the changeset viewer.