FS: re-order fields and use all uppercase for true constants

Change-Id: I49fb77d6a12ae9083b5bf5779dc74a3dc49d7594
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
index 91734a0c2bdb93e2dfb62a02ec76bb258b422087..415631805d4f237b978ba426b5e516ada1c0d59d 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
@@ -204,20 +204,7 @@ public abstract class FS {
                public static final FileStoreAttributes FALLBACK_FILESTORE_ATTRIBUTES = new FileStoreAttributes(
                                FALLBACK_TIMESTAMP_RESOLUTION);
 
-               private static final Map<FileStore, FileStoreAttributes> attributeCache = new ConcurrentHashMap<>();
-
-               private static final SimpleLruCache<Path, FileStoreAttributes> attrCacheByPath = new SimpleLruCache<>(
-                               100, 0.2f);
-
-               private static AtomicBoolean background = new AtomicBoolean();
-
-               private static Map<FileStore, Lock> locks = new ConcurrentHashMap<>();
-
-               private static void setBackground(boolean async) {
-                       background.set(async);
-               }
-
-               private static final String javaVersionPrefix = SystemReader
+               private static final String JAVA_VERSION_PREFIX = SystemReader
                                .getInstance().getHostname() + '|'
                                + System.getProperty("java.vendor") + '|' //$NON-NLS-1$
                                + System.getProperty("java.version") + '|'; //$NON-NLS-1$
@@ -225,6 +212,15 @@ public abstract class FS {
                private static final Duration FALLBACK_MIN_RACY_INTERVAL = Duration
                                .ofMillis(10);
 
+               private static final Map<FileStore, FileStoreAttributes> attributeCache = new ConcurrentHashMap<>();
+
+               private static final SimpleLruCache<Path, FileStoreAttributes> attrCacheByPath = new SimpleLruCache<>(
+                               100, 0.2f);
+
+               private static final AtomicBoolean background = new AtomicBoolean();
+
+               private static final Map<FileStore, Lock> locks = new ConcurrentHashMap<>();
+
                private static final AtomicInteger threadNumber = new AtomicInteger(1);
 
                /**
@@ -250,6 +246,10 @@ public abstract class FS {
                                        return t;
                                });
 
+               private static void setBackground(boolean async) {
+                       background.set(async);
+               }
+
                /**
                 * Configures size and purge factor of the path-based cache for file
                 * system attributes. Caching of file system attributes avoids recurring
@@ -628,7 +628,7 @@ public abstract class FS {
                        } else {
                                storeKey = s.name();
                        }
-                       return javaVersionPrefix + storeKey;
+                       return JAVA_VERSION_PREFIX + storeKey;
                }
 
                private static TimeUnit getUnit(long nanos) {