Skip to content

Commit 67032e4

Browse files
authored
Merge pull request #1 from charnaexw/master
Added the start of switch.
2 parents 3bf3e26 + 3f110d2 commit 67032e4

File tree

4 files changed

+16
-0
lines changed

4 files changed

+16
-0
lines changed

src/main/java/com/zipcodewilmington/scientificcalculator/Calculator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ public int subtract(int firstNum, int secondNum) {
1212
result = firstNum - secondNum;
1313
return result;
1414
}
15+
1516
}

src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorEngine.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,6 @@ public static Integer getIntegerInput(String prompt) {
3535
public static Double getDoubleInput(String prompt) {
3636
return null;
3737
}
38+
39+
3840
}

src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorInterface.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public String menuOption1(String prompt) {
5050
int x = Calculator.sum(y, z);
5151
System.out.println(x);
5252

53+
String
5354

5455
String s = CalculatorEngine.getStringInput("Enter a string");
5556

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package com.zipcodewilmington.scientificcalculator;
2+
3+
import com.sun.codemodel.internal.JSwitch;
4+
5+
public class Scientific {
6+
7+
public static Double triganometry(firstNum, secondNum)
8+
9+
switch (operator)(
10+
case "cos":
11+
)
12+
}

0 commit comments

Comments
 (0)