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

Timestamp:

2017-07-30T17:07:42+02:00 (7 years ago)

Author:

Don-vip

Message:

partial revert of r12537

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• SystemOfMeasurement.java (modified) (3 diffs)
• cache/JCSCachedTileLoaderJob.java (modified) (5 diffs)
• imagery/TMSCachedTileLoaderJob.java (modified) (3 diffs)
• osm/AbstractPrimitive.java (modified) (4 diffs)
• osm/DataSet.java (modified) (4 diffs)
• validation/OsmValidator.java (modified) (9 diffs)

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

@@ -80 +80 @@
     }
 
-    private static final CopyOnWriteArrayList<SoMChangeListener> SOM_CHANGE_LISTENERS = new CopyOnWriteArrayList<>();
+    private static final CopyOnWriteArrayList<SoMChangeListener> somChangeListeners = new CopyOnWriteArrayList<>();
 
     /**
@@ -89 +89 @@
      */
     public static void removeSoMChangeListener(SoMChangeListener listener) {
-        SOM_CHANGE_LISTENERS.remove(listener);
+        somChangeListeners.remove(listener);
     }
 
@@ -100 +100 @@
     public static void addSoMChangeListener(SoMChangeListener listener) {
         if (listener != null) {
-            SOM_CHANGE_LISTENERS.addIfAbsent(listener);
+            somChangeListeners.addIfAbsent(listener);
         }
     }
 
     protected static void fireSoMChanged(String oldSoM, String newSoM) {
-        for (SoMChangeListener l : SOM_CHANGE_LISTENERS) {
+        for (SoMChangeListener l : somChangeListeners) {
             l.systemOfMeasurementChanged(oldSoM, newSoM);
         }

trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java

@@ -81 +81 @@
 
 
-    private static final ConcurrentMap<String, Set<ICachedLoaderListener>> IN_PROGRESS = new ConcurrentHashMap<>();
-    private static final ConcurrentMap<String, Boolean> USE_HEAD = new ConcurrentHashMap<>();
+    private static final ConcurrentMap<String, Set<ICachedLoaderListener>> inProgress = new ConcurrentHashMap<>();
+    private static final ConcurrentMap<String, Boolean> useHead = new ConcurrentHashMap<>();
 
     protected final long now; // when the job started
@@ -162 +162 @@
             throw new IllegalArgumentException("No url returned");
         }
-        synchronized (IN_PROGRESS) {
-            Set<ICachedLoaderListener> newListeners = IN_PROGRESS.get(deduplicationKey);
+        synchronized (inProgress) {
+            Set<ICachedLoaderListener> newListeners = inProgress.get(deduplicationKey);
             if (newListeners == null) {
                 newListeners = new HashSet<>();
-                IN_PROGRESS.put(deduplicationKey, newListeners);
+                inProgress.put(deduplicationKey, newListeners);
                 first = true;
             }
@@ -259 +259 @@
     private void finishLoading(LoadResult result) {
         Set<ICachedLoaderListener> listeners;
-        synchronized (IN_PROGRESS) {
+        synchronized (inProgress) {
             try {
-                listeners = IN_PROGRESS.remove(getUrl().toString());
+                listeners = inProgress.remove(getUrl().toString());
             } catch (IOException e) {
                 listeners = null;
@@ -312 +312 @@
             // then just use HEAD request and check returned values
             if (isObjectLoadable() &&
-                    Boolean.TRUE.equals(USE_HEAD.get(getServerKey())) &&
+                    Boolean.TRUE.equals(useHead.get(getServerKey())) &&
                     isCacheValidUsingHead()) {
                 LOG.log(Level.FINE, "JCS - cache entry verified using HEAD request: {0}", getUrl());
@@ -346 +346 @@
                 LOG.log(Level.INFO, "JCS - Host: {0} found not to return 304 codes for If-Modified-Since or If-None-Match headers",
                         serverKey);
-                USE_HEAD.put(serverKey, Boolean.TRUE);
+                useHead.put(serverKey, Boolean.TRUE);
             }
 

trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java

@@ -51 +51 @@
     // we need another deduplication of Tile Loader listeners, as for each submit, new TMSCachedTileLoaderJob was created
     // that way, we reduce calls to tileLoadingFinished, and general CPU load due to surplus Map repaints
-    private static final ConcurrentMap<String, Set<TileLoaderListener>> IN_PROGRESS = new ConcurrentHashMap<>();
+    private static final ConcurrentMap<String, Set<TileLoaderListener>> inProgress = new ConcurrentHashMap<>();
 
     /**
@@ -71 +71 @@
         if (listener != null) {
             String deduplicationKey = getCacheKey();
-            synchronized (IN_PROGRESS) {
-                Set<TileLoaderListener> newListeners = IN_PROGRESS.get(deduplicationKey);
+            synchronized (inProgress) {
+                Set<TileLoaderListener> newListeners = inProgress.get(deduplicationKey);
                 if (newListeners == null) {
                     newListeners = new HashSet<>();
-                    IN_PROGRESS.put(deduplicationKey, newListeners);
+                    inProgress.put(deduplicationKey, newListeners);
                 }
                 newListeners.add(listener);
@@ -162 +162 @@
         this.attributes = attributes; // as we might get notification from other object than our selfs, pass attributes along
         Set<TileLoaderListener> listeners;
-        synchronized (IN_PROGRESS) {
-            listeners = IN_PROGRESS.remove(getCacheKey());
+        synchronized (inProgress) {
+            listeners = inProgress.remove(getCacheKey());
         }
         boolean status = result.equals(LoadResult.SUCCESS);

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

@@ -47 +47 @@
     }
 
-    private static final AtomicLong ID_COUNTER = new AtomicLong(0);
+    private static final AtomicLong idCounter = new AtomicLong(0);
 
     /**
@@ -54 +54 @@
      */
     static long generateUniqueId() {
-        return ID_COUNTER.decrementAndGet();
+        return idCounter.decrementAndGet();
     }
 
@@ -63 +63 @@
      */
     public static long currentUniqueId() {
-        return ID_COUNTER.get();
+        return idCounter.get();
     }
 
@@ -76 +76 @@
             throw new IllegalArgumentException("Cannot modify the id counter backwards");
         }
-        ID_COUNTER.set(newId);
+        idCounter.set(newId);
     }
 

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

@@ -638 +638 @@
      * dataset. (However, the selection does only change in the active layer)
      */
-    private static final Collection<SelectionChangedListener> SEL_LISTENERS = new CopyOnWriteArrayList<>();
+    private static final Collection<SelectionChangedListener> selListeners = new CopyOnWriteArrayList<>();
 
     /**
@@ -647 +647 @@
      */
     public static void addSelectionListener(SelectionChangedListener listener) {
-        ((CopyOnWriteArrayList<SelectionChangedListener>) SEL_LISTENERS).addIfAbsent(listener);
+        ((CopyOnWriteArrayList<SelectionChangedListener>) selListeners).addIfAbsent(listener);
     }
 
@@ -657 +657 @@
      */
     public static void removeSelectionListener(SelectionChangedListener listener) {
-        SEL_LISTENERS.remove(listener);
+        selListeners.remove(listener);
     }
 
@@ -671 +671 @@
 
     private static void fireDreprecatedSelectionChange(Collection<? extends OsmPrimitive> currentSelection) {
-        for (SelectionChangedListener l : SEL_LISTENERS) {
+        for (SelectionChangedListener l : selListeners) {
             l.selectionChanged(currentSelection);
         }

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -79 +79 @@
     private static double griddetail;
 
-    private static final Collection<String> IGNORED_ERRORS = new TreeSet<>();
+    private static final Collection<String> ignoredErrors = new TreeSet<>();
 
     /**
      * All registered tests
      */
-    private static final Collection<Class<? extends Test>> ALL_TESTS = new ArrayList<>();
-    private static final Map<String, Test> ALL_TESTS_MAP = new HashMap<>();
+    private static final Collection<Class<? extends Test>> allTests = new ArrayList<>();
+    private static final Map<String, Test> allTestsMap = new HashMap<>();
 
     /**
@@ -139 +139 @@
      */
     public static void addTest(Class<? extends Test> testClass) {
-        ALL_TESTS.add(testClass);
+        allTests.add(testClass);
         try {
-            ALL_TESTS_MAP.put(testClass.getName(), testClass.getConstructor().newInstance());
+            allTestsMap.put(testClass.getName(), testClass.getConstructor().newInstance());
         } catch (ReflectiveOperationException e) {
             Main.error(e);
@@ -182 +182 @@
 
     private static void loadIgnoredErrors() {
-        IGNORED_ERRORS.clear();
+        ignoredErrors.clear();
         if (ValidatorPreference.PREF_USE_IGNORE.get()) {
             Path path = Paths.get(getValidatorDir()).resolve("ignorederrors");
             if (path.toFile().exists()) {
                 try {
-                    IGNORED_ERRORS.addAll(Files.readAllLines(path, StandardCharsets.UTF_8));
+                    ignoredErrors.addAll(Files.readAllLines(path, StandardCharsets.UTF_8));
                 } catch (final FileNotFoundException e) {
                     Main.debug(Main.getErrorMessage(e));
@@ -204 +204 @@
      */
     public static void addIgnoredError(String s) {
-        IGNORED_ERRORS.add(s);
+        ignoredErrors.add(s);
     }
 
@@ -213 +213 @@
      */
     public static boolean hasIgnoredError(String s) {
-        return IGNORED_ERRORS.contains(s);
+        return ignoredErrors.contains(s);
     }
 
@@ -221 +221 @@
     public static void saveIgnoredErrors() {
         try (PrintWriter out = new PrintWriter(new File(getValidatorDir(), "ignorederrors"), StandardCharsets.UTF_8.name())) {
-            for (String e : IGNORED_ERRORS) {
+            for (String e : ignoredErrors) {
                 out.println(e);
             }
@@ -254 +254 @@
      */
     public static SortedMap<String, Test> getAllTestsMap() {
-        applyPrefs(ALL_TESTS_MAP, false);
-        applyPrefs(ALL_TESTS_MAP, true);
-        return new TreeMap<>(ALL_TESTS_MAP);
+        applyPrefs(allTestsMap, false);
+        applyPrefs(allTestsMap, true);
+        return new TreeMap<>(allTestsMap);
     }
 
@@ -271 +271 @@
             return null;
         }
-        return (T) ALL_TESTS_MAP.get(testClass.getName());
+        return (T) allTestsMap.get(testClass.getName());
     }
 
@@ -318 +318 @@
      */
     public static Collection<Class<? extends Test>> getAllAvailableTestClasses() {
-        return Collections.unmodifiableCollection(ALL_TESTS);
+        return Collections.unmodifiableCollection(allTests);
     }