Mandatory maintenance

Author: neph1

jme3-core/src/com/jme3/gde/core/assets/ProjectAssetManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2010 jMonkeyEngine
+ * Copyright (c) 2009-2024 jMonkeyEngine
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -216,9 +216,7 @@ private void loadGradleClassLoader(List<URL> urls) {
                     runtimeFiles = sourceSet.getRuntimeClassPath();
                 }
             }
-        } catch (IOException ex) {
-            Exceptions.printStackTrace(ex);
-        } catch (IllegalArgumentException ex) {
+        } catch (IOException | IllegalArgumentException ex) {
             Exceptions.printStackTrace(ex);
         }
 
@@ -244,25 +242,31 @@ private void loadGradleClassLoader(List<URL> urls) {
     }
 
     FileChangeListener listener = new FileChangeListener() {
+        @Override
         public void fileFolderCreated(FileEvent fe) {
             fireChange(fe);
         }
 
+        @Override
         public void fileDataCreated(FileEvent fe) {
             fireChange(fe);
         }
 
+        @Override
         public void fileChanged(FileEvent fe) {
             fireChange(fe);
         }
 
+        @Override
         public void fileDeleted(FileEvent fe) {
         }
 
+        @Override
         public void fileRenamed(FileRenameEvent fe) {
             fireChange(fe);
         }
 
+        @Override
         public void fileAttributeChanged(FileAttributeEvent fae) {
         }
 
@@ -272,26 +276,22 @@ private void fireChange(FileEvent fe) {
         }
     };
 
-    private PropertyChangeListener classPathListener = new PropertyChangeListener() {
-        public void propertyChange(PropertyChangeEvent evt) {
-            logger.log(Level.FINE, "Classpath event: {0}", evt);
-            if (null != evt.getPropertyName()) switch (evt.getPropertyName()) {
-                case ClassPath.PROP_ROOTS -> updateClassLoader();
-                case ClassPath.PROP_ENTRIES -> updateClassLoader();
-                case ClassPath.PROP_INCLUDES -> updateClassLoader();
-                default -> {
-                }
+    private PropertyChangeListener classPathListener = (PropertyChangeEvent evt) -> {
+        logger.log(Level.FINE, "Classpath event: {0}", evt);
+        if (null != evt.getPropertyName()) switch (evt.getPropertyName()) {
+            case ClassPath.PROP_ROOTS -> updateClassLoader();
+            case ClassPath.PROP_ENTRIES -> updateClassLoader();
+            case ClassPath.PROP_INCLUDES -> updateClassLoader();
+            default -> {
             }
         }
     };
 
     public void updateClassLoader() {
-        ProjectManager.mutex().postWriteRequest(new Runnable() {
-            public void run() {
-                synchronized (classPathItems) {
-                    clearClassLoader();
-                    loadClassLoader();
-                }
+        ProjectManager.mutex().postWriteRequest(() -> {
+            synchronized (classPathItems) {
+                clearClassLoader();
+                loadClassLoader();
             }
         });
         notifyClassPathListeners();
@@ -304,6 +304,7 @@ public void setAssetEventListener(AssetEventListener listener) {
 
     private void prepAssetEventListeners() {
         super.setAssetEventListener(new AssetEventListener() {
+            @Override
             public void assetLoaded(AssetKey ak) {
                 synchronized (assetEventListeners) {
                     for (AssetEventListener assetEventListener : assetEventListeners) {
@@ -312,6 +313,7 @@ public void assetLoaded(AssetKey ak) {
                 }
             }
 
+            @Override
             public void assetRequested(AssetKey ak) {
                 synchronized (assetEventListeners) {
                     for (AssetEventListener assetEventListener : assetEventListeners) {
@@ -320,6 +322,7 @@ public void assetRequested(AssetKey ak) {
                 }
             }
 
+            @Override
             public void assetDependencyNotFound(AssetKey ak, AssetKey ak1) {
                 synchronized (assetEventListeners) {
                     for (AssetEventListener assetEventListener : assetEventListeners) {
@@ -426,6 +429,7 @@ public FileObject createAsset(String path, FileObject source) {
 
     /**
      * Adds a locator to a folder within the main project directory
+     * @param relativePath
      */
     public void addFolderLocator(String relativePath) {
         String string = project.getProjectDirectory().getPath() + "/" + relativePath + "/";
@@ -553,10 +557,7 @@ private Set<String> collectProjectFilesWithSuffix(String suffix, Set<String> lis
 
     private Set<String> collectDependenciesFilesWithSuffix(String suffix, Set<String> list) {
         synchronized (classPathItems) {
-            // TODO I need to find out if classPathItems contains all jars added to a project
-            Iterator<ClassPathItem> classPathItemsIter = classPathItems.iterator();
-            while (classPathItemsIter.hasNext()) {
-                ClassPathItem classPathItem = classPathItemsIter.next();
+            for (ClassPathItem classPathItem : classPathItems) {
                 FileObject jarFile = classPathItem.object;
 
                 // Gradle projects don't know that the dependency is a Jar file
@@ -573,19 +574,18 @@ private Set<String> collectDependenciesFilesWithSuffix(String suffix, Set<String
                         }
                     }
                 }
-
             }
-            return list;
+// TODO I need to find out if classPathItems contains all jars added to a project
+                        return list;
         }
     }
 
     public InputStream getResourceAsStream(String name) {
         InputStream in = null;//JmeSystem.getResourceAsStream(name);
         synchronized (classPathItems) {
             // TODO I need to find out if classPathItems contains all jars added to a project
-            Iterator<ClassPathItem> classPathItemsIter = classPathItems.iterator();
-            while (classPathItemsIter.hasNext()) {
-                ClassPathItem classPathItem = classPathItemsIter.next();
+            
+            for (ClassPathItem classPathItem : classPathItems) {
                 FileObject jarFile = classPathItem.object;
 
                 Enumeration<FileObject> jarEntry;
@@ -693,12 +693,10 @@ public void removeClassPathEventListener(ClassPathChangeListener listener) {
 
     private void notifyClassPathListeners() {
         final ProjectAssetManager pm = this;
-        java.awt.EventQueue.invokeLater(new Runnable() {
-            public void run() {
-                synchronized (classPathListeners) {
-                    for (ClassPathChangeListener classPathChangeListener : classPathListeners) {
-                        classPathChangeListener.classPathChanged(pm);
-                    }
+        java.awt.EventQueue.invokeLater(() -> {
+            synchronized (classPathListeners) {
+                for (ClassPathChangeListener classPathChangeListener : classPathListeners) {
+                    classPathChangeListener.classPathChanged(pm);
                 }
             }
         });
@@ -730,10 +728,12 @@ public DummyProject(ProjectAssetManager pm) {
             this.pm = pm;
         }
 
+        @Override
         public Lookup getLookup() {
             return Lookups.fixed(this, pm);
         }
 
+        @Override
         public FileObject getProjectDirectory() {
             if (folder != null) {
                 return folder;
@@ -744,7 +744,6 @@ public FileObject getProjectDirectory() {
 
     private static class ClassPathItem {
 
-        ClassPath path;
         FileObject object;
         FileChangeListener listener;