calc revised again

ShortCalculator.ctxt

@@ -1,17 +1,19 @@
 #BlueJ class context
 comment0.target=ShortCalculator
-comment1.params=args
-comment1.target=void\ main(java.lang.String[])
-comment2.params=
-comment2.target=short\ sum()
+comment1.params=x\ y
+comment1.target=ShortCalculator(int,\ int)
+comment2.params=args
+comment2.target=void\ main(java.lang.String[])
 comment3.params=
-comment3.target=short\ difference()
+comment3.target=short\ sum()
 comment4.params=
-comment4.target=short\ product()
+comment4.target=short\ difference()
 comment5.params=
-comment5.target=short\ quotient()
+comment5.target=short\ product()
 comment6.params=
-comment6.target=short\ remainder()
-comment7.params=operation\ value
-comment7.target=void\ printLine(java.lang.String,\ short)
-numComments=8
+comment6.target=short\ quotient()
+comment7.params=
+comment7.target=short\ remainder()
+comment8.params=operation\ value
+comment8.target=void\ printLine(java.lang.String,\ short)
+numComments=9

ShortCalculator.java

@@ -2,45 +2,52 @@
 import java.util.Scanner;
 
 public class ShortCalculator {
-    private static int x;
-    private static int y;
+    private int x;
+    private int y;
+    
+    public ShortCalculator(int x, int y) {
+        this.x = x;
+        this.y = y;
+    }
+    
     public static void main(String[] args) {
         Scanner reader = new Scanner(System.in);
 
         System.out.println("Enter two numbers between 0 and 65535");
         System.out.println("Input the first number:"); 
-        x = (short) reader.nextInt();
+        int n1 = reader.nextInt();
         System.out.println("Input the second number:");
-        y = (short) reader.nextInt();
+        int n2 = reader.nextInt();
+        ShortCalculator calc = new ShortCalculator(n1, n2);
         
-        ShortCalculator.printLine("Sum", ShortCalculator.sum());
-        ShortCalculator.printLine("Difference", ShortCalculator.difference());
-        ShortCalculator.printLine("Product", ShortCalculator.product());
-        ShortCalculator.printLine("Quotient", ShortCalculator.quotient());
-        ShortCalculator.printLine("Remainder", ShortCalculator.remainder());
+        calc.printLine("Sum", calc.sum());
+        calc.printLine("Difference", calc.difference());
+        calc.printLine("Product", calc.product());
+        calc.printLine("Quotient", calc.quotient());
+        calc.printLine("Remainder", calc.remainder());
     }
     
-    public static short sum() {
+    public short sum() {
         return (short) (x + y);
     }
     
-    public static short difference() {
+    public short difference() {
         return (short) (x / y);
     }
     
-    public static short product() {
+    public short product() {
         return (short) (x * y);
     }
     
-    public static short quotient() {
+    public short quotient() {
         return (short) (x / y);
     }
     
-    public static short remainder() {
+    public short remainder() {
         return (short) (x % y);
     }
     
-    public static void printLine(String operation, short value) {
+    public void printLine(String operation, short value) {
         System.out.println(operation + ": " + value); 
     }
 }

package.bluej

@@ -2,19 +2,19 @@
 dependency1.from=LargestIntegerTest
 dependency1.to=LargestInteger
 dependency1.type=UsesDependency
-dependency2.from=NormalizeAngleTest
-dependency2.to=NormalizeAngle
+dependency2.from=FactorialTest
+dependency2.to=Factorial
 dependency2.type=UsesDependency
-dependency3.from=FactorialTest
-dependency3.to=Factorial
+dependency3.from=IntegerPrinterTest
+dependency3.to=IntegerPrinter
 dependency3.type=UsesDependency
-dependency4.from=IntegerPrinterTest
-dependency4.to=IntegerPrinter
+dependency4.from=NormalizeAngleTest
+dependency4.to=NormalizeAngle
 dependency4.type=UsesDependency
 editor.fx.0.height=722
 editor.fx.0.width=800
-editor.fx.0.x=1048
-editor.fx.0.y=298
+editor.fx.0.x=592
+editor.fx.0.y=316
 objectbench.height=101
 objectbench.width=653
 package.divider.horizontal=0.6