Changeset 6889 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2014-02-27T01:41:49+01:00 (11 years ago)

Author:

Don-vip

Message:

fix some Sonar issues (JLS order)

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• Preferences.java (modified) (2 diffs)
• Version.java (modified) (3 diffs)
• osm/AbstractPrimitive.java (modified) (1 diff)
• osm/ChangesetCache.java (modified) (1 diff)
• osm/ChangesetDataSet.java (modified) (1 diff)
• osm/OsmPrimitive.java (modified) (5 diffs)
• osm/OsmPrimitiveComparator.java (modified) (2 diffs)
• osm/OsmPrimitiveType.java (modified) (1 diff)
• osm/PrimitiveData.java (modified) (2 diffs)
• osm/RelationToChildReference.java (modified) (2 diffs)
• osm/User.java (modified) (2 diffs)

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

@@ -154 +154 @@
      * @param <T> The setting type
      */
-    abstract public static class AbstractSetting<T> implements Setting<T> {
+    public abstract static class AbstractSetting<T> implements Setting<T> {
         protected final T value;
         /**
@@ -1307 +1307 @@
      * The default plugin site
      */
-    private final static String[] DEFAULT_PLUGIN_SITE = {Main.JOSM_WEBSITE+"/plugin%<?plugins=>"};
+    private static final String[] DEFAULT_PLUGIN_SITE = {Main.JOSM_WEBSITE+"/plugin%<?plugins=>"};
 
     /**

trunk/src/org/openstreetmap/josm/data/Version.java

@@ -23 +23 @@
 public class Version {
     /** constant to indicate that the current build isn't assigned a JOSM version number */
-    static public final int JOSM_UNKNOWN_VERSION = 0;
+    public static final int JOSM_UNKNOWN_VERSION = 0;
 
     /** the unique instance */
@@ -34 +34 @@
      * @return  the content of the resource file; null, if an error occurred
      */
-    static public String loadResourceFile(URL resource) {
+    public static String loadResourceFile(URL resource) {
         if (resource == null) return null;
         String s = null;
@@ -60 +60 @@
      * @return the unique instance of the version information
      */
-
-    static public Version getInstance() {
+    public static Version getInstance() {
         if (instance == null) {
             instance = new Version();

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

@@ -675 +675 @@
      * What to do, when the tags have changed by one of the tag-changing methods.
      */
-    abstract protected void keysChangedImpl(Map<String, String> originalKeys);
+    protected abstract void keysChangedImpl(Map<String, String> originalKeys);
 
     /**

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

@@ -34 +34 @@
 public final class ChangesetCache implements PreferenceChangedListener{
     /** the unique instance */
-    static private final ChangesetCache instance = new ChangesetCache();
+    private static final ChangesetCache instance = new ChangesetCache();
 
     /**

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

@@ -28 +28 @@
     }
 
-    final private Map<PrimitiveId, HistoryOsmPrimitive> primitives = new HashMap<PrimitiveId, HistoryOsmPrimitive>();
-    final private Map<PrimitiveId, ChangesetModificationType> modificationTypes = new HashMap<PrimitiveId, ChangesetModificationType>();
+    private final Map<PrimitiveId, HistoryOsmPrimitive> primitives = new HashMap<PrimitiveId, HistoryOsmPrimitive>();
+    private final Map<PrimitiveId, ChangesetModificationType> modificationTypes = new HashMap<PrimitiveId, ChangesetModificationType>();
 
     /**

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

@@ -40 +40 @@
  * @author imi
  */
-abstract public class OsmPrimitive extends AbstractPrimitive implements Comparable<OsmPrimitive>, TemplateEngineDataProvider {
+public abstract class OsmPrimitive extends AbstractPrimitive implements Comparable<OsmPrimitive>, TemplateEngineDataProvider {
     private static final String SPECIAL_VALUE_ID = "id";
     private static final String SPECIAL_VALUE_LOCAL_NAME = "localname";
@@ -119 +119 @@
      * @return the sub-list of OSM primitives of type <code>type</code>
      */
-    static public <T extends OsmPrimitive>  List<T> getFilteredList(Collection<OsmPrimitive> list, Class<T> type) {
+    public static <T extends OsmPrimitive>  List<T> getFilteredList(Collection<OsmPrimitive> list, Class<T> type) {
         if (list == null) return Collections.emptyList();
         List<T> ret = new LinkedList<T>();
@@ -141 +141 @@
      * @return the sub-set of OSM primitives of type <code>type</code>
      */
-    static public <T extends OsmPrimitive> Set<T> getFilteredSet(Collection<OsmPrimitive> set, Class<T> type) {
+    public static <T extends OsmPrimitive> Set<T> getFilteredSet(Collection<OsmPrimitive> set, Class<T> type) {
         Set<T> ret = new LinkedHashSet<T>();
         if (set != null) {
@@ -160 +160 @@
      * empty set if primitives is null or if there are no referring primitives
      */
-    static public Set<OsmPrimitive> getReferrer(Collection<? extends OsmPrimitive> primitives) {
+    public static Set<OsmPrimitive> getReferrer(Collection<? extends OsmPrimitive> primitives) {
         HashSet<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
         if (primitives == null || primitives.isEmpty()) return ret;
@@ -1077 +1077 @@
      * @param visitor The visitor from which the visit() function must be called.
      */
-    abstract public void accept(Visitor visitor);
+    public abstract void accept(Visitor visitor);
 
     /**

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

@@ -10 +10 @@
 /** Comparator, comparing by type and objects display names */
 public class OsmPrimitiveComparator implements Comparator<OsmPrimitive> {
-    final private Map<OsmPrimitive, String> cache= new HashMap<OsmPrimitive, String>();
-    final private DefaultNameFormatter df = DefaultNameFormatter.getInstance();
+    private final Map<OsmPrimitive, String> cache= new HashMap<OsmPrimitive, String>();
+    private final DefaultNameFormatter df = DefaultNameFormatter.getInstance();
     public boolean relationsFirst = false;
 
@@ -26 +26 @@
         String an = cachedName(a);
         String bn = cachedName(b);
-        // make sure display names starting with digits are the end of the
-        // list
+        // make sure display names starting with digits are the end of the list
         if (Character.isDigit(an.charAt(0)) && Character.isDigit(bn.charAt(0)))
             return an.compareTo(bn);

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

@@ -19 +19 @@
     MULTIPOLYGON (marktr(/* ICON(data/) */"multipolygon"), null, RelationData.class);
 
-    private final static Collection<OsmPrimitiveType> DATA_VALUES = Arrays.asList(NODE, WAY, RELATION);
+    private static final Collection<OsmPrimitiveType> DATA_VALUES = Arrays.asList(NODE, WAY, RELATION);
 
     private final String apiTypeName;

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

@@ -17 +17 @@
 public abstract class PrimitiveData extends AbstractPrimitive {
 
+    /**
+     * Constructs a new {@code PrimitiveData}.
+     */
     public PrimitiveData() {
         id = OsmPrimitive.generateUniqueId();
@@ -51 +54 @@
 
     @SuppressWarnings("unchecked")
-    static public <T extends PrimitiveData> List<T> getFilteredList(Collection<T> list, OsmPrimitiveType type) {
+    public static <T extends PrimitiveData> List<T> getFilteredList(Collection<T> list, OsmPrimitiveType type) {
         List<T> ret = new ArrayList<T>();
         for(PrimitiveData p: list) {

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

@@ -14 +14 @@
      * @return  a set of all {@link RelationToChildReference}s for a given child primitive
      */
-    static public Set<RelationToChildReference> getRelationToChildReferences(OsmPrimitive child) {
+    public static Set<RelationToChildReference> getRelationToChildReferences(OsmPrimitive child) {
         Set<Relation> parents = OsmPrimitive.getFilteredSet(child.getReferrers(), Relation.class);
         Set<RelationToChildReference> references = new HashSet<RelationToChildReference>();
@@ -34 +34 @@
      * primitives
      */
-    static public Set<RelationToChildReference> getRelationToChildReferences(Collection<? extends OsmPrimitive> children) {
+    public static Set<RelationToChildReference> getRelationToChildReferences(Collection<? extends OsmPrimitive> children) {
         Set<RelationToChildReference> references = new HashSet<RelationToChildReference>();
         for (OsmPrimitive child: children) {

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

@@ -25 +25 @@
 public final class User {
 
-    static private AtomicLong uidCounter = new AtomicLong();
+    private static AtomicLong uidCounter = new AtomicLong();
 
     /**
@@ -31 +31 @@
      */
     private static Map<Long,User> userMap = new HashMap<Long,User>();
-    private final static User anonymous = createLocalUser(tr("<anonymous>"));
+    private static final User anonymous = createLocalUser(tr("<anonymous>"));
 
     private static long getNextLocalUid() {