X-Git-Url: https://mograsim.net/gitweb/?p=Mograsim.git;a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model.am2900%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fmachine%2FAbstractAm2900MachineDefinition.java;h=cbc65b8639533d92ac68bfae8a60289ac338a47a;hp=da843922df7f4f3c8b80fb966dea7f99c7414651;hb=13befb68923c540a13cfe5b5b28bf0f7ddf5c41b;hpb=edfa6a2a24048ef0507cb0e2d89e7f1cb9b23c4e

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 da843922..cbc65b86 100644
--- 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,10 +20,10 @@ import net.mograsim.machine.registers.RegisterGroup;
 //(used for detecting installed machines in plugin.core)
 public class AbstractAm2900MachineDefinition implements MachineDefinition
 {
-	public static final String SIMPLE_AM2900_MACHINE_ID = "Am2900Simple";
-	public static final String STRICT_AM2900_MACHINE_ID = "Am2900Strict";
-	public static final String SIMPLE_AM2900_DESCRIPTION = "Am2900Simple\nTODO Description";
-	public static final String STRICT_AM2900_DESCRIPTION = "Am2900Strict\nTODO Description";
+	public static final String AM2900_TEACHING_MACHINE_ID = "Am2900Simple";
+	public static final String AM2900_EXPERT_MACHINE_ID = "Am2900Strict";
+	public static final String AM2900_TEACHING_DESCRIPTION = "Am2900Teaching\nTODO Description";
+	public static final String AM2900_EXPERT_DESCRIPTION = "Am2900Expert\nTODO Description";
 
 	public static final List<Register> unsortedRegisters;
 	public static final List<RegisterGroup> registerGroups;
@@ -42,23 +42,23 @@ public class AbstractAm2900MachineDefinition implements MachineDefinition
 		registerGroups = Collections.unmodifiableList(registerGroupsModifiable);
 	}
 
-	public final boolean strict;
+	public final boolean expert;
 
-	protected AbstractAm2900MachineDefinition(boolean strict)
+	protected AbstractAm2900MachineDefinition(boolean expert)
 	{
-		this.strict = strict;
+		this.expert = expert;
 	}
 
 	@Override
 	public String getId()
 	{
-		return strict ? STRICT_AM2900_MACHINE_ID : SIMPLE_AM2900_MACHINE_ID;
+		return expert ? AM2900_EXPERT_MACHINE_ID : AM2900_TEACHING_MACHINE_ID;
 	}
 
 	@Override
 	public String getDescription()
 	{
-		return strict ? STRICT_AM2900_DESCRIPTION : SIMPLE_AM2900_DESCRIPTION;
+		return expert ? AM2900_EXPERT_DESCRIPTION : AM2900_TEACHING_DESCRIPTION;
 	}
 
 	@Override
@@ -106,14 +106,14 @@ public class AbstractAm2900MachineDefinition implements MachineDefinition
 	@Override
 	public int hashCode()
 	{
-		return strict ? 12345 : 54321;
+		return expert ? 12345 : 54321;
 	}
 
 	@Override
 	public boolean equals(Object obj)
 	{
 		return obj != null && obj instanceof AbstractAm2900MachineDefinition
-				&& ((AbstractAm2900MachineDefinition) obj).strict == this.strict;
+				&& ((AbstractAm2900MachineDefinition) obj).expert == this.expert;
 	}
 
 	@Override