Skip to content

Commit 9c7c3a5

Browse files
Merge pull request #10 from VariantSync/next-release
VEVOS Simulation v1.1.2
2 parents d244446 + 3e739b2 commit 9c7c3a5

3 files changed

Lines changed: 3 additions & 7 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<groupId>org.variantsync.vevos</groupId>
99
<!-- Adjust the generateVariant name -->
1010
<artifactId>simulation</artifactId>
11-
<version>1.1.1</version>
11+
<version>1.1.2</version>
1212

1313
<properties>
1414
<!-- Adjust your java version here -->

src/main/java/org/variantsync/vevos/simulation/io/TextIO.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
// TODO: Implement readLinesAs(Path p, Function<> f) with which one can load a file into a desired format
2020

2121
public class TextIO {
22-
public final static String LINEBREAK = "\r\n";
23-
public final static String LINEBREAK_REGEX = "\\r?\\n";
22+
public final static String LINEBREAK = System.lineSeparator();
2423

2524
public static String[] readLinesAsArray(final File file) throws IOException {
2625
final LinkedList<String> lines = new LinkedList<>();

src/main/java/org/variantsync/vevos/simulation/io/kernelhaven/VariabilityModelLoader.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package org.variantsync.vevos.simulation.io.kernelhaven;
22

3-
import de.ovgu.featureide.fm.core.base.FeatureUtils;
4-
import de.ovgu.featureide.fm.core.base.IFeature;
53
import de.ovgu.featureide.fm.core.base.IFeatureModel;
6-
import de.ovgu.featureide.fm.core.base.impl.DefaultFeatureModelFactory;
74
import net.ssehub.kernel_haven.variability_model.JsonVariabilityModelCache;
85
import org.variantsync.functjonal.Result;
96
import org.variantsync.vevos.simulation.io.ResourceLoader;
@@ -25,7 +22,7 @@ public boolean canLoad(Path p) {
2522
@Override
2623
public Result<IFeatureModel, ? extends Exception> load(Path p) {
2724
return Result.Try(() -> {
28-
if (p.endsWith(".json")) {
25+
if (p.toString().endsWith(".json")) {
2926
JsonVariabilityModelCache cache = new JsonVariabilityModelCache(p.getParent().toFile());
3027
return FeatureModelUtils.FromVariabilityModel(cache.readFixed(p.toFile()));
3128
} else {

0 commit comments

Comments
 (0)