Merge branch 'master' of https://gitlab.principis.be/OGP/worms
This commit is contained in:
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user