Changeset 10378 in josm for trunk/src/org/openstreetmap/josm/data/cache

Timestamp:

2016-06-15T10:30:37+02:00 (8 years ago)

Author:

Don-vip

Message:

Checkstyle 6.19: enable SingleSpaceSeparator and fix violations

Location:

trunk/src/org/openstreetmap/josm/data/cache

Files:

• CacheEntryAttributes.java (modified) (1 diff)
• HostLimitQueue.java (modified) (1 diff)
• JCSCacheManager.java (modified) (4 diffs)
• JCSCachedTileLoaderJob.java (modified) (2 diffs)

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

@@ -92 +92 @@
         String val = attrs.get(key);
         if (val == null) {
-            attrs.put(key,  "0");
+            attrs.put(key, "0");
             return 0;
         }

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

@@ -100 +100 @@
     }
 
-    private  Semaphore getSemaphore(JCSCachedTileLoaderJob<?, ?> job) {
+    private Semaphore getSemaphore(JCSCachedTileLoaderJob<?, ?> job) {
         String host;
         try {

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

@@ -42 +42 @@
 
     private static volatile CompositeCacheManager cacheManager;
-    private static long maxObjectTTL        = -1;
+    private static long maxObjectTTL = -1;
     private static final String PREFERENCE_PREFIX = "jcs.cache";
     private static BooleanProperty USE_BLOCK_CACHE = new BooleanProperty(PREFERENCE_PREFIX + ".use_block_cache", true);
@@ -53 +53 @@
      * default objects to be held in memory by JCS caches (per region)
      */
-    public static final IntegerProperty DEFAULT_MAX_OBJECTS_IN_MEMORY  = new IntegerProperty(PREFERENCE_PREFIX + ".max_objects_in_memory", 1000);
+    public static final IntegerProperty DEFAULT_MAX_OBJECTS_IN_MEMORY = new IntegerProperty(PREFERENCE_PREFIX + ".max_objects_in_memory", 1000);
 
     private JCSCacheManager() {
@@ -114 +114 @@
         // these are default common to all cache regions
         // use of auxiliary cache and sizing of the caches is done with giving proper geCache(...) params
+        // CHECKSTYLE.OFF: SingleSpaceSeparator
         props.setProperty("jcs.default.cacheattributes",                      CompositeCacheAttributes.class.getCanonicalName());
         props.setProperty("jcs.default.cacheattributes.MaxObjects",           DEFAULT_MAX_OBJECTS_IN_MEMORY.get().toString());
@@ -123 +124 @@
         props.setProperty("jcs.default.elementattributes.IdleTime",           Long.toString(maxObjectTTL));
         props.setProperty("jcs.default.elementattributes.IsSpool",            "true");
+        // CHECKSTYLE.ON: SingleSpaceSeparator
         CompositeCacheManager cm = CompositeCacheManager.getUnconfiguredInstance();
         cm.configure(props);

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

@@ -313 +313 @@
             final HttpClient request = getRequest("GET", true);
 
-            if (isObjectLoadable()  &&
+            if (isObjectLoadable() &&
                     (now - attributes.getLastModification()) <= ABSOLUTE_EXPIRE_TIME_LIMIT) {
                 request.setIfModifiedSince(attributes.getLastModification());
@@ -397 +397 @@
         } catch (InterruptedException e) {
             attributes.setErrorMessage(e.toString());
-            log.log(Level.WARNING, "JCS - Exception during download {0}",  getUrlNoException());
+            log.log(Level.WARNING, "JCS - Exception during download {0}", getUrlNoException());
             Main.warn(e);
         }