From b703324aecc6638df05b7e131c2ce975694f22d3 Mon Sep 17 00:00:00 2001 From: DavidZT01 Date: Tue, 15 Aug 2023 15:22:21 -0500 Subject: [PATCH] Slightly condensed code --- .idea/.name | 1 + .idea/misc.xml | 2 +- src/main/java/Data.java | 6 ++---- src/main/java/Main.java | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 .idea/.name diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..0571767 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +Data.java \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 0a13117..ee7fab8 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/src/main/java/Data.java b/src/main/java/Data.java index 907d228..e43e8e8 100644 --- a/src/main/java/Data.java +++ b/src/main/java/Data.java @@ -2,8 +2,6 @@ public class Data { private final double amount; private final String unit; private final int speed; - private double toMegabytes; - private double downloadSeconds; // Constructor @@ -16,6 +14,7 @@ public class Data { // Class methods public double convertToMegabytes() { + double toMegabytes; switch (unit) { case "bytes" -> toMegabytes = (amount / 1024) / 1024; case "kilobytes" -> toMegabytes = amount / 1024; @@ -27,8 +26,7 @@ public double convertToMegabytes() { } public double calculateDownloadTime() { - downloadSeconds = convertToMegabytes() / (speed / 8.0); - return downloadSeconds; + return convertToMegabytes() / (speed / 8.0); } public String getFormattedDownloadTime() { diff --git a/src/main/java/Main.java b/src/main/java/Main.java index 13d24d6..7d3479e 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -19,6 +19,6 @@ public static void main(String[] args) { newData.calculateDownloadTime(); //Print out the data Object with your toString(); - System.out.println(newData.toString()); + System.out.println(newData); } }