Changeset 8512 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2015-06-21T01:13:09+02:00 (9 years ago)

Author:

Don-vip

Message:

checkstyle: redundant modifiers

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• Changeset.java (modified) (4 diffs)
• ChangesetDataSet.java (modified) (1 diff)
• DataSet.java (modified) (2 diffs)
• DataSetMerger.java (modified) (1 diff)
• Hash.java (modified) (2 diffs)
• Node.java (modified) (3 diffs)
• Way.java (modified) (1 diff)
• history/History.java (modified) (1 diff)
• visitor/paint/WireframeMapRenderer.java (modified) (1 diff)
• visitor/paint/relations/Multipolygon.java (modified) (2 diffs)
• visitor/paint/relations/MultipolygonCache.java (modified) (9 diffs)

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

@@ -172 +172 @@
      * @since 7700
      */
-    public final int getCommentsCount() {
+    public int getCommentsCount() {
         return commentsCount;
     }
@@ -181 +181 @@
      * @since 7700
      */
-    public final void setCommentsCount(int commentsCount) {
+    public void setCommentsCount(int commentsCount) {
         this.commentsCount = commentsCount;
     }
@@ -349 +349 @@
      * @since 7704
      */
-    public final synchronized List<ChangesetDiscussionComment> getDiscussion() {
+    public synchronized List<ChangesetDiscussionComment> getDiscussion() {
         if (discussion == null) {
             return Collections.emptyList();
@@ -361 +361 @@
      * @since 7704
      */
-    public final synchronized void addDiscussionComment(ChangesetDiscussionComment comment) {
+    public synchronized void addDiscussionComment(ChangesetDiscussionComment comment) {
         if (comment == null) {
             return;

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

@@ -23 +23 @@
     }
 
-    public static interface ChangesetDataSetEntry {
-        public ChangesetModificationType getModificationType();
+    public interface ChangesetDataSetEntry {
+        ChangesetModificationType getModificationType();
 
-        public HistoryOsmPrimitive getPrimitive();
+        HistoryOsmPrimitive getPrimitive();
     }
 

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

@@ -220 +220 @@
      * @see #setUploadDiscouraged
      */
-    public final boolean isUploadDiscouraged() {
+    public boolean isUploadDiscouraged() {
         return uploadDiscouraged;
     }
@@ -229 +229 @@
      * @see #isUploadDiscouraged
      */
-    public final void setUploadDiscouraged(boolean uploadDiscouraged) {
+    public void setUploadDiscouraged(boolean uploadDiscouraged) {
         this.uploadDiscouraged = uploadDiscouraged;
     }

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

@@ -217 +217 @@
     }
 
-    private final void resetPrimitive(OsmPrimitive osm) {
+    private void resetPrimitive(OsmPrimitive osm) {
         if (osm instanceof Way) {
             ((Way) osm).setNodes(null);

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

@@ -21 +21 @@
      * @return computed hashcode
      */
-    public int getHashCode(K k);
+    int getHashCode(K k);
 
     /**
@@ -32 +32 @@
      * uniquely identifies t in given class.
      */
-    public boolean equals(K k, T t);
+    boolean equals(K k, T t);
 }

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

@@ -40 +40 @@
      * @since 7828
      */
-    public final boolean isLatLonKnown() {
+    public boolean isLatLonKnown() {
         return !Double.isNaN(lat) && !Double.isNaN(lon);
     }
 
     @Override
-    public final void setCoor(LatLon coor) {
+    public void setCoor(LatLon coor) {
         updateCoor(coor, null);
     }
 
     @Override
-    public final void setEastNorth(EastNorth eastNorth) {
+    public void setEastNorth(EastNorth eastNorth) {
         updateCoor(null, eastNorth);
     }
@@ -68 +68 @@
 
     @Override
-    public final LatLon getCoor() {
+    public LatLon getCoor() {
         if (!isLatLonKnown()) return null;
         return new LatLon(lat, lon);
@@ -89 +89 @@
      */
     @Override
-    public final EastNorth getEastNorth() {
+    public EastNorth getEastNorth() {
         if (!isLatLonKnown()) return null;
 

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

@@ -774 +774 @@
     }
 
-    public final void clearCachedNodeStyles() {
+    public void clearCachedNodeStyles() {
         for (final Node n : nodes) {
             n.clearCachedStyle();

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

@@ -21 +21 @@
 public class History {
 
-    private static interface FilterPredicate {
+    private interface FilterPredicate {
         boolean matches(HistoryOsmPrimitive primitive);
     }

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

@@ -224 +224 @@
      * @param d Fourth value
      */
-    private static final int max(int a, int b, int c, int d) {
+    private static int max(int a, int b, int c, int d) {
         return Math.max(Math.max(a, b), Math.max(c, d));
     }

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

@@ -370 +370 @@
     }
 
-    private final void load(Relation r) {
+    private void load(Relation r) {
         MultipolygonRoleMatcher matcher = getMultipolygonRoleMatcher();
 
@@ -556 +556 @@
     }
 
-    private final void addInnerToOuters(List<PolyData> innerPolygons, List<PolyData> outerPolygons)  {
+    private void addInnerToOuters(List<PolyData> innerPolygons, List<PolyData> outerPolygons)  {
 
         if (innerPolygons.isEmpty()) {

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

@@ -68 +68 @@
      * @return A multipolygon object for the given relation, or {@code null}
      */
-    public final Multipolygon get(NavigatableComponent nc, Relation r) {
+    public Multipolygon get(NavigatableComponent nc, Relation r) {
         return get(nc, r, false);
     }
@@ -79 +79 @@
      * @return A multipolygon object for the given relation, or {@code null}
      */
-    public final Multipolygon get(NavigatableComponent nc, Relation r, boolean forceRefresh) {
+    public Multipolygon get(NavigatableComponent nc, Relation r, boolean forceRefresh) {
         Multipolygon multipolygon = null;
         if (nc != null && r != null) {
@@ -107 +107 @@
      * @param nc the navigatable component
      */
-    public final void clear(NavigatableComponent nc) {
+    public void clear(NavigatableComponent nc) {
         Map<DataSet, Map<Relation, Multipolygon>> map = cache.remove(nc);
         if (map != null) {
@@ -119 +119 @@
      * @param ds the data set
      */
-    public final void clear(DataSet ds) {
+    public void clear(DataSet ds) {
         for (Map<DataSet, Map<Relation, Multipolygon>> map1 : cache.values()) {
             Map<Relation, Multipolygon> map2 = map1.remove(ds);
@@ -132 +132 @@
      * Clears the whole cache.
      */
-    public final void clear() {
+    public void clear() {
         cache.clear();
     }
 
-    private final Collection<Map<Relation, Multipolygon>> getMapsFor(DataSet ds) {
+    private Collection<Map<Relation, Multipolygon>> getMapsFor(DataSet ds) {
         List<Map<Relation, Multipolygon>> result = new ArrayList<>();
         for (Map<DataSet, Map<Relation, Multipolygon>> map : cache.values()) {
@@ -151 +151 @@
     }
 
-    private final void updateMultipolygonsReferringTo(AbstractDatasetChangedEvent event) {
+    private void updateMultipolygonsReferringTo(AbstractDatasetChangedEvent event) {
         updateMultipolygonsReferringTo(event, event.getPrimitives(), event.getDataset());
     }
 
-    private final void updateMultipolygonsReferringTo(
+    private void updateMultipolygonsReferringTo(
             final AbstractDatasetChangedEvent event, Collection<? extends OsmPrimitive> primitives, DataSet ds) {
         updateMultipolygonsReferringTo(event, primitives, ds, null);
     }
 
-    private final Collection<Map<Relation, Multipolygon>> updateMultipolygonsReferringTo(
+    private Collection<Map<Relation, Multipolygon>> updateMultipolygonsReferringTo(
             AbstractDatasetChangedEvent event, Collection<? extends OsmPrimitive> primitives,
             DataSet ds, Collection<Map<Relation, Multipolygon>> initialMaps) {
@@ -189 +189 @@
     }
 
-    private final void processEvent(AbstractDatasetChangedEvent event, Relation r, Collection<Map<Relation, Multipolygon>> maps) {
+    private void processEvent(AbstractDatasetChangedEvent event, Relation r, Collection<Map<Relation, Multipolygon>> maps) {
         if (event instanceof NodeMovedEvent || event instanceof WayNodesChangedEvent) {
             dispatchEvent(event, r, maps);
@@ -202 +202 @@
     }
 
-    private final void dispatchEvent(AbstractDatasetChangedEvent event, Relation r, Collection<Map<Relation, Multipolygon>> maps) {
+    private void dispatchEvent(AbstractDatasetChangedEvent event, Relation r, Collection<Map<Relation, Multipolygon>> maps) {
         for (Map<Relation, Multipolygon> map : maps) {
             Multipolygon m = map.get(r);
@@ -217 +217 @@
     }
 
-    private final void removeMultipolygonFrom(Relation r, Collection<Map<Relation, Multipolygon>> maps) {
+    private void removeMultipolygonFrom(Relation r, Collection<Map<Relation, Multipolygon>> maps) {
         for (Map<Relation, Multipolygon> map : maps) {
             map.remove(r);