From 5ebf5fe01c16bae910fce07ef6f4fe607c0d18d1 Mon Sep 17 00:00:00 2001 From: Vlad_kv Date: Thu, 11 Jul 2019 14:25:15 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D1=81=D0=B2=D0=BE=D0=B9=20=D0=BA=D0=BB=D0=B0?= =?UTF-8?q?=D1=81=D1=81=20Pair.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/inport/Bunker.java | 3 +-- src/inport/ConversionUtils/Pair.java | 18 ++++++++++++++++++ src/inport/ConversionUtils/Task.java | 1 - src/inport/ConversionUtils/Utils.java | 2 -- src/inport/Storage.java | 2 +- src/inport/Testing.java | 2 +- src/inport/TransportShip.java | 2 +- 7 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 src/inport/ConversionUtils/Pair.java diff --git a/src/inport/Bunker.java b/src/inport/Bunker.java index bd575d6..b57a243 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 0000000..3d9220a --- /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 e25d247..803f1fe 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 943f61e..67e885e 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 a05bd4b..6fa97df 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 07b50ff..c130724 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 514e3ad..2996d4b 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; -- GitLab