Skip to content

Commit 4f24209

Browse files
committed
include Network INI in controller file
1 parent 4c79b0d commit 4f24209

4 files changed

Lines changed: 18 additions & 8 deletions

File tree

src/controller/Compiler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@ public boolean checkInputFilesExist() {
108108
view.publishIssue("Input directory \"{0}\" does not exist", inputDir);
109109
return false;
110110
} else {
111-
rulDirs = new File[3];
111+
rulDirs = new File[4];
112112
for (int i = 0; i < rulDirs.length; i++) {
113-
rulDirs[i] = new File(inputDir, "RUL" + i);
113+
rulDirs[i] = new File(inputDir, i==3 ? "INI" : ("RUL" + i));
114114
if (!rulDirs[i].exists()) {
115115
view.publishIssue("Input directory \"{0}\" does not exist", rulDirs[i]);
116116
return false;

src/controller/tasks/CollectRULsTask.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public abstract class CollectRULsTask implements ExecutableTask {
2020
public boolean accept(File pathname) {
2121
return pathname.isDirectory() ||
2222
pathname.getName().endsWith(".txt") ||
23+
pathname.getName().endsWith(".ini") ||
2324
pathname.getName().endsWith(".rul");
2425
}
2526
};
@@ -39,7 +40,7 @@ private CollectRULsTask(File[] rulDirs) {
3940
private Queue<File>[] mainProcess() {
4041
LOGGER.info("Collecting input data.");
4142
@SuppressWarnings("unchecked")
42-
Queue<File>[] rulInputFiles = new Queue[3];
43+
Queue<File>[] rulInputFiles = new Queue[4];
4344
for (int i = 0; i < rulInputFiles.length; i++)
4445
rulInputFiles[i] = collectRecursively(CollectRULsTask.this.rulDirs[i]);
4546
return rulInputFiles;

src/controller/tasks/WriteControllerTask.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ public abstract class WriteControllerTask implements ExecutableTask {
4141
private final DBPFTGI[] RUL_TGIS = {
4242
DBPFTGI.RUL.modifyTGI(-1L, -1L, 0x10000000L),
4343
DBPFTGI.RUL.modifyTGI(-1L, -1L, 0x10000001L),
44-
DBPFTGI.RUL.modifyTGI(-1L, -1L, 0x10000002L)};
44+
DBPFTGI.RUL.modifyTGI(-1L, -1L, 0x10000002L),
45+
DBPFTGI.valueOf(0x00000000L, 0x8a5971c5L, 0x8a5993b9L)}; // Network INI
4546
private final DBPFTGI LTEXT_TGI = DBPFTGI.valueOf(0x2026960bL, 0x123006aaL, 0x6a47ffffL);
4647

4748
private final CollectRULsTask collectRULsTask;
@@ -50,7 +51,7 @@ public abstract class WriteControllerTask implements ExecutableTask {
5051
private final URI inputURI;
5152
private final File outputFile;
5253
private final View view;
53-
private final RULEntry[] rulEntries = new RULEntry[3];
54+
private final RULEntry[] rulEntries = new RULEntry[4];
5455

5556
private long starttime;
5657

@@ -106,9 +107,12 @@ public void stateChanged(ChangeEvent e) {
106107
int i = 0;
107108
rulEntries[i] = new RUL0Entry(RUL_TGIS[i], rulInputFiles[i], WriteControllerTask.this.isLHD, changeListener, parsingExecutor);
108109
i++;
109-
rulEntries[i] = new RUL1Entry(RUL_TGIS[i], rulInputFiles[i], WriteControllerTask.this.isLHD, changeListener, parsingExecutor);
110+
rulEntries[i] = new RUL1Entry(RUL_TGIS[i], rulInputFiles[i], WriteControllerTask.this.isLHD, false, changeListener, parsingExecutor);
110111
i++;
111112
rulEntries[i] = new RUL2Entry(RUL_TGIS[i], rulInputFiles[i], WriteControllerTask.this.isLHD, WriteControllerTask.this.patterns, changeListener, parsingExecutor);
113+
i++;
114+
// Network INI
115+
rulEntries[i] = new RUL1Entry(RUL_TGIS[i], rulInputFiles[i], WriteControllerTask.this.isLHD, true, changeListener, parsingExecutor);
112116
}
113117
for (int i = 0; i < RUL_TGIS.length; i++) {
114118
if(rulEntries[i].getLastModified() > lastModf) {

src/model/RUL1Entry.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,24 @@
1414
import jdpbfx.DBPFTGI;
1515
import controller.NAMControllerCompilerMain;
1616

17+
/**
18+
* Used for RUL1 and the Network INI.
19+
*/
1720
public class RUL1Entry extends RULEntry {
1821

1922
// private final boolean isESeries;
2023
private final boolean isLHD;
24+
private final boolean isINI;
2125

22-
public RUL1Entry(DBPFTGI tgi, Queue<File> inputFiles, boolean isLHD, ChangeListener changeListener, ExecutorService executor) {
26+
public RUL1Entry(DBPFTGI tgi, Queue<File> inputFiles, boolean isLHD, boolean isINI, ChangeListener changeListener, ExecutorService executor) {
2327
super(tgi, inputFiles, changeListener, executor);
2428
this.isLHD = isLHD;
29+
this.isINI = isINI;
2530
}
2631

2732
@Override
2833
protected void provideData() throws IOException {
29-
NAMControllerCompilerMain.LOGGER.info("Writing file RUL1");
34+
NAMControllerCompilerMain.LOGGER.info("Writing file " + (this.isINI ? "Network INI" : "RUL1"));
3035
for (File file : inputFiles) {
3136
this.changeListener.stateChanged(new ChangeEvent(file));
3237
// if (!RULEntry.fileMatchesSeries(file, isESeries)) {

0 commit comments

Comments
 (0)