X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.machine%2Fsrc%2Fnet%2Fmograsim%2Fmachine%2FMachineRegistry.java;h=52e5d60dc682a0c18b924f021f6fbb90e7b3c3c8;hb=07a6b9ff15d40ac08175bf0d60dad3e7bbe10ecb;hp=a2706462493e2f08082e52975e83bf10e636bc86;hpb=58babf45ae7d259a296656451d796dbe601377a4;p=Mograsim.git

diff --git a/plugins/net.mograsim.machine/src/net/mograsim/machine/MachineRegistry.java b/plugins/net.mograsim.machine/src/net/mograsim/machine/MachineRegistry.java
index a2706462..52e5d60d 100644
--- a/plugins/net.mograsim.machine/src/net/mograsim/machine/MachineRegistry.java
+++ b/plugins/net.mograsim.machine/src/net/mograsim/machine/MachineRegistry.java
@@ -4,20 +4,23 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.core.runtime.IExtensionPoint;
 import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.IRegistryEventListener;
 import org.eclipse.core.runtime.Platform;
 
 public class MachineRegistry
 {
 	private static final String MACHINE_EXT_ID = "net.mograsim.machine.machine_definition";
 
-	private static Map<String, MachineDefinition> installedMachines = new HashMap<>();
+	private static final Map<String, MachineDefinition> installedMachines = new HashMap<>();
 
-	public static void reload()
+	private static void reload()
 	{
+		installedMachines.clear();
 		IExtensionRegistry registry = Platform.getExtensionRegistry();
 		System.out.println(Arrays.toString(registry.getExtensionPoints("net.mograsim.machine")));
 		IConfigurationElement[] config = registry.getConfigurationElementsFor(MACHINE_EXT_ID);
@@ -32,7 +35,11 @@ public class MachineRegistry
 				if (o instanceof MachineDefinition)
 				{
 					System.out.println("Found " + id);
-					installedMachines.put(id, (MachineDefinition) o);
+					MachineDefinition md = (MachineDefinition) o;
+					if (Objects.equals(id, md.getId()))
+						installedMachines.put(id, md);
+					else
+						System.err.println("Machine definition ids to not match: " + id + " and " + md.getId());
 				} else
 				{
 					System.err.println("Invalid machine definition: " + o + "(id=" + id + "");
@@ -45,8 +52,45 @@ public class MachineRegistry
 		}
 	}
 
-	public static Map<String, MachineDefinition> getinstalledMachines()
+	public static void initialize()
+	{
+		reload();
+		Platform.getExtensionRegistry().addListener(new IRegistryEventListener()
+		{
+
+			@Override
+			public void removed(IExtensionPoint[] extensionPoints)
+			{
+				// nothing?
+			}
+
+			@Override
+			public void removed(IExtension[] extensions)
+			{
+				reload();
+			}
+
+			@Override
+			public void added(IExtensionPoint[] extensionPoints)
+			{
+				// nothing?
+			}
+
+			@Override
+			public void added(IExtension[] extensions)
+			{
+				reload();
+			}
+		}, MACHINE_EXT_ID);
+	}
+
+	public static Map<String, MachineDefinition> getInstalledMachines()
 	{
 		return Collections.unmodifiableMap(installedMachines);
 	}
+
+	public static MachineDefinition getMachine(String id)
+	{
+		return installedMachines.get(id);
+	}
 }