Apple-2-Tools/jace
1
0
Fork 1
mirror of https://github.com/badvision/jace.git synced 2024-11-24 15:30:51 +00:00
Code Issues Projects Releases Wiki Activity

Issue #28: Fixed detection of configurable variables that are string types.

Browse Source
This commit is contained in:
Brendan Robert 2016-02-25 01:14:30 -06:00
parent 4c308f997e
commit deee9a2a72
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/jace/config/Configuration.java
View File

@ -284,7 +284,7 @@ public class Configuration implements Reconfigurable {
// System.out.println("Evaluating field " + f.getName()); // System.out.println("Evaluating field " + f.getName());
try { try {
Object o = f.get(node.subject); Object o = f.get(node.subject);
if (!f.getType().isPrimitive() && visited.contains(o)) { if (!f.getType().isPrimitive() && f.getType() != String.class && visited.contains(o)) {
continue; continue;
} }
visited.add(o); visited.add(o);

2
src/main/java/jace/hardware/CardDiskII.java
View File

@ -56,7 +56,7 @@ public class CardDiskII extends Card implements Reconfigurable, MediaConsumerPar
static public boolean USE_MAX_SPEED = true; static public boolean USE_MAX_SPEED = true;
@ConfigurableField(category = "Disk", defaultValue = "", shortName = "d1", name = "Drive 1 disk image", description = "Path of disk 1") @ConfigurableField(category = "Disk", defaultValue = "", shortName = "d1", name = "Drive 1 disk image", description = "Path of disk 1")
public String disk1; public String disk1;
@ConfigurableField(category = "Disk", defaultValue = "", shortName = "d2", name = "Drive 2 disk image", description = "Path of disk 1") @ConfigurableField(category = "Disk", defaultValue = "", shortName = "d2", name = "Drive 2 disk image", description = "Path of disk 2")
public String disk2; public String disk2;
public CardDiskII(Computer computer) { public CardDiskII(Computer computer) {