From 43d1c6cf62127565be87fd0bb04e3633ce7b1f23 Mon Sep 17 00:00:00 2001 From: rakow Date: Wed, 21 Feb 2024 17:54:31 +0100 Subject: [PATCH] fix incorrect use of jcommander dependency --- .../org/matsim/application/analysis/traffic/LinkStats.java | 2 +- .../java/org/matsim/application/prepare/CreateLandUseShp.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contribs/application/src/main/java/org/matsim/application/analysis/traffic/LinkStats.java b/contribs/application/src/main/java/org/matsim/application/analysis/traffic/LinkStats.java index 09c3e910238..f5e2abbb323 100644 --- a/contribs/application/src/main/java/org/matsim/application/analysis/traffic/LinkStats.java +++ b/contribs/application/src/main/java/org/matsim/application/analysis/traffic/LinkStats.java @@ -1,6 +1,6 @@ package org.matsim.application.analysis.traffic; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; import it.unimi.dsi.fastutil.doubles.DoubleArrayList; import it.unimi.dsi.fastutil.doubles.DoubleList; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; diff --git a/contribs/application/src/main/java/org/matsim/application/prepare/CreateLandUseShp.java b/contribs/application/src/main/java/org/matsim/application/prepare/CreateLandUseShp.java index c2abbfe1ae3..4f10c61e745 100644 --- a/contribs/application/src/main/java/org/matsim/application/prepare/CreateLandUseShp.java +++ b/contribs/application/src/main/java/org/matsim/application/prepare/CreateLandUseShp.java @@ -1,6 +1,5 @@ package org.matsim.application.prepare; -import com.beust.jcommander.internal.Lists; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.geotools.data.DataStore; @@ -24,6 +23,7 @@ import java.nio.file.FileSystems; import java.nio.file.Files; import java.nio.file.Path; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Set; @@ -90,7 +90,7 @@ public Integer call() throws Exception { STRtree index = new STRtree(); boolean built = false; - List paths = Lists.newArrayList(); + List paths =new ArrayList<>(); if (input.toString().endsWith("zip")) { FileSystem fs = FileSystems.newFileSystem(input, ClassLoader.getSystemClassLoader()); for (String l : layer) {