Valhalla compatibility

Changes required for minimal value object compatibility. NB starts and
projects load.

Author: mbien

platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FileObjectFactory.java

@@ -56,10 +56,15 @@
  * @author Radek Matous
  */
 public final class FileObjectFactory {
-    public static final Map<File, FileObjectFactory> AllFactories = new HashMap<File, FileObjectFactory>();
+    public static final Map<File, FileObjectFactory> AllFactories = new HashMap<>();
     public static boolean WARNINGS = true;
+
+    /// identity object used as key in WeakHashMap
+    private record Key(int id) {}
+
     //@GuardedBy("allIBaseLock")
-    final Map<Integer, Object> allIBaseFileObjects = new WeakHashMap<Integer, Object>();
+    final Map<Key, Object> allIBaseFileObjects = new WeakHashMap<>();
+
     final ReadWriteLock allIBaseLock = new ReentrantReadWriteLock();
     private BaseFileObj root;
     private static final Logger LOG_REFRESH = Logger.getLogger("org.netbeans.modules.masterfs.REFRESH"); // NOI18N
@@ -604,14 +609,14 @@ public static boolean isParentOf(final File dir, final File file) {
     }
 
     public final void rename(Set<BaseFileObj> changeId) {
-        final Map<Integer, Object> toRename = new HashMap<Integer, Object>();
+        final Map<Key, Object> toRename = new HashMap<>();
         allIBaseLock.writeLock().lock();
         try {
-            final Iterator<Map.Entry<Integer, Object>> it = allIBaseFileObjects.entrySet().iterator();
+            final Iterator<Map.Entry<Key, Object>> it = allIBaseFileObjects.entrySet().iterator();
             while (it.hasNext()) {
-                Map.Entry<Integer, Object> entry = it.next();
+                Map.Entry<Key, Object> entry = it.next();
                 final Object obj = entry.getValue();
-                final Integer key = entry.getKey();
+                final Key key = entry.getKey();
                 if (!(obj instanceof List<?>)) {
                     @SuppressWarnings("unchecked")
                     final WeakReference<BaseFileObj> ref = (WeakReference<BaseFileObj>) obj;
@@ -633,8 +638,8 @@ public final void rename(Set<BaseFileObj> changeId) {
                 }
             }
 
-            for (Map.Entry<Integer, Object> entry : toRename.entrySet()) {
-                Integer key = entry.getKey();
+            for (Map.Entry<Key, Object> entry : toRename.entrySet()) {
+                Key key = entry.getKey();
                 Object previous = allIBaseFileObjects.remove(key);
                 if (previous instanceof List<?>) {
                     List<?> list = (List<?>) previous;
@@ -655,7 +660,7 @@ public final BaseFileObj getCachedOnly(final File file) {
     }
     public final BaseFileObj getCachedOnly(final File file, boolean checkExtension) {
         BaseFileObj retval;
-        final Integer id = NamingFactory.createID(file);
+        final Key id = new Key(NamingFactory.createID(file));
         allIBaseLock.readLock().lock();
         try {
             final Object value = allIBaseFileObjects.get(id);
@@ -701,15 +706,16 @@ private static BaseFileObj getReference(final List<?> list, final File file) {
     private BaseFileObj putInCache(final BaseFileObj newValue, final Integer id) {
         allIBaseLock.writeLock().lock();
         try {
+            Key key = new Key(id);
             final WeakReference<BaseFileObj> newRef = new WeakReference<BaseFileObj>(newValue);
-            final Object listOrReference = allIBaseFileObjects.put(id, newRef);
+            final Object listOrReference = allIBaseFileObjects.put(key, newRef);
 
             if (listOrReference != null) {
                 if (listOrReference instanceof List<?>) {
                     @SuppressWarnings("unchecked")
                     List<Reference<BaseFileObj>> list = (List<Reference<BaseFileObj>>) listOrReference;
                     list.add(newRef);
-                    allIBaseFileObjects.put(id, listOrReference);
+                    allIBaseFileObjects.put(key, listOrReference);
                 } else {
                     assert (listOrReference instanceof WeakReference<?>);
                     @SuppressWarnings("unchecked")
@@ -720,7 +726,7 @@ private BaseFileObj putInCache(final BaseFileObj newValue, final Integer id) {
                         final List<Reference<BaseFileObj>> l = new ArrayList<Reference<BaseFileObj>>();
                         l.add(oldRef);
                         l.add(newRef);
-                        allIBaseFileObjects.put(id, l);
+                        allIBaseFileObjects.put(key, l);
                     }
                 }
             }