From: Christian Femers <femers@in.tum.de>
Date: Tue, 3 Sep 2019 07:20:36 +0000 (+0200)
Subject: Added activator to scan for machines, everything works now.
X-Git-Url: https://mograsim.net/gitweb/?p=Mograsim.git;a=commitdiff_plain;h=98fe17c431c265ce33f49bacd607ce429e39e0fb

Added activator to scan for machines, everything works now.
---

diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/Am2900Loader.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/Am2900Loader.java
index 45d22078..d5613b9b 100644
--- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/Am2900Loader.java
+++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/Am2900Loader.java
@@ -17,7 +17,7 @@ public class Am2900Loader implements BundleActivator
 	@Override
 	public void start(BundleContext context) throws Exception
 	{
-		setup(); // TODO: useful?
+		setup();
 	}
 
 	@Override
@@ -32,12 +32,7 @@ public class Am2900Loader implements BundleActivator
 			return;
 		IndirectGUIComponentCreator.registerResourceLoader(new Am2900ResourceLoader(), "Am2900Loader");
 		IndirectGUIComponentCreator.loadStandardComponentIDs(Am2900Loader.class.getResourceAsStream("standardComponentIDMapping.json"));
-		System.out.println("SETUP DONE");
-	}
-
-	static
-	{
-		setup();
+//		System.out.println("SETUP DONE"); // TODO: Debug
 	}
 
 	/**
diff --git a/net.mograsim.plugin.core/META-INF/MANIFEST.MF b/net.mograsim.plugin.core/META-INF/MANIFEST.MF
index 02cb0fa8..5b256d0f 100644
--- a/net.mograsim.plugin.core/META-INF/MANIFEST.MF
+++ b/net.mograsim.plugin.core/META-INF/MANIFEST.MF
@@ -8,6 +8,10 @@ Export-Package: net.mograsim.plugin;uses:="org.eclipse.ui.themes,org.eclipse.swt
  net.mograsim.plugin.asm.editor,
  net.mograsim.plugin.asm.editor.rules,
  net.mograsim.plugin.nature,
+ net.mograsim.plugin.tables,
+ net.mograsim.plugin.tables.memory,
+ net.mograsim.plugin.tables.mi,
+ net.mograsim.plugin.util,
  net.mograsim.plugin.views
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
@@ -27,3 +31,5 @@ Require-Bundle: org.eclipse.core.runtime,
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: net.mograsim.plugin.core
 Bundle-Vendor: %Bundle-Vendor.0
+Bundle-Activator: net.mograsim.plugin.MograsimActivator
+Bundle-ActivationPolicy: lazy
diff --git a/net.mograsim.plugin.core/src/net/mograsim/plugin/MograsimActivator.java b/net.mograsim.plugin.core/src/net/mograsim/plugin/MograsimActivator.java
new file mode 100644
index 00000000..c17f5304
--- /dev/null
+++ b/net.mograsim.plugin.core/src/net/mograsim/plugin/MograsimActivator.java
@@ -0,0 +1,14 @@
+package net.mograsim.plugin;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+
+import net.mograsim.machine.MachineRegistry;
+
+public final class MograsimActivator extends AbstractUIPlugin
+{
+
+	public MograsimActivator()
+	{
+		MachineRegistry.reload();
+	}
+}
diff --git a/net.mograsim.plugin.core/src/net/mograsim/plugin/views/LogicUIPart.java b/net.mograsim.plugin.core/src/net/mograsim/plugin/views/LogicUIPart.java
index 83b3e2f5..fecb922a 100644
--- a/net.mograsim.plugin.core/src/net/mograsim/plugin/views/LogicUIPart.java
+++ b/net.mograsim.plugin.core/src/net/mograsim/plugin/views/LogicUIPart.java
@@ -40,7 +40,7 @@ public class LogicUIPart extends ViewPart
 		// set preferences
 		Preferences.setPreferences(new ThemePreferences(PlatformUI.getWorkbench().getThemeManager().getCurrentTheme()));
 
-		Optional<MachineDefinition> mdo = MachineRegistry.getinstalledMachines().stream().findFirst();
+		Optional<MachineDefinition> mdo = MachineRegistry.getinstalledMachines().values().stream().findFirst();
 
 		MachineDefinition md = mdo.orElseThrow(IllegalStateException::new);
 		Machine m = md.createNew();