DEMO CALC

Calculator.java

@@ -28,7 +28,7 @@ public class Calculator{
             Scanner input1 = new Scanner(System.in);
             System.out.println("What do you want to do?");
 
-            toDo = input1.next();
+            toDo = input1.nextLine();
 
             if (toDo.equalsIgnoreCase("quit")){
                 off = true;
@@ -55,11 +55,12 @@ public class Calculator{
                     case "tangent" :
                     case "inverse tangent" :
                     case "inverse" :
+                    case "roundTo" :
 
                     System.out.println(toDo + " -- Enter first number:");
                     num1 = input1.nextDouble();
                     //System.out.println("num1 is: " + num1);
-
+                }
                     switch (toDo){
                         case "add":
                         case "subtract":
@@ -219,7 +220,7 @@ public class Calculator{
                         result = Memory.memClear();
                         Memory.printAns(String.valueOf(result));
                         break;
-                        
+
                         case "roundTo":
                         memory = result;
                         calc.roundTo(memory, (int)num1);
@@ -231,6 +232,5 @@ public class Calculator{
         }
 
     }
-}
 
-    
+

MathMethods.java

@@ -83,7 +83,7 @@ public class MathMethods
                 "You're cushing it!", "You're a coding rockstar!", 
                 "Keep coding!"};  
         int arrIndex = rand.nextInt(6);
-        System.out.println(arrIndex);
+     
         return wiseWords[arrIndex];
     }
 

README-CheckItOut.txt.rtf

@@ -0,0 +1,18 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1561\cocoasubrtf600
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+{\*\expandedcolortbl;;}
+\margl1440\margr1440\vieww10800\viewh8400\viewkind0
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
+
+\f0\fs24 \cf0 Team: Calc Crew\
+	\
+	Seth Abrams\
+	Nathan Hall\
+	Maggie Pierce\
+	\
+\
+Additional Features:\
+- Fortune Cookie\
+- Random Number\
+- Rounding}

package.bluej

@@ -1,79 +1,35 @@
 #BlueJ package file
-<<<<<<< HEAD
-<<<<<<< HEAD
-dependency1.from=Calculator
-dependency1.to=MathMethods
+dependency1.from=MemoryTest
+dependency1.to=Memory
 dependency1.type=UsesDependency
-dependency2.from=MathMethods
-dependency2.to=Calculator
+dependency2.from=MathMethodsTest
+dependency2.to=MathMethods
 dependency2.type=UsesDependency
-dependency3.from=MathMethodsTest
-dependency3.to=MathMethods
-dependency3.type=UsesDependency
-editor.fx.0.height=816
-editor.fx.0.width=889
-editor.fx.0.x=513
-editor.fx.0.y=23
-objectbench.height=80
-objectbench.width=480
-package.divider.horizontal=0.5997536945812808
-package.divider.vertical=0.8838451268357811
-package.editor.height=655
-package.editor.width=706
-package.editor.x=0
-package.editor.y=23
-package.frame.height=807
-package.frame.width=832
-package.numDependencies=3
-package.numTargets=3
-=======
-dependency1.from=MathMethodsTest
-dependency1.to=MathMethods
-dependency1.type=UsesDependency
-dependency2.from=MemoryTest
-dependency2.to=Memory
-dependency2.type=UsesDependency
-dependency3.from=Calculator
-dependency3.to=MathMethods
+dependency3.from=MathMethods
+dependency3.to=Calculator
 dependency3.type=UsesDependency
 dependency4.from=Calculator
-dependency4.to=Memory
+dependency4.to=MathMethods
 dependency4.type=UsesDependency
-editor.fx.0.height=814
-editor.fx.0.width=1191
-editor.fx.0.x=201
-editor.fx.0.y=-974
-objectbench.height=80
-objectbench.width=595
-package.divider.horizontal=0.5993322203672788
-package.divider.vertical=0.8465608465608465
-package.editor.height=473
-package.editor.width=493
-package.editor.x=-188
-package.editor.y=-610
-package.frame.height=625
-=======
-dependency1.from=Calculator
-dependency1.to=MathMethods
-dependency1.type=UsesDependency
-editor.fx.0.height=722
-editor.fx.0.width=800
-editor.fx.0.x=0
-editor.fx.0.y=132
-objectbench.height=205
+dependency5.from=Calculator
+dependency5.to=Memory
+dependency5.type=UsesDependency
+editor.fx.0.height=967
+editor.fx.0.width=1106
+editor.fx.0.x=115
+editor.fx.0.y=-945
+objectbench.height=203
 objectbench.width=595
 package.divider.horizontal=0.6
-package.divider.vertical=0.6849925705794948
-package.editor.height=454
+package.divider.vertical=0.6856287425149701
+package.editor.height=451
 package.editor.width=493
 package.editor.x=35
 package.editor.y=23
-package.frame.height=731
->>>>>>> a0c06052a8de50df57cd0a41d73ffc3f9ce302c2
+package.frame.height=726
 package.frame.width=619
-package.numDependencies=4
+package.numDependencies=5
 package.numTargets=5
->>>>>>> 2a9a289e4239250cd6e2f776f8cc64f1130c5a52
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -83,78 +39,37 @@ readme.width=47
 readme.x=10
 readme.y=10
 target1.height=50
-<<<<<<< HEAD
 target1.name=MemoryTest
-=======
-target1.name=Calculator
->>>>>>> a0c06052a8de50df57cd0a41d73ffc3f9ce302c2
 target1.showInterface=false
-<<<<<<< HEAD
-target1.type=ClassTarget
-<<<<<<< HEAD
-target1.width=140
-target1.x=80
-target1.y=200
-target2.height=50
-target2.name=MathMethodsTest
-target2.showInterface=false
-target2.type=UnitTestTargetJunit4
-target2.width=110
-target2.x=270
-target2.y=310
-target3.association=MathMethodsTest
-target3.height=50
-target3.name=MathMethods
-target3.showInterface=false
-target3.type=ClassTarget
-target3.width=110
-target3.x=240
-target3.y=340
-=======
 target1.type=UnitTestTargetJunit4
-target1.width=80
-target1.x=400
-target1.y=140
-target2.association=MemoryTest
+target1.width=100
+target1.x=150
+target1.y=10
 target2.height=50
 target2.name=Memory
 target2.showInterface=false
 target2.type=ClassTarget
 target2.width=80
-target2.x=370
-target2.y=170
+target2.x=200
+target2.y=70
 target3.height=50
 target3.name=Calculator
 target3.showInterface=false
 target3.type=ClassTarget
-target3.width=90
-target3.x=220
-target3.y=80
+target3.width=120
+target3.x=70
+target3.y=70
 target4.height=50
 target4.name=MathMethodsTest
 target4.showInterface=false
 target4.type=UnitTestTargetJunit4
-target4.width=110
-target4.x=90
-target4.y=250
-target5.association=MathMethodsTest
+target4.width=140
+target4.x=10
+target4.y=130
 target5.height=50
 target5.name=MathMethods
 target5.showInterface=false
 target5.type=ClassTarget
 target5.width=110
-target5.x=60
-target5.y=280
->>>>>>> 2a9a289e4239250cd6e2f776f8cc64f1130c5a52
-=======
-target1.width=120
-target1.x=70
-target1.y=70
-target2.height=50
-target2.name=MathMethods
-target2.showInterface=false
-target2.type=ClassTarget
-target2.width=110
-target2.x=80
-target2.y=200
->>>>>>> a0c06052a8de50df57cd0a41d73ffc3f9ce302c2
+target5.x=80
+target5.y=200