From 0c25d47b364bddd166ac7874824a40be86fb5b54 Mon Sep 17 00:00:00 2001 From: sgoudham Date: Mon, 12 Oct 2020 20:46:21 +0100 Subject: [PATCH] Moving directories --- .../New Calc Engine/src/Adder.java | 28 ---- .../New Calc Engine/src/CalculateBase.java | 43 ------ .../New Calc Engine/src/Divider.java | 13 -- .../New Calc Engine/src/DynamicHelper.java | 29 ---- .../New Calc Engine/src/MathEquation.java | 109 --------------- .../New Calc Engine/src/MathOperation.java | 6 - .../New Calc Engine/src/MathProcessing.java | 9 -- .../New Calc Engine/src/Multiplier.java | 13 -- .../New Calc Engine/src/NewCalcEngine.java | 125 ------------------ .../New Calc Engine/src/PowerOf.java | 21 --- .../New Calc Engine/src/Subtractor.java | 13 -- Personal/Interfaces/Animals/src/Animal.java | 9 -- .../Interfaces/Animals/src/AnimalHelper.java | 38 ------ .../Interfaces/Animals/src/AnimalMain.java | 17 --- Personal/Interfaces/Animals/src/Cat.java | 20 --- Personal/Interfaces/Animals/src/Cow.java | 20 --- Personal/Interfaces/Animals/src/Dog.java | 20 --- Personal/Interfaces/Animals/src/Horse.java | 20 --- Personal/Interfaces/Counter/src/ByFives.java | 18 --- Personal/Interfaces/Counter/src/ByFours.java | 18 --- Personal/Interfaces/Counter/src/ByOnes.java | 18 --- Personal/Interfaces/Counter/src/ByThrees.java | 18 --- Personal/Interfaces/Counter/src/ByTwos.java | 18 --- Personal/Interfaces/Counter/src/Counter.java | 7 - .../Interfaces/Counter/src/CounterHelper.java | 34 ----- .../Interfaces/Counter/src/CounterMain.java | 40 ------ 26 files changed, 724 deletions(-) delete mode 100644 Java Classes & Interfaces/New Calc Engine/src/Adder.java delete mode 100644 Java Classes & Interfaces/New Calc Engine/src/CalculateBase.java delete mode 100644 Java Classes & Interfaces/New Calc Engine/src/Divider.java delete mode 100644 Java Classes & Interfaces/New Calc Engine/src/DynamicHelper.java delete mode 100644 Java Classes & Interfaces/New Calc Engine/src/MathEquation.java delete mode 100644 Java Classes & Interfaces/New Calc Engine/src/MathOperation.java delete mode 100644 Java Classes & Interfaces/New Calc Engine/src/MathProcessing.java delete mode 100644 Java Classes & Interfaces/New Calc Engine/src/Multiplier.java delete mode 100644 Java Classes & Interfaces/New Calc Engine/src/NewCalcEngine.java delete mode 100644 Java Classes & Interfaces/New Calc Engine/src/PowerOf.java delete mode 100644 Java Classes & Interfaces/New Calc Engine/src/Subtractor.java delete mode 100644 Personal/Interfaces/Animals/src/Animal.java delete mode 100644 Personal/Interfaces/Animals/src/AnimalHelper.java delete mode 100644 Personal/Interfaces/Animals/src/AnimalMain.java delete mode 100644 Personal/Interfaces/Animals/src/Cat.java delete mode 100644 Personal/Interfaces/Animals/src/Cow.java delete mode 100644 Personal/Interfaces/Animals/src/Dog.java delete mode 100644 Personal/Interfaces/Animals/src/Horse.java delete mode 100644 Personal/Interfaces/Counter/src/ByFives.java delete mode 100644 Personal/Interfaces/Counter/src/ByFours.java delete mode 100644 Personal/Interfaces/Counter/src/ByOnes.java delete mode 100644 Personal/Interfaces/Counter/src/ByThrees.java delete mode 100644 Personal/Interfaces/Counter/src/ByTwos.java delete mode 100644 Personal/Interfaces/Counter/src/Counter.java delete mode 100644 Personal/Interfaces/Counter/src/CounterHelper.java delete mode 100644 Personal/Interfaces/Counter/src/CounterMain.java diff --git a/Java Classes & Interfaces/New Calc Engine/src/Adder.java b/Java Classes & Interfaces/New Calc Engine/src/Adder.java deleted file mode 100644 index 6f96fdc..0000000 --- a/Java Classes & Interfaces/New Calc Engine/src/Adder.java +++ /dev/null @@ -1,28 +0,0 @@ -public class Adder extends CalculateBase implements MathProcessing { - - public Adder() {} - - public Adder(double leftVal, double rightVal) { - super(leftVal, rightVal); - } - - @Override - public void calculate() { - setResult(getLeftVal() + getRightVal()); - } - - // Using interfaces - @Override - public String getKeyWord() { - return "add"; - } - - @Override - public double doCalculation(double leftVal, double rightVal) { - setLeftVal(leftVal); - setRightVal(rightVal); - calculate(); - - return getResult(); - } -} diff --git a/Java Classes & Interfaces/New Calc Engine/src/CalculateBase.java b/Java Classes & Interfaces/New Calc Engine/src/CalculateBase.java deleted file mode 100644 index 87a8515..0000000 --- a/Java Classes & Interfaces/New Calc Engine/src/CalculateBase.java +++ /dev/null @@ -1,43 +0,0 @@ -public abstract class CalculateBase { - private double leftVal; - private double rightVal; - private double result; - - public abstract void calculate(); - - public CalculateBase() {} - - public CalculateBase(double leftVal, double rightVal) { - this.leftVal = leftVal; - this.rightVal = rightVal; - } - - // Getters and setters - public double getLeftVal() { - return leftVal; - } - - public void setLeftVal(double leftVal) { - this.leftVal = leftVal; - } - - public double getRightVal() { - return rightVal; - } - - public void setRightVal(double rightVal) { - this.rightVal = rightVal; - } - - public double getResult() { - return result; - } - - public void setResult(double result) { - this.result = result; - } - - - - -} diff --git a/Java Classes & Interfaces/New Calc Engine/src/Divider.java b/Java Classes & Interfaces/New Calc Engine/src/Divider.java deleted file mode 100644 index 1e14def..0000000 --- a/Java Classes & Interfaces/New Calc Engine/src/Divider.java +++ /dev/null @@ -1,13 +0,0 @@ -public class Divider extends CalculateBase { - - public Divider() {} - - public Divider(double leftVal, double rightVal) { - super(leftVal, rightVal); - } - - @Override - public void calculate() { - setResult(getLeftVal() / getRightVal()); - } -} diff --git a/Java Classes & Interfaces/New Calc Engine/src/DynamicHelper.java b/Java Classes & Interfaces/New Calc Engine/src/DynamicHelper.java deleted file mode 100644 index b6b3791..0000000 --- a/Java Classes & Interfaces/New Calc Engine/src/DynamicHelper.java +++ /dev/null @@ -1,29 +0,0 @@ -public class DynamicHelper { - - private final MathProcessing[] handlers; - - public DynamicHelper(MathProcessing[] handlers) { - this.handlers = handlers; - } - - public void process(String statement) { - String[] parts = statement.split(MathProcessing.SEPARATOR); - String keyword = parts[0]; - double leftVal = Double.parseDouble(parts[1]); - double rightVal = Double.parseDouble(parts[2]); - - MathProcessing theHandler = null; - for(MathProcessing handler : handlers) { - if(keyword.equalsIgnoreCase(handler.getKeyWord())) { - theHandler = handler; - break; - } - } - - double result = theHandler.doCalculation(leftVal, rightVal); - if (theHandler.doFormatting() != null) - System.out.println(theHandler.doFormatting()); - else - System.out.println("result = " + result); - } -} diff --git a/Java Classes & Interfaces/New Calc Engine/src/MathEquation.java b/Java Classes & Interfaces/New Calc Engine/src/MathEquation.java deleted file mode 100644 index dbe2e3d..0000000 --- a/Java Classes & Interfaces/New Calc Engine/src/MathEquation.java +++ /dev/null @@ -1,109 +0,0 @@ -public class MathEquation { - private double leftVal; - private double rightVal; - private char opCode; - private double result; - - private static int numOfCalculations; - private static double sumOfResults; - - // Empty constructor to allow us to use MathEquation without needing to pass in anything - public MathEquation() {} - - // This only exists as a demo for chaining constructors - public MathEquation(char opCode) { - this.opCode = opCode; - } - - // Demonstrating how chaining constructors works - public MathEquation(char opCode, double leftVal, double rightVal) { - this(opCode); - this.leftVal = leftVal; - this.rightVal = rightVal; - } - - // Method to execute the calculations - public void execute() { - switch (this.opCode) { - case 'a': - this.result = this.leftVal + this.rightVal; - break; - case 's': - this.result = this.leftVal - this.rightVal; - break; - case 'm': - this.result = this.leftVal * this.rightVal; - break; - case 'd': - this.result = this.rightVal != 0 ? this.leftVal / this.rightVal : 0.0d; - break; - default: - System.out.println("Invalid opCode: " + this.opCode); - this.result = 0.0d; - break; - } - numOfCalculations++; - sumOfResults += result; - } - - public void execute(double leftVal, double rightVal) { - this.leftVal = leftVal; - this.rightVal = rightVal; - - execute(); - } - - public void execute(int leftVal, int rightVal) { - this.leftVal = leftVal; - this.rightVal = rightVal; - - execute(); - - result = (int) result; - } - - public static double getAverageResult() { - return sumOfResults / numOfCalculations; - } - - public MathEquation(double leftVal, double rightVal, char opCode, double result) { - this.leftVal = leftVal; - this.rightVal = rightVal; - this.opCode = opCode; - this.result = result; - } - - // Setters - - public double getLeftVal() { - return leftVal; - } - - public void setLeftVal(double leftVal) { - this.leftVal = leftVal; - } - - public double getRightVal() { - return rightVal; - } - - public void setRightVal(double rightVal) { - this.rightVal = rightVal; - } - - public char getOpCode() { - return opCode; - } - - public void setOpCode(char opCode) { - this.opCode = opCode; - } - - public double getResult() { - return result; - } - - public void setResult(double result) { - this.result = result; - } -} diff --git a/Java Classes & Interfaces/New Calc Engine/src/MathOperation.java b/Java Classes & Interfaces/New Calc Engine/src/MathOperation.java deleted file mode 100644 index 3c45c4a..0000000 --- a/Java Classes & Interfaces/New Calc Engine/src/MathOperation.java +++ /dev/null @@ -1,6 +0,0 @@ -public enum MathOperation { - ADD, - SUBTRACT, - DIVIDE, - MULTIPLY -} \ No newline at end of file diff --git a/Java Classes & Interfaces/New Calc Engine/src/MathProcessing.java b/Java Classes & Interfaces/New Calc Engine/src/MathProcessing.java deleted file mode 100644 index 18c0658..0000000 --- a/Java Classes & Interfaces/New Calc Engine/src/MathProcessing.java +++ /dev/null @@ -1,9 +0,0 @@ -public interface MathProcessing { - - String SEPARATOR = " "; - String getKeyWord(); - double doCalculation(double leftVal, double rightVal); - default String doFormatting() { - return null; - } -} diff --git a/Java Classes & Interfaces/New Calc Engine/src/Multiplier.java b/Java Classes & Interfaces/New Calc Engine/src/Multiplier.java deleted file mode 100644 index 8c3d00a..0000000 --- a/Java Classes & Interfaces/New Calc Engine/src/Multiplier.java +++ /dev/null @@ -1,13 +0,0 @@ -public class Multiplier extends CalculateBase { - - public Multiplier() {} - - public Multiplier(double leftVal, double rightVal) { - super(leftVal, rightVal); - } - - @Override - public void calculate() { - setResult(getLeftVal() * getRightVal()); - } -} diff --git a/Java Classes & Interfaces/New Calc Engine/src/NewCalcEngine.java b/Java Classes & Interfaces/New Calc Engine/src/NewCalcEngine.java deleted file mode 100644 index 84d8638..0000000 --- a/Java Classes & Interfaces/New Calc Engine/src/NewCalcEngine.java +++ /dev/null @@ -1,125 +0,0 @@ -import java.util.Scanner; - -public class NewCalcEngine { - - public static void main(String[] args) { - // performCalculations(); - // executeCalculations(); - // executeInteractively(); - dynamicInteractivity(); - } - - private static void dynamicInteractivity() { - DynamicHelper dynamicHelper = new DynamicHelper(new MathProcessing[] { - new Adder(), - new PowerOf() - }); - - Scanner in = new Scanner(System.in); - System.out.println("Enter In Your Operation Please: \n"); - String userInput = in.nextLine(); - in.close(); - - dynamicHelper.process(userInput); - - } - - private static void executeInteractively() { - Scanner in = new Scanner(System.in); - System.out.println("Please Enter In A Calculation: \n"); - String userInput = in.nextLine(); - in.close(); - - String parts[] = userInput.split(" "); - performOperation(parts); - - } - - private static void performOperation(String[] parts) { - MathOperation mathOperation = MathOperation.valueOf(parts[0].toUpperCase()); - double leftVal = Double.parseDouble(parts[1]); - double rightVal = Double.parseDouble(parts[2]); - - CalculateBase calculateBase = createCalculation(mathOperation, leftVal, rightVal); - calculateBase.calculate(); - System.out.println("\nOperation Performed: " + mathOperation); - System.out.println("Result: " + calculateBase.getResult()); - - } - - private static CalculateBase createCalculation(MathOperation mathOperation, double leftVal, double rightVal) { - CalculateBase calculation = null; - - switch (mathOperation) { - case ADD: - calculation = new Adder(leftVal, rightVal); - break; - case MULTIPLY: - calculation = new Multiplier(leftVal, rightVal); - break; - case DIVIDE: - calculation = new Divider(leftVal, rightVal); - break; - case SUBTRACT: - calculation = new Subtractor(leftVal, rightVal); - break; - } - - return calculation; - } - - private static void executeCalculations() { - CalculateBase[] calculations = { - new Divider(100.0d, 50.0d), - new Adder(25.0d, 92.0d), - new Subtractor(225.0d, 17.0d), - new Multiplier(11.0d, 3.0d) - }; - - System.out.println("Array Calculations"); - for (CalculateBase calculation: calculations) { - calculation.calculate(); - System.out.println("Result: " + calculation.getResult()); - } - } - - private static void doCalculation(CalculateBase calculate, double leftVal, double rightVal) { - - calculate.setLeftVal(leftVal); - calculate.setRightVal(rightVal); - calculate.calculate(); - System.out.println("The result of the calculation is: " + calculate.getResult()); - } - - private static void performCalculations() { - - MathEquation[] mathEquation = new MathEquation[4]; - mathEquation[0] = new MathEquation('d', 100.0d, 50.0d); - mathEquation[1] = new MathEquation('a', 25.0d, 92.0d); - mathEquation[2] = new MathEquation('s', 225.0d, 17.0d); - mathEquation[3] = new MathEquation('m', 11.0d, 3.0d); - - for (MathEquation equation : mathEquation) { - equation.execute(); - System.out.println("Result = " + equation.getResult()); - } - - System.out.println("Average Result = " + MathEquation.getAverageResult()); - - System.out.println("\nUsing Execute Method Overloads\n"); - - MathEquation mathEquationOverload = new MathEquation('d'); - double leftDouble = 9.0d; - double rightDouble = 4.0d; - - mathEquationOverload.execute(leftDouble, rightDouble); - System.out.println("Overloaded result with doubles: " + mathEquationOverload.getResult()); - - int leftInt = 9; - int rightInt = 4; - - mathEquationOverload.execute(leftInt, rightInt); - System.out.println("Overloaded result with ints: " + mathEquationOverload.getResult()); - - } -} \ No newline at end of file diff --git a/Java Classes & Interfaces/New Calc Engine/src/PowerOf.java b/Java Classes & Interfaces/New Calc Engine/src/PowerOf.java deleted file mode 100644 index e4521b3..0000000 --- a/Java Classes & Interfaces/New Calc Engine/src/PowerOf.java +++ /dev/null @@ -1,21 +0,0 @@ -public class PowerOf implements MathProcessing { - - private String formattedOutput; - - @Override - public String getKeyWord() { - return "power"; - } - - @Override - public String doFormatting() { - return formattedOutput; - } - - @Override - public double doCalculation(double leftVal, double rightVal) { - double product = Math.pow(leftVal, rightVal); - formattedOutput = leftVal + " Has Been Raised To The Power Of " + rightVal + " Which Results In: " + product; - return product; - } -} diff --git a/Java Classes & Interfaces/New Calc Engine/src/Subtractor.java b/Java Classes & Interfaces/New Calc Engine/src/Subtractor.java deleted file mode 100644 index e27933f..0000000 --- a/Java Classes & Interfaces/New Calc Engine/src/Subtractor.java +++ /dev/null @@ -1,13 +0,0 @@ -public class Subtractor extends CalculateBase { - - public Subtractor() {} - - public Subtractor(double leftVal, double rightVal) { - super(leftVal, rightVal); - } - - @Override - public void calculate() { - setResult(getLeftVal() - getRightVal()); - } -} diff --git a/Personal/Interfaces/Animals/src/Animal.java b/Personal/Interfaces/Animals/src/Animal.java deleted file mode 100644 index ae9a50c..0000000 --- a/Personal/Interfaces/Animals/src/Animal.java +++ /dev/null @@ -1,9 +0,0 @@ -package src; - -public interface Animal { - - String animalName(); - String animalSound(); - double animalPrice(); - -} diff --git a/Personal/Interfaces/Animals/src/AnimalHelper.java b/Personal/Interfaces/Animals/src/AnimalHelper.java deleted file mode 100644 index 299e23e..0000000 --- a/Personal/Interfaces/Animals/src/AnimalHelper.java +++ /dev/null @@ -1,38 +0,0 @@ -package src; - -public class AnimalHelper { - - private final Animal[] animals; - private double averagePrice; - - public AnimalHelper(Animal[] animals) { - this.animals = animals; - } - - public void displayInformation() { - /* Display the animal information */ - - int total = 0; - double sum = 0.0; - - for (Animal animal : animals) { - StringBuilder stringBuilder = new StringBuilder(); - - stringBuilder.append("\n\nName: " + animal.animalName()); - stringBuilder.append("\nSound: " + animal.animalSound()); - stringBuilder.append("\nPrice: £" + animal.animalPrice()); - - System.out.println(stringBuilder.toString()); - - total++; - sum += animal.animalPrice(); - } - averagePrice = sum / total; - } - - public void displayAveragePrice() { - /* Display the average price of all the animals */ - - System.out.printf("%nThe Average Price For All The Animals Are: £%.2f", averagePrice); - } -} diff --git a/Personal/Interfaces/Animals/src/AnimalMain.java b/Personal/Interfaces/Animals/src/AnimalMain.java deleted file mode 100644 index a2e158b..0000000 --- a/Personal/Interfaces/Animals/src/AnimalMain.java +++ /dev/null @@ -1,17 +0,0 @@ -package src; - -public class AnimalMain { - public static void main(String[] args) { - displayAnimals(); - } - - private static void displayAnimals() { - - // Creating an array of animal objects - AnimalHelper helper = new AnimalHelper(new Animal[] { new Cow(), new Cat(), new Dog(), new Horse() }); - - // Displaying information about the animals - helper.displayInformation(); - helper.displayAveragePrice(); - } -} diff --git a/Personal/Interfaces/Animals/src/Cat.java b/Personal/Interfaces/Animals/src/Cat.java deleted file mode 100644 index 427dda4..0000000 --- a/Personal/Interfaces/Animals/src/Cat.java +++ /dev/null @@ -1,20 +0,0 @@ -package src; - -public class Cat implements Animal { - - @Override - public String animalName() { - return "Cat"; - } - - @Override - public String animalSound() { - return "Meoooww"; - } - - @Override - public double animalPrice() { - return 29.99; - } - -} diff --git a/Personal/Interfaces/Animals/src/Cow.java b/Personal/Interfaces/Animals/src/Cow.java deleted file mode 100644 index bc36e69..0000000 --- a/Personal/Interfaces/Animals/src/Cow.java +++ /dev/null @@ -1,20 +0,0 @@ -package src; - -public class Cow implements Animal { - - @Override - public String animalName() { - return "Cow"; - } - - @Override - public String animalSound() { - return "Moooo"; - } - - @Override - public double animalPrice() { - return 10.99; - } - -} diff --git a/Personal/Interfaces/Animals/src/Dog.java b/Personal/Interfaces/Animals/src/Dog.java deleted file mode 100644 index 3a37d58..0000000 --- a/Personal/Interfaces/Animals/src/Dog.java +++ /dev/null @@ -1,20 +0,0 @@ -package src; - -public class Dog implements Animal { - - @Override - public String animalName() { - return "Dog"; - } - - @Override - public String animalSound() { - return "Woof Woof"; - } - - @Override - public double animalPrice() { - return 15.99; - } - -} diff --git a/Personal/Interfaces/Animals/src/Horse.java b/Personal/Interfaces/Animals/src/Horse.java deleted file mode 100644 index 548140e..0000000 --- a/Personal/Interfaces/Animals/src/Horse.java +++ /dev/null @@ -1,20 +0,0 @@ -package src; - -public class Horse implements Animal { - - @Override - public String animalName() { - return "Horse"; - } - - @Override - public String animalSound() { - return "Neighh"; - } - - @Override - public double animalPrice() { - return 59.99; - } - -} \ No newline at end of file diff --git a/Personal/Interfaces/Counter/src/ByFives.java b/Personal/Interfaces/Counter/src/ByFives.java deleted file mode 100644 index 13fd11e..0000000 --- a/Personal/Interfaces/Counter/src/ByFives.java +++ /dev/null @@ -1,18 +0,0 @@ -package src; - -public class ByFives implements Counter { - - private int num = 5; - private int nextNum; - - @Override - public int countBy() { - return num; - } - - @Override - public int getNextNum() { - return nextNum += num; - } - -} diff --git a/Personal/Interfaces/Counter/src/ByFours.java b/Personal/Interfaces/Counter/src/ByFours.java deleted file mode 100644 index 559e878..0000000 --- a/Personal/Interfaces/Counter/src/ByFours.java +++ /dev/null @@ -1,18 +0,0 @@ -package src; - -public class ByFours implements Counter { - - private int num = 4; - private int nextNum; - - @Override - public int countBy() { - return num; - } - - @Override - public int getNextNum() { - return nextNum += num; - } - -} diff --git a/Personal/Interfaces/Counter/src/ByOnes.java b/Personal/Interfaces/Counter/src/ByOnes.java deleted file mode 100644 index cf48515..0000000 --- a/Personal/Interfaces/Counter/src/ByOnes.java +++ /dev/null @@ -1,18 +0,0 @@ -package src; - -public class ByOnes implements Counter { - - private int num = 1; - private int nextNum; - - @Override - public int countBy() { - return num; - } - - @Override - public int getNextNum() { - return nextNum += num; - } - -} diff --git a/Personal/Interfaces/Counter/src/ByThrees.java b/Personal/Interfaces/Counter/src/ByThrees.java deleted file mode 100644 index b0d8f7b..0000000 --- a/Personal/Interfaces/Counter/src/ByThrees.java +++ /dev/null @@ -1,18 +0,0 @@ -package src; - -public class ByThrees implements Counter { - - private int num = 3; - private int nextNum; - - @Override - public int countBy() { - return num; - } - - @Override - public int getNextNum() { - return nextNum += num; - } - -} diff --git a/Personal/Interfaces/Counter/src/ByTwos.java b/Personal/Interfaces/Counter/src/ByTwos.java deleted file mode 100644 index e78024e..0000000 --- a/Personal/Interfaces/Counter/src/ByTwos.java +++ /dev/null @@ -1,18 +0,0 @@ -package src; - -public class ByTwos implements Counter { - - private int num = 2; - private int nextNum; - - @Override - public int countBy() { - return num; - } - - @Override - public int getNextNum() { - return nextNum += num; - } - -} diff --git a/Personal/Interfaces/Counter/src/Counter.java b/Personal/Interfaces/Counter/src/Counter.java deleted file mode 100644 index 2595bae..0000000 --- a/Personal/Interfaces/Counter/src/Counter.java +++ /dev/null @@ -1,7 +0,0 @@ -package src; - -public interface Counter { - - int countBy(); - int getNextNum(); -} diff --git a/Personal/Interfaces/Counter/src/CounterHelper.java b/Personal/Interfaces/Counter/src/CounterHelper.java deleted file mode 100644 index 2acec0a..0000000 --- a/Personal/Interfaces/Counter/src/CounterHelper.java +++ /dev/null @@ -1,34 +0,0 @@ -package src; - -public class CounterHelper { - - private Counter[] counters; - private Counter userCounter = null; - - public CounterHelper(Counter... counters) { - this.counters = counters; - } - - public void doInteractive(int userInput) { - - // Find the correct counter to count by. - // When no counter is found, display error message to user and quit the program - for (Counter counter: counters) { - if (userInput == counter.countBy()) - this.userCounter = counter; - } - if (userCounter == null) { - System.out.println("Counter Not Found"); - System.exit(0); - } - } - - public void displayCounter(int iterations) { - - // Show the counter for the number of iterations that the user inputted - System.out.println(); - for (int i = 0; i < iterations; i++) { - System.out.println(userCounter.getNextNum()); - } - } -} diff --git a/Personal/Interfaces/Counter/src/CounterMain.java b/Personal/Interfaces/Counter/src/CounterMain.java deleted file mode 100644 index f425d88..0000000 --- a/Personal/Interfaces/Counter/src/CounterMain.java +++ /dev/null @@ -1,40 +0,0 @@ -package src; - -import java.util.Scanner; - -public class CounterMain { - public static void main(String[] args) { - countUp(); - countUpInteractively(); - } - - private static void countUp() { - ByTwos twos = new ByTwos(); - ByFives fives = new ByFives(); - - // Display the first 5 numbers for each counter defined - for (int i = 0; i < 5; i++) { - System.out.println("Counting By " + twos.countBy()); - System.out.println(twos.getNextNum()); - System.out.println("Counting By " + fives.countBy()); - System.out.println(fives.getNextNum()); - } - } - - private static void countUpInteractively() { - Scanner in = new Scanner(System.in); - System.out.println("Enter In The Number That You Want To Count:\n"); - int userInput = in.nextInt(); - - CounterHelper helper = new CounterHelper(new ByOnes(), new ByTwos(), new ByThrees(), new ByFours(), - new ByFives()); - helper.doInteractive(userInput); - - System.out.println("Enter In The Number Of Times You Want To Count:\n"); - int userIterations = in.nextInt(); - - helper.displayCounter(userIterations); - in.close(); - - } -}