merged and working

Bonus.java

@@ -13,19 +13,10 @@ public class Bonus
        * @param number
        * @return the factorial of the number
        */
-      public int factorial(int curNum/**
-                     * Below are method calls to the TrigFunction class
-                     *//**
-                     * Below are method calls to the TrigFunction class
-                     *//**
-                     * Below are method calls to the TrigFunction class
-                     *//**
-                     * Below are method calls to the TrigFunction class
-                     *//**
-                     * Below are method calls to the TrigFunction class
-                     */){
-          int fact = 1;
-          for(int i = 1; i <= number; i++)
+      public static double factorial(double curNum)
+      {
+          double fact = 1;
+          for(double i = 1; i <= curNum; i++)
           {
               fact *= i;
           }

Console.java

@@ -122,14 +122,14 @@ public class Console {
             " 'q' : quit\n" +
             " 'l' : legend\n" +
         // Trig Functions
-            " 's' : sin" +
-            " 'x' : cosine" +
-            " 't' : tangent" +
-            " 'w' : inverse sine" +
-            " 'e' : inverse cosine" +
-            " 'r' : inverse tangent" +
+            " 's' : sin\n" +
+            " 'x' : cosine\n" +
+            " 't' : tangent\n" +
+           /* " 'w' : inverse sine\n" +
+            " 'e' : inverse cosine\n" +
+            " 'r' : inverse tangent\n" +*/
         //Bonus Functions
-            " 'f' : factorial"
+            " 'f' : factorial\n"
         );            
     }
 /*

MainApplication.java

@@ -150,6 +150,7 @@ public class MainApplication {
                     case 't':
                     currentNum = trig.tangent(currentNum);
                     break;
+                    /*
                     case 'w':
                     currentNum = trig.inverseSign(currentNum);
                     break;
@@ -159,11 +160,13 @@ public class MainApplication {
                     case 'r':
                     currentNum = trig.inverseTangent(currentNum);
                     break;
+                    */
                     /**
                      * Below are method calls to the Bonus class
                      */
-                    case 'b':
+                    case 'f':
                     currentNum = bonus.factorial((int) currentNum);
+                    break;
                     default:
                     Console.errorOperator();
                 }

TrigFunctions.java

@@ -10,7 +10,7 @@ public class TrigFunctions
         return sinValue;
     }
 
-    public static double cos(double curNum){
+    public static double cosine(double curNum){
         double degrees= curNum;
         double radians= Math.toRadians(degrees);
         double cosValue= Math.cos(radians);
@@ -18,7 +18,7 @@ public class TrigFunctions
         return cosValue;
     }
 
-    public static double tan(double curNum){
+    public static double tangent(double curNum){
         double degrees= curNum;
         double radians= Math.toRadians(degrees);
         double tanValue= Math.tan(radians);

package.bluej

@@ -1,32 +1,38 @@
 #BlueJ package file
-dependency1.from=CalculatorTest
-dependency1.to=Calculator
+dependency1.from=ConsoleTest
+dependency1.to=Console
 dependency1.type=UsesDependency
-dependency2.from=ConsoleTest
-dependency2.to=Console
+dependency2.from=CalculatorTest
+dependency2.to=Calculator
 dependency2.type=UsesDependency
 dependency3.from=MainApplication
 dependency3.to=Calculator
 dependency3.type=UsesDependency
 dependency4.from=MainApplication
-dependency4.to=Console
+dependency4.to=TrigFunctions
 dependency4.type=UsesDependency
-editor.fx.0.height=864
-editor.fx.0.width=1330
-editor.fx.0.x=353
-editor.fx.0.y=-930
+dependency5.from=MainApplication
+dependency5.to=Bonus
+dependency5.type=UsesDependency
+dependency6.from=MainApplication
+dependency6.to=Console
+dependency6.type=UsesDependency
+editor.fx.0.height=722
+editor.fx.0.width=800
+editor.fx.0.x=240
+editor.fx.0.y=24
 objectbench.height=93
 objectbench.width=1160
 package.divider.horizontal=0.5989473684210527
-package.divider.vertical=0.8620689655172413
-package.editor.height=618
+package.divider.vertical=0.8493975903614458
+package.editor.height=557
 package.editor.width=1058
-package.editor.x=-207
-package.editor.y=-938
-package.frame.height=783
+package.editor.x=10
+package.editor.y=23
+package.frame.height=722
 package.frame.width=1184
-package.numDependencies=4
-package.numTargets=5
+package.numDependencies=6
+package.numTargets=7
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -59,16 +65,30 @@ target3.width=80
 target3.x=150
 target3.y=210
 target4.height=50
-target4.name=ConsoleTest
+target4.name=Bonus
 target4.showInterface=false
-target4.type=UnitTestTargetJunit4
+target4.type=ClassTarget
 target4.width=80
-target4.x=180
-target4.y=180
+target4.x=120
+target4.y=10
 target5.height=50
-target5.name=MainApplication
+target5.name=TrigFunctions
 target5.showInterface=false
 target5.type=ClassTarget
-target5.width=120
-target5.x=70
-target5.y=70
+target5.width=110
+target5.x=10
+target5.y=130
+target6.height=50
+target6.name=ConsoleTest
+target6.showInterface=false
+target6.type=UnitTestTargetJunit4
+target6.width=80
+target6.x=180
+target6.y=180
+target7.height=50
+target7.name=MainApplication
+target7.showInterface=false
+target7.type=ClassTarget
+target7.width=120
+target7.x=70
+target7.y=70