iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BAEL-3506 - Refactoring.

This commit is contained in:
BudBak 2019-11-24 13:33:18 +05:30
parent c68e465576
commit 3bcb5ce809
2 changed files with 29 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
java-math-2/src/main/java/com/baeldung/maths/calculator/basic/BasicCalculatorIfElse.java → core-java-modules/core-java-lang-math/src/main/java/com/baeldung/calculator/basic/BasicCalculatorIfElse.java
View File

@ -1,4 +1,4 @@
package com.baeldung.maths.calculator.basic;
package com.baeldung.calculator.basic;
import java.util.InputMismatchException;
import java.util.Scanner;
@ -7,19 +7,14 @@ public class BasicCalculatorIfElse {
public static void main(String[] args) {
System.out.println("---------------------------------- \n" +
"Welcome to Basic Calculator \n" +
"----------------------------------");
System.out.println("Following operations are supported : \n" +
"1. Addition (+) \n" +
"2. Subtraction (-) \n" +
"3. Multiplication (* OR x) \n" +
"4. Division (/) \n");
System.out.println("---------------------------------- \n" + "Welcome to Basic Calculator \n" + "----------------------------------");
System.out.println("Following operations are supported : \n" + "1. Addition (+) \n" + "2. Subtraction (-) \n" + "3. Multiplication (* OR x) \n" + "4. Division (/) \n");
Scanner scanner = new Scanner(System.in);
try {
System.out.println("Enter an operator: (+ OR - OR * OR /) ");
char operation = scanner.next().charAt(0);
char operation = scanner.next()
.charAt(0);
if (!(operation == '+' || operation == '-' || operation == '*' || operation == 'x' || operation == '/')) {
System.err.println("Invalid Operator. Please use only + or - or * or /");

54
java-math-2/src/main/java/com/baeldung/maths/calculator/basic/BasicCalculatorSwitchCase.java → core-java-modules/core-java-lang-math/src/main/java/com/baeldung/calculator/basic/BasicCalculatorSwitchCase.java
View File

@ -1,4 +1,4 @@
package com.baeldung.maths.calculator.basic;
package com.baeldung.calculator.basic;
import java.util.InputMismatchException;
import java.util.Scanner;
@ -6,19 +6,14 @@ import java.util.Scanner;
public class BasicCalculatorSwitchCase {
public static void main(String[] args) {
System.out.println("---------------------------------- \n"
+ "Welcome to Basic Calculator \n"
+ "----------------------------------");
System.out.println("Following operations are supported : \n" +
"1. Addition (+) \n" +
"2. Subtraction (-) \n" +
"3. Multiplication (* OR x) \n" +
"4. Division (/) \n");
System.out.println("---------------------------------- \n" + "Welcome to Basic Calculator \n" + "----------------------------------");
System.out.println("Following operations are supported : \n" + "1. Addition (+) \n" + "2. Subtraction (-) \n" + "3. Multiplication (* OR x) \n" + "4. Division (/) \n");
Scanner scanner = new Scanner(System.in);
try {
System.out.println("Enter an operator: (+ OR - OR * OR /) ");
char operation = scanner.next().charAt(0);
char operation = scanner.next()
.charAt(0);
if (!(operation == '+' || operation == '-' || operation == '*' || operation == 'x' || operation == '/')) {
System.err.println("Invalid Operator. Please use only + or - or * or /");
@ -35,24 +30,24 @@ public class BasicCalculatorSwitchCase {
}
switch (operation) {
case '+':
System.out.println(num1 + " + " + num2 + " = " + (num1 + num2));
break;
case '-':
System.out.println(num1 + " - " + num2 + " = " + (num1 - num2));
break;
case '*':
System.out.println(num1 + " x " + num2 + " = " + (num1 * num2));
break;
case 'x':
System.out.println(num1 + " x " + num2 + " = " + (num1 * num2));
break;
case '/':
System.out.println(num1 + " / " + num2 + " = " + (num1 / num2));
break;
default:
System.err.println("Invalid Operator Specified.");
break;
case '+':
System.out.println(num1 + " + " + num2 + " = " + (num1 + num2));
break;
case '-':
System.out.println(num1 + " - " + num2 + " = " + (num1 - num2));
break;
case '*':
System.out.println(num1 + " x " + num2 + " = " + (num1 * num2));
break;
case 'x':
System.out.println(num1 + " x " + num2 + " = " + (num1 * num2));
break;
case '/':
System.out.println(num1 + " / " + num2 + " = " + (num1 / num2));
break;
default:
System.err.println("Invalid Operator Specified.");
break;
}
} catch (InputMismatchException exc) {
System.err.println(exc.getMessage());
@ -60,5 +55,4 @@ public class BasicCalculatorSwitchCase {
scanner.close();
}
}
}
}