diff --git a/pom.xml b/pom.xml index b3a41f4..ad1711d 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.variantsync.vevos simulation - 1.1.1 + 1.1.2 diff --git a/src/main/java/org/variantsync/vevos/simulation/io/TextIO.java b/src/main/java/org/variantsync/vevos/simulation/io/TextIO.java index a83fe8f..1ba8cf8 100644 --- a/src/main/java/org/variantsync/vevos/simulation/io/TextIO.java +++ b/src/main/java/org/variantsync/vevos/simulation/io/TextIO.java @@ -19,8 +19,7 @@ // TODO: Implement readLinesAs(Path p, Function<> f) with which one can load a file into a desired format public class TextIO { - public final static String LINEBREAK = "\r\n"; - public final static String LINEBREAK_REGEX = "\\r?\\n"; + public final static String LINEBREAK = System.lineSeparator(); public static String[] readLinesAsArray(final File file) throws IOException { final LinkedList lines = new LinkedList<>(); diff --git a/src/main/java/org/variantsync/vevos/simulation/io/kernelhaven/VariabilityModelLoader.java b/src/main/java/org/variantsync/vevos/simulation/io/kernelhaven/VariabilityModelLoader.java index 3448bd1..9532355 100644 --- a/src/main/java/org/variantsync/vevos/simulation/io/kernelhaven/VariabilityModelLoader.java +++ b/src/main/java/org/variantsync/vevos/simulation/io/kernelhaven/VariabilityModelLoader.java @@ -1,9 +1,6 @@ package org.variantsync.vevos.simulation.io.kernelhaven; -import de.ovgu.featureide.fm.core.base.FeatureUtils; -import de.ovgu.featureide.fm.core.base.IFeature; import de.ovgu.featureide.fm.core.base.IFeatureModel; -import de.ovgu.featureide.fm.core.base.impl.DefaultFeatureModelFactory; import net.ssehub.kernel_haven.variability_model.JsonVariabilityModelCache; import org.variantsync.functjonal.Result; import org.variantsync.vevos.simulation.io.ResourceLoader; @@ -25,7 +22,7 @@ public boolean canLoad(Path p) { @Override public Result load(Path p) { return Result.Try(() -> { - if (p.endsWith(".json")) { + if (p.toString().endsWith(".json")) { JsonVariabilityModelCache cache = new JsonVariabilityModelCache(p.getParent().toFile()); return FeatureModelUtils.FromVariabilityModel(cache.readFixed(p.toFile())); } else {