1 files changed, 29 insertions, 0 deletions
diff --git a/oop/06-static-properties/Calculator.java b/oop/06-static-properties/Calculator.java
new file mode 100644
index 0000000..7ec2851
--- /dev/null
+++ b/oop/06-static-properties/Calculator.java
@@ -0,0 +1,29 @@
+
+public class Calculator {
+	public static int x; // static (class) field
+	public int y; // instance field
+	
+	public static int add(int a, int b) { // static (class) method
+		return a + b;
+	}
+	
+	public static int subtract(int a, int b) {  // static (class) method
+		return a - b;
+	}
+	
+	public static double convertFromC2F(double cTemp) {  // static (class) method
+		return cTemp*180/100 + 32.0;
+	}
+	
+	public void setY(int y) { // instance method
+		this.y = y;
+	}
+	
+	public int getXxY() { // instance method
+		return x * y;
+	}
+	
+//	public static int getXxY2() {
+//		return x * y;
+//	}
+}