diff --git a/src/inport/Bunker.java b/src/inport/Bunker.java index bd575d6db255069f87ec43666758e23c7400a1c3..b57a2436b5b466af87c2e1bc27b0e011def9d0e9 100644 --- a/src/inport/Bunker.java +++ b/src/inport/Bunker.java @@ -4,8 +4,7 @@ */ package inport; -import javafx.util.Pair; - +import inport.ConversionUtils.Pair; import java.util.ArrayList; import java.util.Map; diff --git a/src/inport/ConversionUtils/Pair.java b/src/inport/ConversionUtils/Pair.java new file mode 100644 index 0000000000000000000000000000000000000000..3d9220a80acc06570690e89133746ffe89fee1f4 --- /dev/null +++ b/src/inport/ConversionUtils/Pair.java @@ -0,0 +1,18 @@ +package inport.ConversionUtils; + +public class Pair { + private K key; + private V value; + + public Pair(K key, V value) { + this.key = key; + this.value = value; + } + + public K getKey() { + return key; + } + public V getValue() { + return value; + } +} diff --git a/src/inport/ConversionUtils/Task.java b/src/inport/ConversionUtils/Task.java index e25d247ac1935ad743884b93edd4e845b311e760..803f1fe1d0d808e5fa1fbb6f8c3a020ffad2b24c 100644 --- a/src/inport/ConversionUtils/Task.java +++ b/src/inport/ConversionUtils/Task.java @@ -1,7 +1,6 @@ package inport.ConversionUtils; import inport.*; -import javafx.util.Pair; import org.jetbrains.annotations.NotNull; import java.io.FileWriter; diff --git a/src/inport/ConversionUtils/Utils.java b/src/inport/ConversionUtils/Utils.java index 943f61e5c5e237e9e75cc411946de3d4ba65a632..67e885e7bb9f1dfa8b02102f960bd6f68709c0bf 100644 --- a/src/inport/ConversionUtils/Utils.java +++ b/src/inport/ConversionUtils/Utils.java @@ -1,8 +1,6 @@ package inport.ConversionUtils; import inport.*; -import javafx.util.Pair; - import java.util.*; public class Utils { diff --git a/src/inport/Storage.java b/src/inport/Storage.java index a05bd4b5d2b64664a6816723b5308ff7f286849d..6fa97df2c821d39c602409975d2b166af05504c8 100644 --- a/src/inport/Storage.java +++ b/src/inport/Storage.java @@ -4,7 +4,7 @@ */ package inport; -import javafx.util.Pair; +import inport.ConversionUtils.Pair; import java.util.ArrayList; import java.util.Map; diff --git a/src/inport/Testing.java b/src/inport/Testing.java index 07b50ffd1c59b0b0153445f5cc5bda4161d1bb57..c130724023eb86ecb419ffe8fee0e357a483626a 100644 --- a/src/inport/Testing.java +++ b/src/inport/Testing.java @@ -3,7 +3,7 @@ package inport; import inport.ConversionUtils.MZnResultsResolver; import inport.ConversionUtils.ParserException; import inport.ConversionUtils.Task; -import javafx.util.Pair; +import inport.ConversionUtils.Pair; import java.io.*; import java.util.ArrayList; diff --git a/src/inport/TransportShip.java b/src/inport/TransportShip.java index 514e3adffd1614a477809e361687b11e4cb18001..2996d4b44f412ebe170e0dac634585d0a516fc91 100644 --- a/src/inport/TransportShip.java +++ b/src/inport/TransportShip.java @@ -4,7 +4,7 @@ */ package inport; -import javafx.util.Pair; +import inport.ConversionUtils.Pair; import java.util.ArrayList; import java.util.Map;