diff --git a/src/main/java/edu/ntnu/idatt2001/Wargames/battlesimulation/battle/ArmyFiles.java b/src/main/java/edu/ntnu/idatt2001/Wargames/battlesimulation/battle/ArmyFiles.java index 75bbeb026d1496b5c48d061feaf414e0f3aae044..f3f0c2ff0b8600d1e8b3470e82cc8f7acdde0233 100644 --- a/src/main/java/edu/ntnu/idatt2001/Wargames/battlesimulation/battle/ArmyFiles.java +++ b/src/main/java/edu/ntnu/idatt2001/Wargames/battlesimulation/battle/ArmyFiles.java @@ -1,10 +1,8 @@ package edu.ntnu.idatt2001.Wargames.battlesimulation.battle; import edu.ntnu.idatt2001.Wargames.battlesimulation.controllers.SimulationSingleton; -import edu.ntnu.idatt2001.Wargames.battlesimulation.maintnance.PopupBoxes; import edu.ntnu.idatt2001.Wargames.battlesimulation.specificunits.Unit; import javafx.stage.FileChooser; - import java.io.File; import java.io.FileWriter; import java.io.IOException; @@ -13,7 +11,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -120,11 +117,12 @@ public class ArmyFiles { /** * method used for checking for illegal characters which can corrupt a file + * * @param lines a line from the file * @return true if the line doesn't consist of illegal characters * @throws IllegalArgumentException if an illegal character is found */ - public static boolean checkForCharacters(String lines) throws IllegalArgumentException{ + public static boolean checkForCharacters(String lines) throws IllegalArgumentException { String[] columns = lines.split(","); for (String column : columns) { String checkForIllegal = "[a-zA-Z0-9]+"; @@ -142,9 +140,8 @@ public class ArmyFiles { * checks if string consist of numbers * * @param lines string to be checked - * @return true or false depending on outcome */ - public boolean checkInputForIntegers(String lines) { + public void checkInputForIntegers(String lines) { String chekIfInt = "[0-9]+"; Pattern pt = Pattern.compile(chekIfInt); Matcher mt = pt.matcher(lines); @@ -152,6 +149,5 @@ public class ArmyFiles { if (!mt.matches()) { throw new IllegalArgumentException("Health value in file is a String, not a Integer"); } - return true; } }