From 64c8b0591a56bac6b27bd30e302ffcd5c85ee607 Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Mon, 14 Dec 2020 11:16:40 +0100 Subject: [PATCH] [ADD] constructors --- .../java/com/a1/nextlocation/data/Coupon.java | 5 +++++ .../java/com/a1/nextlocation/data/FileIO.java | 8 ++++++++ .../java/com/a1/nextlocation/data/Route.java | 20 +++++++++++++------ 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/a1/nextlocation/data/Coupon.java b/app/src/main/java/com/a1/nextlocation/data/Coupon.java index 5cfcece..6e50deb 100644 --- a/app/src/main/java/com/a1/nextlocation/data/Coupon.java +++ b/app/src/main/java/com/a1/nextlocation/data/Coupon.java @@ -5,6 +5,11 @@ public class Coupon { private String code; private String reward; + public Coupon(String code, String reward) { + this.code = code; + this.reward = reward; + } + public String getCode() { return code; } diff --git a/app/src/main/java/com/a1/nextlocation/data/FileIO.java b/app/src/main/java/com/a1/nextlocation/data/FileIO.java index 71c08f6..6d6d8f9 100644 --- a/app/src/main/java/com/a1/nextlocation/data/FileIO.java +++ b/app/src/main/java/com/a1/nextlocation/data/FileIO.java @@ -1,4 +1,12 @@ package com.a1.nextlocation.data; public class FileIO { + + public static void readFileData() { + + } + + public static void writeFileData() { + + } } diff --git a/app/src/main/java/com/a1/nextlocation/data/Route.java b/app/src/main/java/com/a1/nextlocation/data/Route.java index 2714dab..ed5445a 100644 --- a/app/src/main/java/com/a1/nextlocation/data/Route.java +++ b/app/src/main/java/com/a1/nextlocation/data/Route.java @@ -1,5 +1,6 @@ package com.a1.nextlocation.data; +import java.util.ArrayList; import java.util.List; public class Route { @@ -8,6 +9,17 @@ public class Route { private float totalDistance; private int totalTime; + public Route(String name) { + + this.name = name; + this.locations = new ArrayList<>(); + + } + + public void addLocation(Location location) { + this.locations.add(location); + } + public String getName() { return name; } @@ -25,18 +37,14 @@ public class Route { } public float getTotalDistance() { + //TODO calculate total distance according to all locations in list return totalDistance; } - public void setTotalDistance(float totalDistance) { - this.totalDistance = totalDistance; - } public int getTotalTime() { + //TODO calculate total time according to all locations in list return totalTime; } - public void setTotalTime(int totalTime) { - this.totalTime = totalTime; - } }