Changed the IDs of Am2900Simple/Strict to Am2900Teaching/Expert.

diff --git a/docs/getting_started.md b/docs/getting_started.md
index 987a3d1..e9187fb 100644 (file)
--- a/docs/getting_started.md
+++ b/docs/getting_started.md
@@ -36,7 +36,7 @@ Alternatively, you can create a general Project and add the Mograsim nature to t
 2. Go to the "Project Natures" page, click on "Add...". If a confirmation dialog pops up, confirm.
 3. Select "Mograsim Project Nature"; click on "OK".
 4. Click on "Apply and Close" and re-open the properties dialog.
-5. Go to the new "Mograsim" page, select "Am2900Simple", click on "Apply and Close".
+5. Go to the new "Mograsim" page, select "Am2900Teaching", click on "Apply and Close".
 
 ## Write a MPM file (containing the microprogram)
 

diff --git a/plugins/net.mograsim.logic.model.am2900/plugin.xml b/plugins/net.mograsim.logic.model.am2900/plugin.xml
index f679c35..fbc47b3 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/plugin.xml
+++ b/plugins/net.mograsim.logic.model.am2900/plugin.xml
@@ -5,11 +5,11 @@
          point="net.mograsim.machine.machine_definition">
       <machineDefinitionImplementation
             class="net.mograsim.logic.model.am2900.machine.Am2900TeachingMachineDefinition"
-            unique_id="Am2900Simple">
+            unique_id="Am2900Teaching">
       </machineDefinitionImplementation>
       <machineDefinitionImplementation
             class="net.mograsim.logic.model.am2900.machine.Am2900ExpertMachineDefinition"
-            unique_id="Am2900Strict">
+            unique_id="Am2900Expert">
       </machineDefinitionImplementation>
    </extension>
 

diff --git a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/AbstractAm2900MachineDefinition.java b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/AbstractAm2900MachineDefinition.java
index 9ab08f3..80bce79 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/AbstractAm2900MachineDefinition.java
+++ b/plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/AbstractAm2900MachineDefinition.java
@@ -20,8 +20,8 @@ import net.mograsim.machine.registers.RegisterGroup;
 //(used for detecting installed machines in plugin.core)
 public class AbstractAm2900MachineDefinition implements MachineDefinition
 {
-       public static final String AM2900_TEACHING_MACHINE_ID = "Am2900Simple";
-       public static final String AM2900_EXPERT_MACHINE_ID = "Am2900Strict";
+       public static final String AM2900_TEACHING_MACHINE_ID = "Am2900Teaching";
+       public static final String AM2900_EXPERT_MACHINE_ID = "Am2900Expert";
        public static final String AM2900_TEACHING_DESCRIPTION = "Am2900 for teaching purposes.\nAll registers are reset to 0 when starting.";
        public static final String AM2900_EXPERT_DESCRIPTION = "Am2900 \"for experts\".\nOnly the \u00b5PC will be reset to 0 when starting."
                        + "The microprogram will have to reset the other registers manually, including the PC.";

diff --git a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/nature/properties/MograsimNaturePropertyPage.java b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/nature/properties/MograsimNaturePropertyPage.java
index b7fb075..1b6c3d8 100644 (file)
--- a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/nature/properties/MograsimNaturePropertyPage.java
+++ b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/nature/properties/MograsimNaturePropertyPage.java
@@ -24,7 +24,7 @@ public class MograsimNaturePropertyPage extends PropertyPage
        private static final String WARNING = "Changing the Mograsim machine can completely break your project. Be careful.";
        private static final String MACHINE_LABEL = "Machine definition";
        private static final String MACHINE_PROPERTY = "net.mograsim.projectMachineId";
-       private static final String DEFAULT_MACHINE = "Am2900Simple";// TODO don't hardcode that here!
+       private static final String DEFAULT_MACHINE = "Am2900Teaching";// TODO don't hardcode that here!
 
        private MachineCombo machineSelect;
        private Label machineDescription;