From 91d6a080d8713d3c572776291a07022899cbffef Mon Sep 17 00:00:00 2001 From: Arthur Bols Date: Tue, 27 Feb 2018 11:36:47 +0100 Subject: [PATCH] small changes --- .gitignore | 3 ++- src/Main.java | 15 +++++++++++++++ src/Worm.java | 8 ++------ 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 03b69e2..41de925 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,7 @@ local.properties .settings/ .loadpath .recommenders - +META-INF/ # External tool builders .externalToolBuilders/ @@ -122,3 +122,4 @@ https://github.com/joeblau/gitignore.io/issues/360 .idea/ *.iml # End of https://www.gitignore.io/api/eclipse,intellij+all +out/ diff --git a/src/Main.java b/src/Main.java index a0428da..89a9d64 100644 --- a/src/Main.java +++ b/src/Main.java @@ -1,6 +1,21 @@ +import java.io.Console; + public class Main { public static void main(String[] args) { System.out.println("Hello World!"); + Console console = System.console(); + double input = Double.parseDouble(console.readLine("Enter your %d (th) passport number: ", 2)); + System.out.println(input); + System.out.println((int)input); + } + + private static int minRadius = 50; + private static double radius; + public static void setRadius(double radius2) { + if (radius2 < minRadius) { + throw new IllegalArgumentException("Radius is smaller than " + minRadius); + } + radius = radius2; } } diff --git a/src/Worm.java b/src/Worm.java index 966c580..9ec2812 100644 --- a/src/Worm.java +++ b/src/Worm.java @@ -10,7 +10,7 @@ public class Worm { // shape private double radius; - private double minRadius; + private final double minRadius; // mass private double mass; @@ -104,7 +104,7 @@ public class Worm { public void setRadius(double radius) { if (radius < this.minRadius) { - throw new IllegalArgumentException(); + throw new IllegalArgumentException("Radius is smaller than " + this.minRadius); } this.radius = radius; setMass(radius); @@ -114,10 +114,6 @@ public class Worm { return this.minRadius; } - public void setMinRadius(double minRadius) { - this.minRadius = minRadius; - } - public double getMass() { return this.mass; }