All test pass and also got done the ShortCalculator

LargestInteger.ctxt

@@ -1,7 +1,7 @@
-#BlueJ class context
-comment0.target=LargestInteger
-comment1.params=integers
-comment1.target=java.lang.Integer\ findLargestNumberUsingConditional(java.lang.Integer[])
-comment2.params=integers
-comment2.target=java.lang.Integer\ findLargestNumberUsingMathMax(java.lang.Integer[])
-numComments=3
+#BlueJ class context
+comment0.target=LargestInteger
+comment1.params=integers
+comment1.target=java.lang.Integer\ findLargestNumberUsingConditional(java.lang.Integer[])
+comment2.params=integers
+comment2.target=java.lang.Integer\ findLargestNumberUsingMathMax(java.lang.Integer[])
+numComments=3

LargestIntegerTest.ctxt

@@ -1,9 +1,9 @@
-#BlueJ class context
-comment0.target=LargestIntegerTest
-comment1.params=
-comment1.target=void\ setUp()
-comment2.params=
-comment2.target=void\ findLargestNumberUsingConditionalTest()
-comment3.params=
-comment3.target=void\ findLargestNumberUsingMathMaxTest()
-numComments=4
+#BlueJ class context
+comment0.target=LargestIntegerTest
+comment1.params=
+comment1.target=void\ setUp()
+comment2.params=
+comment2.target=void\ findLargestNumberUsingConditionalTest()
+comment3.params=
+comment3.target=void\ findLargestNumberUsingMathMaxTest()
+numComments=4

NormalizeAngle.ctxt

@@ -1,9 +1,9 @@
-#BlueJ class context
-comment0.target=NormalizeAngle
-comment1.params=angle
-comment1.target=java.lang.Integer\ normalizeValueUsingModulo(java.lang.Integer)
-comment2.params=integer
-comment2.target=java.lang.Integer\ normalizeValueUsingFloorMod(java.lang.Integer)
-comment3.params=args
-comment3.target=void\ main(java.lang.String[])
-numComments=4
+#BlueJ class context
+comment0.target=NormalizeAngle
+comment1.params=angle
+comment1.target=java.lang.Integer\ normalizeValueUsingModulo(java.lang.Integer)
+comment2.params=integer
+comment2.target=java.lang.Integer\ normalizeValueUsingFloorMod(java.lang.Integer)
+comment3.params=args
+comment3.target=void\ main(java.lang.String[])
+numComments=4

NormalizeAngle.java

@@ -4,11 +4,11 @@
 public class NormalizeAngle {
 
     public Integer normalizeValueUsingModulo(Integer angle){
-        return 0;
+        return angle % 360;
     }
 
     public Integer normalizeValueUsingFloorMod(Integer integer){
-        return 0;
+        return Math.floorMod(integer, 360);
     }
 
     public static void main(String[] args){

NormalizeAngleTest.ctxt

@@ -1,9 +1,9 @@
-#BlueJ class context
-comment0.target=NormalizeAngleTest
-comment1.params=
-comment1.target=void\ setUp()
-comment2.params=
-comment2.target=void\ normalizeValueUsingModuloTest()
-comment3.params=
-comment3.target=void\ normalizeValueUsingFloorModTest()
-numComments=4
+#BlueJ class context
+comment0.target=NormalizeAngleTest
+comment1.params=
+comment1.target=void\ setUp()
+comment2.params=
+comment2.target=void\ normalizeValueUsingModuloTest()
+comment3.params=
+comment3.target=void\ normalizeValueUsingFloorModTest()
+numComments=4

ShortCalculator.ctxt

@@ -1,5 +1,7 @@
-#BlueJ class context
-comment0.target=ShortCalculator
-comment1.params=
-comment1.target=void\ ShortCalculator()
-numComments=2
+#BlueJ class context
+comment0.target=ShortCalculator
+comment1.params=
+comment1.target=void\ ShortCalculator()
+comment2.params=num
+comment2.target=boolean\ isInRange(short)
+numComments=3

ShortCalculator.java

@@ -3,70 +3,55 @@ import java.util.Scanner;
 
 public class ShortCalculator {
 
-
-    public static short S1;
-
-    public static short S2;
-
-
-    public static short sum;
-
-    public static short diff;
-
-    public static short product;
-
-    public static short quotient;
-
-    public static short remainder;
-
-
-
-
-
     public static void ShortCalculator(){
 
+        short S1;
+        short S2;
+        short sum;
+        short diff;
+        short product;
+        short quotient;
+        short remainder;
+        
         Scanner scanner = new Scanner(System.in);
-
-        System.out.println("Enter your first Short: ");
-
-        S1 = scanner.nextShort();
-
-
-
-        System.out.println("Enter your Second Short: ");
-
-        S2 = scanner.nextShort();
-
-
-
-        System.out.println(S1);
-
-        System.out.println(S2);
-
-
-
-        sum       = (short) (S1 + S2);
-
-        diff      = (short) (S1 - S2);
-
-        product   = (short) (S1 * S2);
-
-        quotient  = (short) (S1 / S2);
-
-        remainder = (short) (S1 % S2);
-
-
-
-        System.out.println("Sum is " + sum);
-
-        System.out.println("Diff is " + diff);
-
-        System.out.println("Product is " + product);
-
-        System.out.println("Quotient is " + quotient);
-
-        System.out.println("Remainder is " + remainder);
-
-
+        
+        boolean looping = true;
+        while(looping){
+        
+            System.out.println("Enter your first Short: ");
+            S1 = scanner.nextShort();    
+            
+            System.out.println("Enter your Second Short: ");
+            S2 = scanner.nextShort();
+            
+            if(isInRange(S1) && isInRange(S2)){
+                looping =  false;
+                 
+                sum       = (short) (S1 + S2);
+                diff      = (short) (S1 - S2);
+                product   = (short) (S1 * S2);
+                quotient  = (short) (S1 / S2);
+                remainder = (short) (S1 % S2);
+
+                System.out.println("Sum is "       + sum + " \n");
+                System.out.println("Diff is "      + diff + " \n");
+                System.out.println("Product is "   + product + " \n");
+                System.out.println("Quotient is "  + quotient + " \n");
+                System.out.println("Remainder is " + remainder + " \n");
+      
+            } else {
+                System.out.print("Both Number enter Must be inbetween 0 and 65535\n");
+            }
+        
+        }
+    }
+        
+    private static boolean isInRange(short num){
+        if(num > 0 && num < 65535){
+            return true;
+        } else {
+            return false;
         }
+    }
+        
 }

ShortCalculatorTest.ctxt

@@ -1,3 +1,3 @@
-#BlueJ class context
-comment0.target=ShortCalculatorTest
-numComments=1
+#BlueJ class context
+comment0.target=ShortCalculatorTest
+numComments=1

ShortCalculatorTest.java

@@ -1,5 +1,3 @@
  
-
-
 public class ShortCalculatorTest {
 }

package.bluej

@@ -1,107 +1,107 @@
-#BlueJ package file
-dependency1.from=LargestIntegerTest
-dependency1.to=LargestInteger
-dependency1.type=UsesDependency
-dependency2.from=NormalizeAngleTest
-dependency2.to=NormalizeAngle
-dependency2.type=UsesDependency
-dependency3.from=FactorialTest
-dependency3.to=Factorial
-dependency3.type=UsesDependency
-dependency4.from=IntegerPrinterTest
-dependency4.to=IntegerPrinter
-dependency4.type=UsesDependency
-editor.fx.0.height=22
-editor.fx.0.width=0
-editor.fx.0.x=40
-editor.fx.0.y=685
-objectbench.height=94
-objectbench.width=501
-package.divider.horizontal=0.6334164588528678
-package.divider.vertical=0.7765486725663717
-package.editor.height=344
-package.editor.width=680
-package.editor.x=556
-package.editor.y=63
-package.frame.height=510
-package.frame.width=822
-package.numDependencies=4
-package.numTargets=10
-package.showExtends=true
-package.showUses=true
-project.charset=UTF-8
-readme.height=58
-readme.name=@README
-readme.width=47
-readme.x=10
-readme.y=10
-target1.height=50
-target1.name=Factorial
-target1.showInterface=false
-target1.type=ClassTarget
-target1.width=80
-target1.x=160
-target1.y=10
-target10.height=50
-target10.name=IntegerPrinterTest
-target10.showInterface=false
-target10.type=UnitTestTargetJunit4
-target10.width=140
-target10.x=10
-target10.y=370
-target2.height=50
-target2.name=NormalizeAngle
-target2.showInterface=false
-target2.type=ClassTarget
-target2.width=120
-target2.x=70
-target2.y=70
-target3.height=50
-target3.name=IntegerPrinter
-target3.showInterface=false
-target3.type=ClassTarget
-target3.width=110
-target3.x=10
-target3.y=130
-target4.height=50
-target4.name=ShortCalculator
-target4.showInterface=false
-target4.type=ClassTarget
-target4.width=120
-target4.x=130
-target4.y=130
-target5.height=50
-target5.name=LargestInteger
-target5.showInterface=false
-target5.type=ClassTarget
-target5.width=120
-target5.x=10
-target5.y=190
-target6.height=50
-target6.name=LargestIntegerTest
-target6.showInterface=false
-target6.type=UnitTestTargetJunit4
-target6.width=140
-target6.x=250
-target6.y=190
-target7.height=50
-target7.name=ShortCalculatorTest
-target7.showInterface=false
-target7.type=ClassTarget
-target7.width=150
-target7.x=10
-target7.y=250
-target8.height=50
-target8.name=NormalizeAngleTest
-target8.showInterface=false
-target8.type=UnitTestTargetJunit4
-target8.width=150
-target8.x=10
-target8.y=310
-target9.height=50
-target9.name=FactorialTest
-target9.showInterface=false
-target9.type=UnitTestTargetJunit4
-target9.width=110
-target9.x=410
-target9.y=260
+#BlueJ package file
+dependency1.from=FactorialTest
+dependency1.to=Factorial
+dependency1.type=UsesDependency
+dependency2.from=IntegerPrinterTest
+dependency2.to=IntegerPrinter
+dependency2.type=UsesDependency
+dependency3.from=LargestIntegerTest
+dependency3.to=LargestInteger
+dependency3.type=UsesDependency
+dependency4.from=NormalizeAngleTest
+dependency4.to=NormalizeAngle
+dependency4.type=UsesDependency
+editor.fx.0.height=0
+editor.fx.0.width=0
+editor.fx.0.x=0
+editor.fx.0.y=0
+objectbench.height=155
+objectbench.width=868
+package.divider.horizontal=0.6334164588528678
+package.divider.vertical=0.7635036496350365
+package.editor.height=516
+package.editor.width=778
+package.editor.x=280
+package.editor.y=61
+package.frame.height=785
+package.frame.width=908
+package.numDependencies=4
+package.numTargets=10
+package.showExtends=true
+package.showUses=true
+project.charset=UTF-8
+readme.height=58
+readme.name=@README
+readme.width=47
+readme.x=10
+readme.y=10
+target1.height=50
+target1.name=Factorial
+target1.showInterface=false
+target1.type=ClassTarget
+target1.width=80
+target1.x=160
+target1.y=10
+target10.height=50
+target10.name=IntegerPrinterTest
+target10.showInterface=false
+target10.type=UnitTestTargetJunit4
+target10.width=140
+target10.x=10
+target10.y=370
+target2.height=50
+target2.name=NormalizeAngle
+target2.showInterface=false
+target2.type=ClassTarget
+target2.width=130
+target2.x=70
+target2.y=70
+target3.height=50
+target3.name=IntegerPrinter
+target3.showInterface=false
+target3.type=ClassTarget
+target3.width=110
+target3.x=10
+target3.y=130
+target4.height=50
+target4.name=ShortCalculator
+target4.showInterface=false
+target4.type=ClassTarget
+target4.width=120
+target4.x=130
+target4.y=130
+target5.height=50
+target5.name=LargestInteger
+target5.showInterface=false
+target5.type=ClassTarget
+target5.width=120
+target5.x=10
+target5.y=190
+target6.height=50
+target6.name=LargestIntegerTest
+target6.showInterface=false
+target6.type=UnitTestTargetJunit4
+target6.width=140
+target6.x=250
+target6.y=190
+target7.height=50
+target7.name=ShortCalculatorTest
+target7.showInterface=false
+target7.type=ClassTarget
+target7.width=150
+target7.x=10
+target7.y=250
+target8.height=50
+target8.name=FactorialTest
+target8.showInterface=false
+target8.type=UnitTestTargetJunit4
+target8.width=100
+target8.x=410
+target8.y=260
+target9.height=50
+target9.name=NormalizeAngleTest
+target9.showInterface=false
+target9.type=UnitTestTargetJunit4
+target9.width=150
+target9.x=10
+target9.y=310