rusefi
/
KiCad-utils
mirror of https://github.com/rusefi/KiCad-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactoring

This commit is contained in:
rusefillc 2021-01-09 18:30:34 -05:00
parent e12747ca05
commit b93f0ac559
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/rusefi/pcb/nodes/GrLineNode.java
View File

@ -4,12 +4,13 @@ import java.util.List;
/**
* @author Andrey Belomutskiy
* 2/7/14.
* 2/7/14.
*/
public class GrLineNode extends PcbNode {
public final LayerNode layerNode;
public GrLineNode(String nodeName, int i, List<Object> children) {
super(nodeName, i, children);
layerNode = (LayerNode) find("layer");
public GrLineNode(int i, List<Object> children) {
super(TOKEN_GR_LINE, i, children);
layerNode = find("layer");
}
}

6
src/main/java/com/rusefi/pcb/nodes/PcbNode.java
View File

@ -95,7 +95,7 @@ public class PcbNode {
} else if ("add_net".equals(nodeName)) {
return new AddNetNode(nodeName, index + 1, children);
} else if (TOKEN_GR_LINE.equals(nodeName)) {
return new GrLineNode(nodeName, index + 1, children);
return new GrLineNode(index + 1, children);
} else if ("layer".equals(nodeName)) {
return new LayerNode(nodeName, index + 1, children);
} else if ("module".equals(nodeName)) {
@ -212,12 +212,12 @@ public class PcbNode {
public <T extends PcbNode> T find(String key) {
List<PcbNode> r = iterate(key);
if (r.size() != 1)
throw new IllegalStateException("More that one " + key + " in " + nodeName);
throw new IllegalStateException("Exactly one " + key + " expected in " + nodeName);
return (T) r.get(0);
}
public List<PcbNode> nodes() {
List<PcbNode> result = new ArrayList<PcbNode>();
List<PcbNode> result = new ArrayList<>();
for (Object child : children) {
if (child instanceof String)
continue;