Changeset 8512 in josm


Ignore:
Timestamp:
2015-06-21T01:13:09+02:00 (9 years ago)
Author:
Don-vip
Message:

checkstyle: redundant modifiers

Location:
trunk
Files:
82 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/Main.java

    r8510 r8512  
    529529    private static volatile InitStatusListener initListener = null;
    530530
    531     public static interface InitStatusListener {
     531    public interface InitStatusListener {
    532532
    533533        Object updateStatus(String event);
    … …  
    14191419     * are not reported.
    14201420     */
    1421     public static interface WindowSwitchListener {
     1421    public interface WindowSwitchListener {
    14221422        /**
    14231423         * Called when the user activates a window of another application.

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

    r8510 r8512  
    247247        }
    248248
    249         private final void updateOffset() {
     249        private void updateOffset() {
    250250            ignoreListener = true;
    251251            updateOffsetIntl();
    … …  
    253253        }
    254254
    255         private final void updateOffsetIntl() {
     255        private void updateOffsetIntl() {
    256256            // Support projections with very small numbers (e.g. 4326)
    257257            int precision = Main.getProjection().getDefaultZoomInPPD() >= 1.0 ? 2 : 7;

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

    r7937 r8512  
    1818     * @param primitives The new working set of primitives. Can be null or empty
    1919     */
    20     public abstract void setPrimitives(Collection<? extends OsmPrimitive> primitives);
     20    void setPrimitives(Collection<? extends OsmPrimitive> primitives);
    2121}

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

    r7749 r8512  
    119119     *
    120120     */
    121     public void cancel();
     121    void cancel();
    122122
    123123    /**
    … …  
    127127     * @since
    128128     */
    129     public String getConfirmationMessage(URL url);
     129    String getConfirmationMessage(URL url);
    130130}

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

    r8510 r8512  
    686686     * still pressed)
    687687     */
    688     private final boolean dragInProgress() {
     688    private boolean dragInProgress() {
    689689        return didMouseDrag && startingDraggingPos != null;
    690690    }
    … …  
    851851     * reported. If there is, it will execute the merge and add it to the undo buffer.
    852852     */
    853     private final void mergePrims(Point p) {
     853    private void mergePrims(Point p) {
    854854        Collection<Node> selNodes = getCurrentDataSet().getSelectedNodes();
    855855        if (selNodes.isEmpty())
    … …  
    899899     * position. Either returns the node or null, if no suitable one is nearby.
    900900     */
    901     private final Node findNodeToMergeTo(Point p) {
     901    private Node findNodeToMergeTo(Point p) {
    902902        Collection<Node> target = mv.getNearestNodes(p,
    903903                getCurrentDataSet().getSelectedNodes(),

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

    r8510 r8512  
    203203     */
    204204    private interface MatchFactory {
    205         public Collection<String> getKeywords();
     205        Collection<String> getKeywords();
    206206    }
    207207
    208208    public interface SimpleMatchFactory extends MatchFactory {
    209         public Match get(String keyword, PushbackTokenizer tokenizer) throws ParseError;
     209        Match get(String keyword, PushbackTokenizer tokenizer) throws ParseError;
    210210    }
    211211
    212212    public interface UnaryMatchFactory extends MatchFactory {
    213         public UnaryMatch get(String keyword, Match matchOperand, PushbackTokenizer tokenizer) throws ParseError;
     213        UnaryMatch get(String keyword, Match matchOperand, PushbackTokenizer tokenizer) throws ParseError;
    214214    }
    215215
    216216    public interface BinaryMatchFactory extends MatchFactory {
    217         public BinaryMatch get(String keyword, Match lhs, Match rhs, PushbackTokenizer tokenizer) throws ParseError;
     217        BinaryMatch get(String keyword, Match lhs, Match rhs, PushbackTokenizer tokenizer) throws ParseError;
    218218    }
    219219

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

    r8510 r8512  
    6767         * @return <code>true</code> if keys have been modified
    6868         */
    69         public boolean fixKeys(Map<String, String> keys, OsmPrimitive osm);
     69        boolean fixKeys(Map<String, String> keys, OsmPrimitive osm);
    7070    }
    7171

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

    r3083 r8512  
    99     * @param apiDataSet the data to upload
    1010     */
    11     public boolean checkUpload(APIDataSet apiDataSet);
     11    boolean checkUpload(APIDataSet apiDataSet);
    1212}

  • trunk/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java

    r8510 r8512  
    6161    }
    6262
    63     private final void init(List<PrimitiveData> data, List<PrimitiveData> toSelect) {
     63    private void init(List<PrimitiveData> data, List<PrimitiveData> toSelect) {
    6464        CheckParameterUtil.ensureParameterNotNull(data, "data");
    6565        this.data.addAll(data);

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

    r8510 r8512  
    3434    private static final String SEPARATOR = "[:_]";
    3535
    36     private static final Pattern getPatternFor(String s) {
     36    private static Pattern getPatternFor(String s) {
    3737        return getPatternFor(s, false);
    3838    }
    3939
    40     private static final Pattern getPatternFor(String s, boolean exactMatch) {
     40    private static Pattern getPatternFor(String s, boolean exactMatch) {
    4141        if (exactMatch) {
    4242            return Pattern.compile("(^)(" + s + ")($)");

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

    r8443 r8512  
    290290    }
    291291
    292     private final File getPidFile(File osmFile) {
     292    private File getPidFile(File osmFile) {
    293293        return new File(autosaveDir, osmFile.getName().replaceFirst("[.][^.]+$", ".pid"));
    294294    }

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

    r7937 r8512  
    1616     * @return the collection of data sources.
    1717     */
    18     public Collection<DataSource> getDataSources();
     18    Collection<DataSource> getDataSources();
    1919
    2020    /**
    … …  
    2222     * @return Area object encompassing downloaded data.
    2323     */
    24     public Area getDataSourceArea();
     24    Area getDataSourceArea();
    2525
    2626    /**
    … …  
    3636     * bounds are defined.
    3737     */
    38     public List<Bounds> getDataSourceBounds();
     38    List<Bounds> getDataSourceBounds();
    3939}

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

    r6380 r8512  
    2323     * @param newSelection The new selection.
    2424     */
    25     public void selectionChanged(Collection<? extends OsmPrimitive> newSelection);
     25    void selectionChanged(Collection<? extends OsmPrimitive> newSelection);
    2626}

  • trunk/src/org/openstreetmap/josm/data/cache/ICachedLoaderJob.java

    r8470 r8512  
    1616     * @return cache key for tile
    1717     */
    18     public K getCacheKey();
     18    K getCacheKey();
    1919
    2020    /**
    … …  
    2323     *
    2424     */
    25     public URL getUrl();
     25    URL getUrl();
     26
    2627    /**
    2728     * implements the main algorithm for fetching
    2829     */
    29     public void run();
     30    void run();
    3031
    3132    /**
    … …  
    3435     * @return filled tile with data or null when no cache entry found
    3536     */
    36     public CacheEntry get();
     37    CacheEntry get();
    3738
    3839    /**
    … …  
    4243     * @param force true if the load should skip all the caches (local & remote)
    4344     */
    44     public void submit(ICachedLoaderListener listener, boolean force);
     45    void submit(ICachedLoaderListener listener, boolean force);
    4546}

  • trunk/src/org/openstreetmap/josm/data/cache/ICachedLoaderListener.java

    r8470 r8512  
    2323     * @param result load result (success, failure, canceled)
    2424     */
    25     public void loadingFinished(CacheEntry data, CacheEntryAttributes attributes, LoadResult result);
     25    void loadingFinished(CacheEntry data, CacheEntryAttributes attributes, LoadResult result);
    2626}

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

    r8510 r8512  
    33
    44public interface IConflictListener {
    5     public void onConflictsAdded(ConflictCollection conflicts);
     5    void onConflictsAdded(ConflictCollection conflicts);
    66
    7     public void onConflictsRemoved(ConflictCollection conflicts);
     7    void onConflictsRemoved(ConflictCollection conflicts);
    88}

  • trunk/src/org/openstreetmap/josm/data/gpx/GpxConstants.java

    r8510 r8512  
    1616     *  GPX does not place restrictions on the length of this field or the characters contained in it.
    1717     *  It is up to the receiving application to validate the field before sending it to the GPS. */
    18     public static final String GPX_NAME = "name";
     18    String GPX_NAME = "name";
    1919
    2020    /** GPS element comment. Sent to GPS as comment. */
    21     public static final String GPX_CMT = "cmt";
     21    String GPX_CMT = "cmt";
    2222
    2323    /** Text description of the element. Holds additional information about the element intended for the user, not the GPS. */
    24     public static final String GPX_DESC = "desc";
     24    String GPX_DESC = "desc";
    2525
    2626    /** Source of data. Included to give user some idea of reliability and accuracy of data. */
    27     public static final String GPX_SRC = "src";
     27    String GPX_SRC = "src";
    2828
    29     public static final String META_PREFIX = "meta.";
    30     public static final String META_AUTHOR_NAME = META_PREFIX + "author.name";
    31     public static final String META_AUTHOR_EMAIL = META_PREFIX + "author.email";
    32     public static final String META_AUTHOR_LINK = META_PREFIX + "author.link";
    33     public static final String META_COPYRIGHT_AUTHOR = META_PREFIX + "copyright.author";
    34     public static final String META_COPYRIGHT_LICENSE = META_PREFIX + "copyright.license";
    35     public static final String META_COPYRIGHT_YEAR = META_PREFIX + "copyright.year";
    36     public static final String META_DESC = META_PREFIX + "desc";
    37     public static final String META_KEYWORDS = META_PREFIX + "keywords";
    38     public static final String META_LINKS = META_PREFIX + "links";
    39     public static final String META_NAME = META_PREFIX + "name";
    40     public static final String META_TIME = META_PREFIX + "time";
    41     public static final String META_BOUNDS = META_PREFIX + "bounds";
    42     public static final String META_EXTENSIONS = META_PREFIX + "extensions";
     29    String META_PREFIX = "meta.";
     30    String META_AUTHOR_NAME = META_PREFIX + "author.name";
     31    String META_AUTHOR_EMAIL = META_PREFIX + "author.email";
     32    String META_AUTHOR_LINK = META_PREFIX + "author.link";
     33    String META_COPYRIGHT_AUTHOR = META_PREFIX + "copyright.author";
     34    String META_COPYRIGHT_LICENSE = META_PREFIX + "copyright.license";
     35    String META_COPYRIGHT_YEAR = META_PREFIX + "copyright.year";
     36    String META_DESC = META_PREFIX + "desc";
     37    String META_KEYWORDS = META_PREFIX + "keywords";
     38    String META_LINKS = META_PREFIX + "links";
     39    String META_NAME = META_PREFIX + "name";
     40    String META_TIME = META_PREFIX + "time";
     41    String META_BOUNDS = META_PREFIX + "bounds";
     42    String META_EXTENSIONS = META_PREFIX + "extensions";
    4343
    44     public static final String JOSM_EXTENSIONS_NAMESPACE_URI = Main.getXMLBase() + "/gpx-extensions-1.0";
     44    String JOSM_EXTENSIONS_NAMESPACE_URI = Main.getXMLBase() + "/gpx-extensions-1.0";
    4545
    4646    /** Elevation (in meters) of the point. */
    47     public static final String PT_ELE = "ele";
     47    String PT_ELE = "ele";
    4848
    4949    /** Creation/modification timestamp for the point.
    … …  
    5151     *  Conforms to ISO 8601 specification for date/time representation.
    5252     *  Fractional seconds are allowed for millisecond timing in tracklogs. */
    53     public static final String PT_TIME = "time";
     53    String PT_TIME = "time";
    5454
    5555    /** Magnetic variation (in degrees) at the point. 0.0 <= value < 360.0 */
    56     public static final String PT_MAGVAR = "magvar";
     56    String PT_MAGVAR = "magvar";
    5757
    5858    /** Height, in meters, of geoid (mean sea level) above WGS-84 earth ellipsoid. (NMEA GGA message) */
    59     public static final String PT_GEOIDHEIGHT = "geoidheight";
     59    String PT_GEOIDHEIGHT = "geoidheight";
    6060
    6161    /** Text of GPS symbol name. For interchange with other programs, use the exact spelling of the symbol on the GPS, if known. */
    62     public static final String PT_SYM = "sym";
     62    String PT_SYM = "sym";
    6363
    6464    /** Type (textual classification) of element. */
    65     public static final String PT_TYPE = "type";
     65    String PT_TYPE = "type";
    6666
    6767    /** Type of GPS fix. none means GPS had no fix. Value comes from list: {'none'|'2d'|'3d'|'dgps'|'pps'} */
    68     public static final String PT_FIX = "fix";
     68    String PT_FIX = "fix";
    6969
    7070    /** Number of satellites used to calculate the GPS fix. (not number of satellites in view). */
    71     public static final String PT_SAT = "sat";
     71    String PT_SAT = "sat";
    7272
    7373    /** Horizontal dilution of precision. */
    74     public static final String PT_HDOP = "hdop";
     74    String PT_HDOP = "hdop";
    7575
    7676    /** Vertical dilution of precision. */
    77     public static final String PT_VDOP = "vdop";
     77    String PT_VDOP = "vdop";
    7878
    7979    /** Position dilution of precision. */
    80     public static final String PT_PDOP = "pdop";
     80    String PT_PDOP = "pdop";
    8181
    8282    /** Number of seconds since last DGPS update. */
    83     public static final String PT_AGEOFDGPSDATA = "ageofdgpsdata";
     83    String PT_AGEOFDGPSDATA = "ageofdgpsdata";
    8484
    8585    /** Represents a differential GPS station. 0 <= value <= 1023 */
    86     public static final String PT_DGPSID = "dgpsid";
     86    String PT_DGPSID = "dgpsid";
    8787
    8888    /**
    8989     * Ordered list of all possible waypoint keys.
    9090     */
    91     public static List<String> WPT_KEYS = Arrays.asList(PT_ELE, PT_TIME, PT_MAGVAR, PT_GEOIDHEIGHT,
     91    List<String> WPT_KEYS = Arrays.asList(PT_ELE, PT_TIME, PT_MAGVAR, PT_GEOIDHEIGHT,
    9292            GPX_NAME, GPX_CMT, GPX_DESC, GPX_SRC, META_LINKS, PT_SYM, PT_TYPE,
    9393            PT_FIX, PT_SAT, PT_HDOP, PT_VDOP, PT_PDOP, PT_AGEOFDGPSDATA, PT_DGPSID, META_EXTENSIONS);
    … …  
    9696     * Ordered list of all possible route and track keys.
    9797     */
    98     public static List<String> RTE_TRK_KEYS = Arrays.asList(
     98    List<String> RTE_TRK_KEYS = Arrays.asList(
    9999            GPX_NAME, GPX_CMT, GPX_DESC, GPX_SRC, META_LINKS, "number", PT_TYPE, META_EXTENSIONS);
    100100
    … …  
    102102     * Possible fix values.
    103103     */
    104     public static Collection<String> FIX_VALUES = Arrays.asList("none", "2d", "3d", "dgps", "pps");
     104    Collection<String> FIX_VALUES = Arrays.asList("none", "2d", "3d", "dgps", "pps");
    105105}

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

    r8510 r8512  
    172172     * @since 7700
    173173     */
    174     public final int getCommentsCount() {
     174    public int getCommentsCount() {
    175175        return commentsCount;
    176176    }
    … …  
    181181     * @since 7700
    182182     */
    183     public final void setCommentsCount(int commentsCount) {
     183    public void setCommentsCount(int commentsCount) {
    184184        this.commentsCount = commentsCount;
    185185    }
    … …  
    349349     * @since 7704
    350350     */
    351     public final synchronized List<ChangesetDiscussionComment> getDiscussion() {
     351    public synchronized List<ChangesetDiscussionComment> getDiscussion() {
    352352        if (discussion == null) {
    353353            return Collections.emptyList();
    … …  
    361361     * @since 7704
    362362     */
    363     public final synchronized void addDiscussionComment(ChangesetDiscussionComment comment) {
     363    public synchronized void addDiscussionComment(ChangesetDiscussionComment comment) {
    364364        if (comment == null) {
    365365            return;

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

    r8510 r8512  
    2323    }
    2424
    25     public static interface ChangesetDataSetEntry {
    26         public ChangesetModificationType getModificationType();
     25    public interface ChangesetDataSetEntry {
     26        ChangesetModificationType getModificationType();
    2727
    28         public HistoryOsmPrimitive getPrimitive();
     28        HistoryOsmPrimitive getPrimitive();
    2929    }
    3030

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

    r8510 r8512  
    220220     * @see #setUploadDiscouraged
    221221     */
    222     public final boolean isUploadDiscouraged() {
     222    public boolean isUploadDiscouraged() {
    223223        return uploadDiscouraged;
    224224    }
    … …  
    229229     * @see #isUploadDiscouraged
    230230     */
    231     public final void setUploadDiscouraged(boolean uploadDiscouraged) {
     231    public void setUploadDiscouraged(boolean uploadDiscouraged) {
    232232        this.uploadDiscouraged = uploadDiscouraged;
    233233    }

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

    r8510 r8512  
    217217    }
    218218
    219     private final void resetPrimitive(OsmPrimitive osm) {
     219    private void resetPrimitive(OsmPrimitive osm) {
    220220        if (osm instanceof Way) {
    221221            ((Way) osm).setNodes(null);

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

    r8510 r8512  
    2121     * @return computed hashcode
    2222     */
    23     public int getHashCode(K k);
     23    int getHashCode(K k);
    2424
    2525    /**
    … …  
    3232     * uniquely identifies t in given class.
    3333     */
    34     public boolean equals(K k, T t);
     34    boolean equals(K k, T t);
    3535}

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

    r8510 r8512  
    4040     * @since 7828
    4141     */
    42     public final boolean isLatLonKnown() {
     42    public boolean isLatLonKnown() {
    4343        return !Double.isNaN(lat) && !Double.isNaN(lon);
    4444    }
    4545
    4646    @Override
    47     public final void setCoor(LatLon coor) {
     47    public void setCoor(LatLon coor) {
    4848        updateCoor(coor, null);
    4949    }
    5050
    5151    @Override
    52     public final void setEastNorth(EastNorth eastNorth) {
     52    public void setEastNorth(EastNorth eastNorth) {
    5353        updateCoor(null, eastNorth);
    5454    }
    … …  
    6868
    6969    @Override
    70     public final LatLon getCoor() {
     70    public LatLon getCoor() {
    7171        if (!isLatLonKnown()) return null;
    7272        return new LatLon(lat, lon);
    … …  
    8989     */
    9090    @Override
    91     public final EastNorth getEastNorth() {
     91    public EastNorth getEastNorth() {
    9292        if (!isLatLonKnown()) return null;
    9393

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

    r8510 r8512  
    774774    }
    775775
    776     public final void clearCachedNodeStyles() {
     776    public void clearCachedNodeStyles() {
    777777        for (final Node n : nodes) {
    778778            n.clearCachedStyle();

  • trunk/src/org/openstreetmap/josm/data/osm/history/History.java

    r8510 r8512  
    2121public class History {
    2222
    23     private static interface FilterPredicate {
     23    private interface FilterPredicate {
    2424        boolean matches(HistoryOsmPrimitive primitive);
    2525    }

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

    r8510 r8512  
    224224     * @param d Fourth value
    225225     */
    226     private static final int max(int a, int b, int c, int d) {
     226    private static int max(int a, int b, int c, int d) {
    227227        return Math.max(Math.max(a, b), Math.max(c, d));
    228228    }

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

    r8510 r8512  
    370370    }
    371371
    372     private final void load(Relation r) {
     372    private void load(Relation r) {
    373373        MultipolygonRoleMatcher matcher = getMultipolygonRoleMatcher();
    374374
    … …  
    556556    }
    557557
    558     private final void addInnerToOuters(List<PolyData> innerPolygons, List<PolyData> outerPolygons)  {
     558    private void addInnerToOuters(List<PolyData> innerPolygons, List<PolyData> outerPolygons)  {
    559559
    560560        if (innerPolygons.isEmpty()) {

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

    r8510 r8512  
    6868     * @return A multipolygon object for the given relation, or {@code null}
    6969     */
    70     public final Multipolygon get(NavigatableComponent nc, Relation r) {
     70    public Multipolygon get(NavigatableComponent nc, Relation r) {
    7171        return get(nc, r, false);
    7272    }
    … …  
    7979     * @return A multipolygon object for the given relation, or {@code null}
    8080     */
    81     public final Multipolygon get(NavigatableComponent nc, Relation r, boolean forceRefresh) {
     81    public Multipolygon get(NavigatableComponent nc, Relation r, boolean forceRefresh) {
    8282        Multipolygon multipolygon = null;
    8383        if (nc != null && r != null) {
    … …  
    107107     * @param nc the navigatable component
    108108     */
    109     public final void clear(NavigatableComponent nc) {
     109    public void clear(NavigatableComponent nc) {
    110110        Map<DataSet, Map<Relation, Multipolygon>> map = cache.remove(nc);
    111111        if (map != null) {
    … …  
    119119     * @param ds the data set
    120120     */
    121     public final void clear(DataSet ds) {
     121    public void clear(DataSet ds) {
    122122        for (Map<DataSet, Map<Relation, Multipolygon>> map1 : cache.values()) {
    123123            Map<Relation, Multipolygon> map2 = map1.remove(ds);
    … …  
    132132     * Clears the whole cache.
    133133     */
    134     public final void clear() {
     134    public void clear() {
    135135        cache.clear();
    136136    }
    137137
    138     private final Collection<Map<Relation, Multipolygon>> getMapsFor(DataSet ds) {
     138    private Collection<Map<Relation, Multipolygon>> getMapsFor(DataSet ds) {
    139139        List<Map<Relation, Multipolygon>> result = new ArrayList<>();
    140140        for (Map<DataSet, Map<Relation, Multipolygon>> map : cache.values()) {
    … …  
    151151    }
    152152
    153     private final void updateMultipolygonsReferringTo(AbstractDatasetChangedEvent event) {
     153    private void updateMultipolygonsReferringTo(AbstractDatasetChangedEvent event) {
    154154        updateMultipolygonsReferringTo(event, event.getPrimitives(), event.getDataset());
    155155    }
    156156
    157     private final void updateMultipolygonsReferringTo(
     157    private void updateMultipolygonsReferringTo(
    158158            final AbstractDatasetChangedEvent event, Collection<? extends OsmPrimitive> primitives, DataSet ds) {
    159159        updateMultipolygonsReferringTo(event, primitives, ds, null);
    160160    }
    161161
    162     private final Collection<Map<Relation, Multipolygon>> updateMultipolygonsReferringTo(
     162    private Collection<Map<Relation, Multipolygon>> updateMultipolygonsReferringTo(
    163163            AbstractDatasetChangedEvent event, Collection<? extends OsmPrimitive> primitives,
    164164            DataSet ds, Collection<Map<Relation, Multipolygon>> initialMaps) {
    … …  
    189189    }
    190190
    191     private final void processEvent(AbstractDatasetChangedEvent event, Relation r, Collection<Map<Relation, Multipolygon>> maps) {
     191    private void processEvent(AbstractDatasetChangedEvent event, Relation r, Collection<Map<Relation, Multipolygon>> maps) {
    192192        if (event instanceof NodeMovedEvent || event instanceof WayNodesChangedEvent) {
    193193            dispatchEvent(event, r, maps);
    … …  
    202202    }
    203203
    204     private final void dispatchEvent(AbstractDatasetChangedEvent event, Relation r, Collection<Map<Relation, Multipolygon>> maps) {
     204    private void dispatchEvent(AbstractDatasetChangedEvent event, Relation r, Collection<Map<Relation, Multipolygon>> maps) {
    205205        for (Map<Relation, Multipolygon> map : maps) {
    206206            Multipolygon m = map.get(r);
    … …  
    217217    }
    218218
    219     private final void removeMultipolygonFrom(Relation r, Collection<Map<Relation, Multipolygon>> maps) {
     219    private void removeMultipolygonFrom(Relation r, Collection<Map<Relation, Multipolygon>> maps) {
    220220        for (Map<Relation, Multipolygon> map : maps) {
    221221            map.remove(r);

  • trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java

    r8510 r8512  
    209209     * @return interpolated value
    210210     */
    211     private final double interpolate(float a, float b, float c, float d, double x, double y) {
     211    private double interpolate(float a, float b, float c, float d, double x, double y) {
    212212        return a + (((double) b - (double) a) * x) + (((double) c - (double) a) * y) +
    213213        (((double) a + (double) d - b - c) * x * y);

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

    r8510 r8512  
    200200     * @return {@code true} if power key is set and equal to possible values
    201201     */
    202     private static final boolean isPowerIn(OsmPrimitive p, Collection<String> values) {
     202    private static boolean isPowerIn(OsmPrimitive p, Collection<String> values) {
    203203        String v = p.get("power");
    204204        return v != null && values != null && values.contains(v);

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

    r8510 r8512  
    454454     * </code>
    455455     */
    456     public static interface Listener {
     456    public interface Listener {
    457457
    458458        /**
    … …  
    461461         * @param files An array of <tt>File</tt>s that were dropped.
    462462         */
    463         public abstract void filesDropped(File[] files);
     463        void filesDropped(File[] files);
    464464    }
    465465
    … …  
    668668         * @author Robert Harder
    669669         */
    670         public static interface Fetcher {
     670        public interface Fetcher {
    671671            /**
    672672             * Return the object being encapsulated in the
    … …  
    675675             * @return The dropped object
    676676             */
    677             public abstract Object getObject();
     677            Object getObject();
    678678        }
    679679    }

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

    r8510 r8512  
    101101        }
    102102
    103         private final boolean addChangeListener(ChangeListener listener) {
     103        private boolean addChangeListener(ChangeListener listener) {
    104104            return listener != null ? listeners.add(listener) : false;
    105105        }

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

    r8378 r8512  
    1515     * @param newFrame The new MapFrame
    1616     */
    17     public abstract void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame);
     17    void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame);
    1818}

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

    r7937 r8512  
    1414     * @return The corrected type name if needed, null otherwise.
    1515     */
    16     public String checkRelationTypeName(IRelation relation, String defaultName);
     16    String checkRelationTypeName(IRelation relation, String defaultName);
    1717
    1818    /**
    … …  
    2222     * @return The corrected format if needed, null otherwise.
    2323     */
    24     public String checkFormat(INode node, String defaultName);
     24    String checkFormat(INode node, String defaultName);
    2525
    2626    /**
    … …  
    3030     * @return The corrected format if needed, null otherwise.
    3131     */
    32     public String checkFormat(IWay way, String defaultName);
     32    String checkFormat(IWay way, String defaultName);
    3333
    3434    /**
    … …  
    3838     * @return The corrected format if needed, null otherwise.
    3939     */
    40     public String checkFormat(IRelation relation, String defaultName);
     40    String checkFormat(IRelation relation, String defaultName);
    4141}

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

    r8510 r8512  
    6060         * @see InputEvent#getModifiersEx()
    6161         */
    62         public void selectionEnded(Rectangle r, MouseEvent e);
     62        void selectionEnded(Rectangle r, MouseEvent e);
     63
    6364        /**
    6465         * Called to register the selection manager for "active" property.
    6566         * @param listener The listener to register
    6667         */
    67         public void addPropertyChangeListener(PropertyChangeListener listener);
     68        void addPropertyChangeListener(PropertyChangeListener listener);
     69
    6870        /**
    6971         * Called to remove the selection manager from the listener list
    … …  
    7173         * @param listener The listener to register
    7274         */
    73         public void removePropertyChangeListener(PropertyChangeListener listener);
     75        void removePropertyChangeListener(PropertyChangeListener listener);
    7476    }
    7577    /**

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

    r8510 r8512  
    88 */
    99public interface ShowHideButtonListener {
    10     public void buttonShown();
     10    void buttonShown();
    1111
    12     public void buttonHidden();
     12    void buttonHidden();
    1313}

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

    r6070 r8512  
    2323     * @param bbox the bounding box
    2424     */
    25     public void setBoundingBox(Bounds bbox);
     25    void setBoundingBox(Bounds bbox);
    2626
    2727    /**
    … …  
    3232     * @return the currently selected bounding box
    3333     */
    34     public Bounds getBoundingBox();
     34    Bounds getBoundingBox();
    3535}

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

    r8510 r8512  
    775775    }
    776776
    777     private static interface FreezeActionProperties {
     777    private interface FreezeActionProperties {
    778778        String PROP_SELECTED = FreezeActionProperties.class.getName() + ".selected";
    779779    }

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

    r8510 r8512  
    4141     * Defines the interface for an object implementing navigation between rows
    4242     */
    43     public static interface NavigationListener {
     43    public interface NavigationListener {
    4444        /** Call when need to go to next row */
    4545        void gotoNextDecision();

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

    r8510 r8512  
    176176     *
    177177     */
    178     private final void resolve() {
     178    private void resolve() {
    179179        if (conflicts == null || model.getSize() == 0) return;
    180180
    … …  
    197197     * refreshes the view of this dialog
    198198     */
    199     public final void refreshView() {
     199    public void refreshView() {
    200200        OsmDataLayer editLayer =  Main.main.getEditLayer();
    201201        conflicts = (editLayer == null ? new ConflictCollection() : editLayer.getConflicts());

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

    r8510 r8512  
    142142     * to toggle the visibility of the first ten layers.
    143143     */
    144     private final void createVisibilityToggleShortcuts() {
     144    private void createVisibilityToggleShortcuts() {
    145145        final int[] k = {
    146146                KeyEvent.VK_1, KeyEvent.VK_2, KeyEvent.VK_3, KeyEvent.VK_4, KeyEvent.VK_5,
    … …  
    11281128         * @param layer the layer
    11291129         */
    1130         public void makeVisible(int index, Layer layer);
     1130        void makeVisible(int index, Layer layer);
    11311131
    11321132
    … …  
    11341134         * Fired when something has changed in the layer list model.
    11351135         */
    1136         public void refresh();
     1136        void refresh();
    11371137    }
    11381138

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

    r8510 r8512  
    592592    }
    593593
    594     private final void setupPopupMenuHandler() {
     594    private void setupPopupMenuHandler() {
    595595
    596596        // -- select action

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

    r8510 r8512  
    173173    }
    174174
    175     private final void alertNoPrimitivesTo(Collection<HistoryOsmPrimitive> primitives, String title, String helpTopic) {
     175    private void alertNoPrimitivesTo(Collection<HistoryOsmPrimitive> primitives, String title, String helpTopic) {
    176176        HelpAwareOptionPane.showOptionDialog(
    177177                ChangesetContentPanel.this,

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

    r8510 r8512  
    1818public class RelationSorter {
    1919
    20     private static interface AdditionalSorter {
    21         public boolean acceptsMember(RelationMember m);
     20    private interface AdditionalSorter {
     21        boolean acceptsMember(RelationMember m);
    2222
    23         public List<RelationMember> sortMembers(List<RelationMember> list);
     23        List<RelationMember> sortMembers(List<RelationMember> list);
    2424    }
    2525

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

    r6380 r8512  
    1717     * @param area the current download area
    1818     */
    19     public void setDownloadArea(Bounds area);
     19    void setDownloadArea(Bounds area);
    2020}

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

    r8510 r8512  
    499499    }
    500500
    501     private final int getBestZoom() {
     501    private int getBestZoom() {
    502502        double factor = getScaleFactor(1); // check the ratio between area of tilesize at zoom 1 to current view
    503503        double result = Math.log(factor)/Math.log(2)/2+1;

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

    r8510 r8512  
    919919     *         {@code false} otherwise
    920920     */
    921     private static final boolean isSupportedMapMode(MapMode mapMode) {
     921    private static boolean isSupportedMapMode(MapMode mapMode) {
    922922        if (mapMode instanceof SelectAction || mapMode instanceof LassoModeAction) {
    923923            return true;
    … …  
    939939    public void hookUpMapView() {
    940940        mouseAdapter = new MouseAdapter() {
    941             private final boolean isMapModeOk() {
     941            private boolean isMapModeOk() {
    942942                return Main.map.mapMode == null || isSupportedMapMode(Main.map.mapMode);
    943943            }

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

    r8510 r8512  
    547547    }
    548548
    549     private final Point img2compCoord(Rectangle visibleRect, int xImg, int yImg) {
     549    private Point img2compCoord(Rectangle visibleRect, int xImg, int yImg) {
    550550        Rectangle drawRect = calculateDrawImageRectangle(visibleRect);
    551551        return new Point(drawRect.x + ((xImg - visibleRect.x) * drawRect.width) / visibleRect.width,
    … …  
    553553    }
    554554
    555     private final Point comp2imgCoord(Rectangle visibleRect, int xComp, int yComp) {
     555    private Point comp2imgCoord(Rectangle visibleRect, int xComp, int yComp) {
    556556        Rectangle drawRect = calculateDrawImageRectangle(visibleRect);
    557557        return new Point(visibleRect.x + ((xComp - drawRect.x) * visibleRect.width) / drawRect.width,
    … …  
    559559    }
    560560
    561     private final Point getCenterImgCoord(Rectangle visibleRect) {
     561    private Point getCenterImgCoord(Rectangle visibleRect) {
    562562        return new Point(visibleRect.x + visibleRect.width / 2,
    563563                visibleRect.y + visibleRect.height / 2);
    … …  
    630630    }
    631631
    632     private final void checkVisibleRectPos(Image image, Rectangle visibleRect) {
     632    private void checkVisibleRectPos(Image image, Rectangle visibleRect) {
    633633        if (visibleRect.x < 0) {
    634634            visibleRect.x = 0;

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

    r8510 r8512  
    8282     * @since 6450
    8383     */
    84     public final boolean hasGpsTime() {
     84    public boolean hasGpsTime() {
    8585        return (tmp != null && tmp.gpsTime != null) || gpsTime != null;
    8686    }
    … …  
    106106     * @since 6450
    107107     */
    108     public final boolean hasExifTime() {
     108    public boolean hasExifTime() {
    109109        return exifTime != null;
    110110    }
    … …  
    115115     * @since 6392
    116116     */
    117     public final Date getExifGpsTime() {
     117    public Date getExifGpsTime() {
    118118        return getDefensiveDate(exifGpsTime);
    119119    }
    … …  
    124124     * @since 6450
    125125     */
    126     public final boolean hasExifGpsTime() {
     126    public boolean hasExifGpsTime() {
    127127        return exifGpsTime != null;
    128128    }
    … …  
    182182     * @since 6392
    183183     */
    184     public final void setExifGpsTime(Date exifGpsTime) {
     184    public void setExifGpsTime(Date exifGpsTime) {
    185185        this.exifGpsTime = getDefensiveDate(exifGpsTime);
    186186    }

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

    r8376 r8512  
    6161    }
    6262
    63     private final void updateErroneous() {
     63    private void updateErroneous() {
    6464        if ("file".equals(webUrl.getProtocol())) {
    6565            String path = webUrl.getPath();

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

    r8510 r8512  
    2121    public enum VerticalTextAlignment { ABOVE, TOP, CENTER, BOTTOM, BELOW }
    2222
    23     public static interface BoxProvider {
     23    public interface BoxProvider {
    2424        BoxProviderResult get();
    2525    }

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

    r8510 r8512  
    451451
    452452    public interface MapPaintSylesUpdateListener {
    453         public void mapPaintStylesUpdated();
    454 
    455         public void mapPaintStyleEntryUpdated(int idx);
     453        void mapPaintStylesUpdated();
     454
     455        void mapPaintStyleEntryUpdated(int idx);
    456456    }
    457457

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

    r8510 r8512  
    1111    String getId(Environment env);
    1212
    13     public static Subpart DEFAULT_SUBPART = new StringSubpart("default");
     13    Subpart DEFAULT_SUBPART = new StringSubpart("default");
    1414
    1515    /**
    … …  
    1818     * E.g. ::layer_1
    1919     */
    20     public static class StringSubpart implements Subpart {
     20    class StringSubpart implements Subpart {
    2121        private final String id;
    2222
    … …  
    3636     * E.g. ::(concat("layer_", prop("i", "default")))
    3737     */
    38     public static class ExpressionSubpart implements Subpart {
     38    class ExpressionSubpart implements Subpart {
    3939        private final Expression id;
    4040

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

    r6380 r8512  
    2323     * @return true if the tab has only to be displayed in expert mode, false otherwise.
    2424     */
    25     public boolean isExpert();
     25    boolean isExpert();
    2626}

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

    r8510 r8512  
    191191    }
    192192
    193     private static interface PreferenceTab {
    194         public TabPreferenceSetting getTabPreferenceSetting();
    195 
    196         public Component getComponent();
     193    private interface PreferenceTab {
     194        TabPreferenceSetting getTabPreferenceSetting();
     195
     196        Component getComponent();
    197197    }
    198198
    … …  
    217217
    218218        @Override
    219         public final TabPreferenceSetting getTabPreferenceSetting() {
     219        public TabPreferenceSetting getTabPreferenceSetting() {
    220220            return preferenceSetting;
    221221        }
    … …  
    240240
    241241        @Override
    242         public final TabPreferenceSetting getTabPreferenceSetting() {
     242        public TabPreferenceSetting getTabPreferenceSetting() {
    243243            return preferenceSetting;
    244244        }
    … …  
    299299    }
    300300
    301     private static interface TabIdentifier {
    302         public boolean identify(TabPreferenceSetting tps, Object param);
     301    private interface TabIdentifier {
     302        boolean identify(TabPreferenceSetting tps, Object param);
    303303    }
    304304
    … …  
    352352     * @return the {@code DisplayPreference} object.
    353353     */
    354     public final DisplayPreference getDisplayPreference() {
     354    public DisplayPreference getDisplayPreference() {
    355355        return getSetting(DisplayPreference.class);
    356356    }
    … …  
    360360     * @return the {@code MapPreference} object.
    361361     */
    362     public final MapPreference getMapPreference() {
     362    public MapPreference getMapPreference() {
    363363        return getSetting(MapPreference.class);
    364364    }
    … …  
    368368     * @return the {@code PluginPreference} object.
    369369     */
    370     public final PluginPreference getPluginPreference() {
     370    public PluginPreference getPluginPreference() {
    371371        return getSetting(PluginPreference.class);
    372372    }
    … …  
    376376     * @return the {@code ImageryPreference} object.
    377377     */
    378     public final ImageryPreference getImageryPreference() {
     378    public ImageryPreference getImageryPreference() {
    379379        return getSetting(ImageryPreference.class);
    380380    }
    … …  
    384384     * @return the {@code ShortcutPreference} object.
    385385     */
    386     public final ShortcutPreference getShortcutPreference() {
     386    public ShortcutPreference getShortcutPreference() {
    387387        return getSetting(ShortcutPreference.class);
    388388    }
    … …  
    393393     * @since 6523
    394394     */
    395     public final ServerAccessPreference getServerPreference() {
     395    public ServerAccessPreference getServerPreference() {
    396396        return getSetting(ServerAccessPreference.class);
    397397    }
    … …  
    402402     * @since 6665
    403403     */
    404     public final ValidatorPreference getValidatorPreference() {
     404    public ValidatorPreference getValidatorPreference() {
    405405        return getSetting(ValidatorPreference.class);
    406406    }

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

    r7937 r8512  
    66public interface SourceProvider {
    77
    8     public Collection<SourceEntry> getSources();
     8    Collection<SourceEntry> getSources();
    99}

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

    r7937 r8512  
    1313     * Returns the preference setting (displayed in the specified preferences tab pane) that contains this preference setting.
    1414     */
    15     public TabPreferenceSetting getTabPreferenceSetting(final PreferenceTabbedPane gui);
     15    TabPreferenceSetting getTabPreferenceSetting(final PreferenceTabbedPane gui);
    1616}

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

    r7937 r8512  
    1010 */
    1111public interface TabPreferenceSetting extends PreferenceSetting {
    12    
     12
    1313    /**
    1414     * Called during preferences dialog initialization to display the preferences tab with the returned icon.
    1515     * @return The icon name in the preferences folder.
    1616     */
    17     public String getIconName();
     17    String getIconName();
    1818
    1919    /**
    … …  
    2222     */
    2323    String getTitle();
    24    
     24
    2525    /**
    2626     * Called during preferences dialog initialization to display the preferences tab with the returned tooltip.
    2727     * @return The tooltip of this preferences tab.
    2828     */
    29     public String getTooltip();
     29    String getTooltip();
    3030
    3131    /**
    32      * Called during preferences tab initialization to display a description in one sentence for this tab. 
     32     * Called during preferences tab initialization to display a description in one sentence for this tab.
    3333     * Will be displayed in italic under the title.
    3434     * @return The description of this preferences tab.
    3535     */
    36     public String getDescription();
     36    String getDescription();
    3737
    3838    /**
    … …  
    4343     * @since 5631
    4444     */
    45     public void addSubTab(SubPreferenceSetting sub, String title, Component component);
    46    
     45    void addSubTab(SubPreferenceSetting sub, String title, Component component);
     46
    4747    /**
    4848     * Adds a new sub preference settings tab with the given title, component and tooltip.
    … …  
    5353     * @since 5631
    5454     */
    55     public void addSubTab(SubPreferenceSetting sub, String title, Component component, String tip);
     55    void addSubTab(SubPreferenceSetting sub, String title, Component component, String tip);
    5656
    5757    /**
    … …  
    6161     * @since 5631
    6262     */
    63     public void registerSubTab(SubPreferenceSetting sub, Component component);
    64    
     63    void registerSubTab(SubPreferenceSetting sub, Component component);
     64
    6565    /**
    6666     * Returns the tab component related to the specified sub preference settings
    … …  
    6969     * @since 5631
    7070     */
    71     public Component getSubTab(SubPreferenceSetting sub);
     71    Component getSubTab(SubPreferenceSetting sub);
    7272
    7373    /**
    … …  
    7777     * @since 5631
    7878     */
    79     public boolean selectSubTab(SubPreferenceSetting subPref);
     79    boolean selectSubTab(SubPreferenceSetting subPref);
    8080}

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

    r8510 r8512  
    4040         * @param isValid true if the conditions required to close this panel are met
    4141         */
    42         public void contentChanged(boolean isValid);
     42        void contentChanged(boolean isValid);
    4343    }
    4444
    … …  
    103103    }
    104104
    105     private final void notifyListeners() {
     105    private void notifyListeners() {
    106106        for (ContentValidationListener l : listeners) {
    107107            l.contentChanged(isImageryValid());

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

    r8510 r8512  
    5858        }
    5959
    60         private final void build(String initialText, final ActionListener listener) {
     60        private void build(String initialText, final ActionListener listener) {
    6161            input = new JosmTextField(30);
    6262            cbInput = new HistoryComboBox();

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

    r7937 r8512  
    1111     * Method called when proxy settings are updated.
    1212     */
    13     public void proxyPreferenceChanged();
     13    void proxyPreferenceChanged();
    1414}

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

    r8510 r8512  
    8787     * @since 6523
    8888     */
    89     public final void addApiUrlChangeListener(PropertyChangeListener listener) {
     89    public void addApiUrlChangeListener(PropertyChangeListener listener) {
    9090        pnlApiUrlPreferences.addPropertyChangeListener(listener);
    9191    }

  • trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java

    r8470 r8512  
    3737
    3838    /** Ticks count used, when no other value is supplied */
    39     public final int DEFAULT_TICKS = 10000;
     39    int DEFAULT_TICKS = 10000;
    4040
    4141    /**
    … …  
    4343     * express that the task should use all remaining ticks
    4444     */
    45     public final int ALL_TICKS = -1;
     45    int ALL_TICKS = -1;
    4646
    4747    /**

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

    r7937 r8512  
    1111     * Called after list of tagging presets has been modified.
    1212     */
    13     public void taggingPresetsModified();
     13    void taggingPresetsModified();
    1414}

  • trunk/src/org/openstreetmap/josm/gui/util/KeyPressReleaseListener.java

    r7937 r8512  
    1212     * (no fake events while holding key)
    1313     */
    14     public void doKeyPressed(KeyEvent e);
     14    void doKeyPressed(KeyEvent e);
     15
    1516    /**
    1617     * This is called when key press event is actually released
    1718     * (no fake events while holding key)
    1819     */
    19     public void doKeyReleased(KeyEvent e);
     20    void doKeyReleased(KeyEvent e);
    2021}

  • trunk/src/org/openstreetmap/josm/gui/util/ModifierListener.java

    r7937 r8512  
    77 */
    88public interface ModifierListener {
    9     public void modifiersChanged(int modifiers);
     9    void modifiersChanged(int modifiers);
    1010}

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

    r8345 r8512  
    158158    }
    159159
    160     private final FileChooserManager doCreateFileChooser(boolean multiple, String title, Collection<? extends FileFilter> filters,
     160    private FileChooserManager doCreateFileChooser(boolean multiple, String title, Collection<? extends FileFilter> filters,
    161161            FileFilter defaultFilter, String extension, int selectionMode, boolean allTypes) {
    162162        File file = new File(curDir);

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

    r6380 r8512  
    55
    66public interface HistoryChangedListener {
    7     public void historyChanged(List<String> history);
     7    void historyChanged(List<String> history);
    88}

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

    r8510 r8512  
    151151         * @param divider the Divider to paint
    152152         */
    153         public abstract void paint(Graphics g, Divider divider);
     153        void paint(Graphics g, Divider divider);
    154154    }
    155155

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

    r7937 r8512  
    77
    88public interface OsmPrimitivesTableModel extends TableModel {
    9    
    10     public abstract OsmPrimitive getReferredPrimitive(int idx);
     9
     10    OsmPrimitive getReferredPrimitive(int idx);
    1111}

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

    r7937 r8512  
    77public interface OsmServerReadPostprocessor {
    88
    9     public void postprocessDataSet(DataSet ds, ProgressMonitor progress);
    10 
     9    void postprocessDataSet(DataSet ds, ProgressMonitor progress);
    1110}

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

    r7937 r8512  
    99public interface OsmServerWritePostprocessor {
    1010
    11     public void postprocessUploadedPrimitives(Collection<OsmPrimitive> p, ProgressMonitor progress);
    12 
     11    void postprocessUploadedPrimitives(Collection<OsmPrimitive> p, ProgressMonitor progress);
    1312}

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

    r8510 r8512  
    198198    }
    199199
    200     private final void scanManifest(Manifest manifest, boolean oldcheck) {
     200    private void scanManifest(Manifest manifest, boolean oldcheck) {
    201201        String lang = LanguageInfo.getLanguageCodeManifest();
    202202        Attributes attr = manifest.getMainAttributes();

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

    r8510 r8512  
    8787    }
    8888
    89     public final Color getColor(double value) {
     89    public Color getColor(double value) {
    9090        if (value < min) return belowMinColor;
    9191        if (value > max) return aboveMaxColor;
    … …  
    100100    }
    101101
    102     public final Color getColor(Number value) {
     102    public Color getColor(Number value) {
    103103        return (value == null) ? noDataColor : getColor(value.doubleValue());
    104104    }

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

    r6380 r8512  
    1414     * Called when the object has been destroyed.
    1515     */
    16     public void destroy();
     16    void destroy();
    1717}

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

    r8510 r8512  
    395395            @return a linked list of changes - or null
    396396         */
    397         public Change build_script(
     397        Change build_script(
    398398                boolean[] changed0, int len0,
    399399                boolean[] changed1, int len1

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

    r8510 r8512  
    3535    }
    3636
    37     public Shortcut getMultikeyShortcut();
     37    Shortcut getMultikeyShortcut();
    3838
    3939    void executeMultikeyAction(int index, boolean repeatLastAction);

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

    r8015 r8512  
    2323      * that we want to be integrated with the OS before we setup our GUI.
    2424      */
    25     public void preStartupHook();
    26    
     25    void preStartupHook();
     26
    2727    /**
    2828      * The afterPrefStartupHook will be called early, but after
    2929      * the preferences have been loaded and basic processing of
    30       * command line arguments is finished. 
     30      * command line arguments is finished.
    3131      * It is guaranteed to be called before the GUI setup has started.
    3232      */
    33     public void afterPrefStartupHook();
     33    void afterPrefStartupHook();
    3434
    3535    /**
    … …  
    4040      * OS, so we'll receive events from the system menu.
    4141      */
    42     public void startupHook();
     42    void startupHook();
    4343
    4444    /**
    … …  
    4848     * @throws IOException if any I/O error occurs
    4949      */
    50     public void openUrl(String url) throws IOException;
     50    void openUrl(String url) throws IOException;
    5151
    5252    /**
    … …  
    7070      * user to change them.
    7171      */
    72     public void initSystemShortcuts();
     72    void initSystemShortcuts();
    7373
    7474    /**
    … …  
    8686     * @return Full tooltip text (name + accelerator)
    8787      */
    88     public String makeTooltip(String name, Shortcut sc);
     88    String makeTooltip(String name, Shortcut sc);
    8989
    9090    /**
    … …  
    9292     * @return The default native LAF for this platform
    9393     */
    94     public String getDefaultStyle();
     94    String getDefaultStyle();
    9595
    9696    /**
    … …  
    9898     * @return {@code true} if full screen is allowed, {@code false} otherwise
    9999     */
    100     public boolean canFullscreen();
     100    boolean canFullscreen();
    101101
    102102    /**
    … …  
    106106     * @return {@code true} if the file has been renamed, {@code false} otherwise
    107107     */
    108     public boolean rename(File from, File to);
     108    boolean rename(File from, File to);
    109109
    110110    /**
    … …  
    113113     * @since 5850
    114114     */
    115     public String getOSDescription();
     115    String getOSDescription();
    116116
    117117    /**
    … …  
    126126     * @since 7343
    127127     */
    128     public boolean setupHttpsCertificate(String entryAlias, KeyStore.TrustedCertificateEntry trustedCert)
     128    boolean setupHttpsCertificate(String entryAlias, KeyStore.TrustedCertificateEntry trustedCert)
    129129            throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException;
    130130
    … …  
    134134     * @since 7829
    135135     */
    136     public File getDefaultCacheDirectory();
     136    File getDefaultCacheDirectory();
    137137
    138138    /**
    … …  
    141141     * @since 7831
    142142     */
    143     public File getDefaultPrefDirectory();
     143    File getDefaultPrefDirectory();
    144144
    145145    /**
    … …  
    148148     * @since 7834
    149149     */
    150     public File getDefaultUserDataDirectory();
     150    File getDefaultUserDataDirectory();
    151151}

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

    r7509 r8512  
    1515     * @return {@code true} if the object passes the test, {@code false} otherwise
    1616     */
    17     public boolean evaluate(T object);
     17    boolean evaluate(T object);
    1818}

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

    r7509 r8512  
    1414     * @return the value of the property for the object obj
    1515     */
    16     public P get(O obj);
     16    P get(O obj);
    1717
    1818    /**
    … …  
    2121     * @param value the value the property is set to
    2222     */
    23     public void set(O obj, P value);
     23    void set(O obj, P value);
    2424}

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

    r8510 r8512  
    648648     * @param <B> class of transformed objects
    649649     */
    650     public static interface Function<A, B> {
     650    public interface Function<A, B> {
    651651
    652652        /**

  • trunk/tools/checkstyle/josm_checks.xml

    r8511 r8512  
    7474    </module>
    7575    <module name="ModifierOrder"/>
     76    <module name="RedundantModifier"/>
    7677  </module>
    7778  <module name="Header">
Note: See TracChangeset for help on using the changeset viewer.