Typed members for SPMObjectInfo (actions and exports fields)

Author: makiam

SPManager/src/artofillusion/spmanager/SPMObjectInfo.java

@@ -68,8 +68,8 @@ public class SPMObjectInfo
 	private List<String> changeLog;
 	private List<String> details;
 
-	protected HashMap exports;
-	public HashMap actions;
+	protected Map<String, String> exports;
+	public Map<String, String> actions;
 
 	/**
 	 *  Script file name
@@ -704,8 +704,8 @@ private void readInfoFromDocumentNode(Node script)
 			details = new Vector<>(16);
 			externals = new HashMap<>(16);
 			destination = new ArrayList(16);
-			actions = new HashMap(16);
-			exports = new HashMap(32);
+			actions = new HashMap<>(16);
+			exports = new HashMap<>(32);
 		}
 		else {
 			changeLog.clear();

SPManager/src/artofillusion/spmanager/SPManagerPlugin.java

@@ -1,6 +1,6 @@
-
 /*
  *  Copyright 2004 Francois Guillet
+ *  Changes copyright 2022 by Maksim Khramov
  *  This program is free software; you can redistribute it and/or modify it under the
  *  terms of the GNU General Public License as published by the Free Software
  *  Foundation; either version 2 of the License, or (at your option) any later version.
@@ -15,7 +15,6 @@
 import artofillusion.ui.*;
 
 import java.awt.*;
-import java.awt.event.*;
 import buoy.event.*;
 import buoy.widget.*;
 
@@ -53,6 +52,7 @@ public class SPManagerPlugin implements Plugin
      *@param  message  Description of the Parameter
      *@param  args     Description of the Parameter
      */
+    @Override
     public void processMessage( int message, Object args[] )
     {
 	// NTJ: get the AOI run-time (*not* compile-time) version
@@ -101,8 +101,7 @@ public void processMessage( int message, Object args[] )
 	    Method addUrl = null;
 
 	    try {
-		addUrl =
-		    URLClassLoader.class.getDeclaredMethod("addURL", sig);
+		addUrl = URLClassLoader.class.getDeclaredMethod("addURL", sig);
 		addUrl.setAccessible(true);
 	    } catch (Exception e) {
 		System.out.println("Error getting addURL method: " + e);
@@ -114,8 +113,8 @@ public void processMessage( int message, Object args[] )
 	    Class plugType;
 	    File files[], urlfile;
 	    URL url;
-	    Map.Entry entry;
-	    String key[], value;
+	    
+	    
 	    File plugdir = new File(PLUGIN_DIRECTORY);
 	    if (plugdir.exists()) {
 		files = plugdir.listFiles();
@@ -157,11 +156,9 @@ public void processMessage( int message, Object args[] )
 			     }
 
 			// ok, now perform the actions
-			for (Iterator iter = info.actions.entrySet().iterator();
-			iter.hasNext(); ) {
-
-			    entry = (Map.Entry) iter.next();
-			    key = entry.getKey().toString().split(":");
+			for (Map.Entry<String, String> entry: info.actions.entrySet()) {
+                            String value = entry.getValue();
+			    String key[] = entry.getKey().split(":");
 
 			    try {
 				if (key[0].startsWith("/"))
@@ -177,30 +174,24 @@ public void processMessage( int message, Object args[] )
 
 			    System.out.println("SPM: adding path: " + url);
 
-			    value = entry.getValue().toString();
-
-			    
 			    if ("classpath".equalsIgnoreCase(value)) {
 				if (searchldr != null)
 				    searchldr.add(url);
 				else if (addUrl != null) {
 				    try {
 					addUrl.invoke(urlldr, url);
                                     } catch (Exception e) {
-					System.out.println("Error invoking: "
-						+ e);
+					System.out.println("Error invoking: " + e);
 				    }
 				}
-				else System.out.println("Could not add path" +
-					url);				    
+				else System.out.println("Could not add path" + url);
 			    }
 			    else if ("import".equalsIgnoreCase(value)) {
 				ldr = (ClassLoader) loaders.get(url);
 
 				if (key.length == 1) {
 				    if (obj != null) searchldr.add(ldr);
-				    else System.out.println("SPM: could not find"
-					    + " loader for: " + url);
+				    else System.out.println("SPM: could not find" + " loader for: " + url);
 				}
 
 			    }