revised calc

Main.ctxt

@@ -1,6 +0,0 @@
-#BlueJ class context
-comment0.target=Main
-comment0.text=\n\ Write\ a\ description\ of\ class\ Main\ here.\n\n\ @author\ (your\ name)\n\ @version\ (a\ version\ number\ or\ a\ date)\n
-comment1.params=args
-comment1.target=void\ main(java.lang.String[])
-numComments=2

Main.java

@@ -1,26 +0,0 @@
-import java.util.Scanner;
-/**
- * Write a description of class Main here.
- *
- * @author (your name)
- * @version (a version number or a date)
- */
-public class Main
-{
-    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:"); 
-        short n1 = (short) reader.nextInt();
-        System.out.println("Input the second number:");
-        short n2 = (short) reader.nextInt();
-        ShortCalculator calc = new ShortCalculator(n1,n2);
-        
-        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());
-    }
-}

ShortCalculator.ctxt

@@ -1,7 +1,7 @@
 #BlueJ class context
 comment0.target=ShortCalculator
-comment1.params=x\ y
-comment1.target=ShortCalculator(short,\ short)
+comment1.params=args
+comment1.target=void\ main(java.lang.String[])
 comment2.params=
 comment2.target=short\ sum()
 comment3.params=

ShortCalculator.java

@@ -2,35 +2,45 @@
 import java.util.Scanner;
 
 public class ShortCalculator {
-    private short n1;
-    private short n2;
-    
-    public ShortCalculator(short x, short y) {
-        this.n1 = x;
-        this.n2 = y;
+    private static int x;
+    private static int 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();
+        System.out.println("Input the second number:");
+        y = (short) reader.nextInt();
+        
+        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());
     }
     
-    public short sum() {
-        return (short) (n1 + n2);
+    public static short sum() {
+        return (short) (x + y);
     }
     
-    public short difference() {
-        return (short) (n1 - n2);
+    public static short difference() {
+        return (short) (x / y);
     }
     
-    public short product() {
-        return (short) (n1 * n2);
+    public static short product() {
+        return (short) (x * y);
     }
     
-    public short quotient() {
-        return (short) (n1 / n2);
+    public static short quotient() {
+        return (short) (x / y);
     }
     
-    public short remainder() {
-        return (short) (n1 % n2);
+    public static short remainder() {
+        return (short) (x % y);
     }
     
-    public void printLine(String operation, short value) {
+    public static void printLine(String operation, short value) {
         System.out.println(operation + ": " + value); 
     }
 }