X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.machine%2Fsrc%2Fnet%2Fmograsim%2Fmachine%2FMachineRegistry.java;h=d3124123874ee91b95d2e5fb0bebd10d4f452259;hb=0c404f876557865fb7361ca458ac90caf41afe19;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..d3124123 100644
--- a/plugins/net.mograsim.machine/src/net/mograsim/machine/MachineRegistry.java
+++ b/plugins/net.mograsim.machine/src/net/mograsim/machine/MachineRegistry.java
@@ -1,38 +1,54 @@
 package net.mograsim.machine;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 
 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;
 
+/**
+ * The MachineRegsitry is a static context registry for all {@link MachineDefinition}s known at any point during runtime.
+ * <p>
+ * It is updated automatically as mograsim machine definition extension points ({@link #MACHINE_EXT_ID}) are added or removed.
+ *
+ * @author Christian Femers
+ *
+ */
 public class MachineRegistry
 {
-	private static final String MACHINE_EXT_ID = "net.mograsim.machine.machine_definition";
 
-	private static Map<String, MachineDefinition> installedMachines = new HashMap<>();
+	public static final String MACHINE_EXT_ID = "net.mograsim.machine.machine_definition";
 
-	public static void reload()
+	private static final Map<String, MachineDefinition> installedMachines = Collections.synchronizedMap(new HashMap<>());
+	private static final Set<MachineRegistryListener> listeners = Collections.synchronizedSet(new HashSet<>());
+
+	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);
 		try
 		{
 			for (IConfigurationElement e : config)
 			{
-				System.out.println(e.getNamespaceIdentifier());
-				System.out.println(Arrays.toString(e.getAttributeNames()));
 				final Object o = e.createExecutableExtension("class");
 				final String id = e.getAttribute("unique_id");
 				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 + "");
@@ -41,12 +57,73 @@ public class MachineRegistry
 		}
 		catch (CoreException ex)
 		{
-			System.out.println(ex.getMessage());
+			System.err.println("An error occurred reloading the machines:");
+			ex.printStackTrace();
 		}
+		notifyListeners();
+	}
+
+	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()
+	public static Map<String, MachineDefinition> getInstalledMachines()
 	{
 		return Collections.unmodifiableMap(installedMachines);
 	}
+
+	public static MachineDefinition getMachine(String id)
+	{
+		return installedMachines.get(id);
+	}
+
+	private static void notifyListeners()
+	{
+		Map<String, MachineDefinition> unmodMachines = getInstalledMachines();
+		listeners.forEach(l -> l.onReload(unmodMachines));
+	}
+
+	public static void addMachineRegistryListener(MachineRegistryListener listener)
+	{
+		listeners.add(listener);
+	}
+
+	public static void removeMachineRegistryListener(MachineRegistryListener listener)
+	{
+		listeners.remove(listener);
+	}
+
+	@FunctionalInterface
+	public interface MachineRegistryListener
+	{
+		void onReload(Map<String, MachineDefinition> installedMachines);
+	}
 }