Skip to content

Commit 6c6e059

Browse files
author
jan
committed
solve the open close failing regression test
The test for code in the source failed for Sloeber (it should have failed also for autobuild but it didn't)
1 parent 6077dab commit 6c6e059

File tree

2 files changed

+527
-480
lines changed

2 files changed

+527
-480
lines changed

io.sloeber.autoBuild/src/io/sloeber/autoBuild/integration/AutoBuildResourceData.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,14 @@ private void cloneSourceEntries(ICSourceEntry entries[]) {
6969
*/
7070
public AutoBuildResourceData(ICConfigurationDescription cfgDescription, KeyValueTree keyValues) {
7171
// TODO read Map<String, CResourceData> myResourceDatas = new HashMap<>();
72-
// TODO read ICSourceEntry mySourceEntries[] = null;
7372
// TODO read CFolderData myRootFolderData;
7473
Set<CSourceEntry> sourceEntries = new HashSet<>();
7574
for (KeyValueTree cursourceEntykeyValue : keyValues.getChildren().values()) {
7675
String name = cursourceEntykeyValue.getKey();
7776
String value = cursourceEntykeyValue.getValue();
77+
if(ROOT.equals(name)) {
78+
name=EMPTY_STRING;
79+
}
7880
String values[] = value.split(Pattern.quote(COLON));
7981
if (values.length < 2) {
8082
// no exclusion patterns
@@ -86,8 +88,7 @@ public AutoBuildResourceData(ICConfigurationDescription cfgDescription, KeyValue
8688
for (int curEx = 1; curEx < values.length; curEx++) {
8789
exclusionPatterns.add(new Path(values[curEx]));
8890
}
89-
sourceEntries.add(
90-
new CSourceEntry(name, exclusionPatterns.toArray(new IPath[exclusionPatterns.size()]), flags));
91+
sourceEntries.add(new CSourceEntry(name, exclusionPatterns.toArray(new IPath[exclusionPatterns.size()]), flags));
9192
}
9293
}
9394
mySourceEntries = sourceEntries.toArray(new ICSourceEntry[sourceEntries.size()]);
@@ -181,7 +182,7 @@ protected void serialize(KeyValueTree keyValuePairs) {
181182
if (key.isBlank()) {
182183
key = ROOT;
183184
}
184-
String value = Integer.toString(curSourceEntry.getFlags());
185+
String value = Integer.toString(curSourceEntry.getFlags());//&~(ICSettingEntry.VALUE_WORKSPACE_PATH));
185186
for (IPath curExclusion : curSourceEntry.getExclusionPatterns()) {
186187
value = value + COLON + curExclusion.toString();
187188
}

0 commit comments

Comments
 (0)