Fixed format, added println for cooking degrees and refactored burnt exception

This commit is contained in:
Ron Nabuurs 2016-05-12 09:45:23 +02:00
parent bfc36e8b6e
commit 97be05236b
3 changed files with 32 additions and 31 deletions

View file

@ -0,0 +1,12 @@
package org.drtshock;
/**
* An exception to describe that something went wrong with our oven!
*/
public class BurntException extends Exception {
public BurntException(int degrees) {
super("Potato is badly burnt by trying to boil it at " + degrees + " degrees!!");
}
}

View file

@ -100,35 +100,36 @@ public class Potato implements Tuber {
return false;
}
}
/**
/**
* Checks if this potato is cooked. Returns the result of {@link #hasBeenBoiledInWater()}.
*
* @return true if this potato is baked, false if otherwise
*/
public boolean isCooked() {
try{
return this.hasBeenBoiledInWater();
} catch (PotatoBurntException e){
return false;
}
try {
return this.hasBeenBoiledInWater();
} catch (BurntException e) {
return false;
}
}
/**
/**
* Checks if the potato is succesfully boiled at the right amount of degrees.
*
* @return true if the potato has succesfully been boiled, false if otherwise
* @throws PotatoBurntException if the potato has been burned during the process of cooking
* @throws BurntException if the potato has been burned during the process of cooking
*/
public boolean hasBeenBoiledInWater() throws PotatoBurntException{
int waterDegrees = (int)(Math.random()*200);
if(waterDegrees<70){
return false;
} else if(waterDegrees>130){
throw new PotatoBurntException(waterDegrees);
}
return true;
}
public boolean hasBeenBoiledInWater() throws BurntException {
int waterDegrees = (int) (Math.random() * 200);
System.out.println("Trying to boil potato at " + waterDegrees + " degrees.");
if (waterDegrees < 70) {
return false;
} else if (waterDegrees > 130) {
throw new BurntException(waterDegrees);
}
return true;
}
/**
* Checks if this potato is delicious. Returns the result of {@link #isBaked()}.

View file

@ -1,12 +0,0 @@
package org.drtshock;
/**
* An exception to describe that something went wrong with our oven!
*/
public class PotatoBurntException extends Exception {
public PotatoBurntException(int degrees) {
super("Potato is badly burnt by trying to boil it at "+degrees+" degrees!!");
}
}