projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added id to machine definition (was only set in the extension point)
[Mograsim.git]
/
plugins
/
net.mograsim.machine
/
src
/
net
/
mograsim
/
machine
/
MachineRegistry.java
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
28e7921
..
52e5d60
100644
(file)
--- a/
plugins/net.mograsim.machine/src/net/mograsim/machine/MachineRegistry.java
+++ b/
plugins/net.mograsim.machine/src/net/mograsim/machine/MachineRegistry.java
@@
-35,7
+35,11
@@
public class MachineRegistry
if (o instanceof MachineDefinition)
{
System.out.println("Found " + 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 + "");
} else
{
System.err.println("Invalid machine definition: " + o + "(id=" + id + "");