From bca99208b92d3f0afff63ecfa665a38ed8673b6d Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Thu, 26 Feb 2015 16:05:54 +0100
Subject: x

---
 Week4/src/oo15loipe/Punt.java | 77 +++++++++++++++++++++++++++++++++++++++++++
 Week4/src/week4/Punt.java     | 71 ---------------------------------------
 2 files changed, 77 insertions(+), 71 deletions(-)
 create mode 100644 Week4/src/oo15loipe/Punt.java
 delete mode 100644 Week4/src/week4/Punt.java

(limited to 'Week4')

diff --git a/Week4/src/oo15loipe/Punt.java b/Week4/src/oo15loipe/Punt.java
new file mode 100644
index 0000000..1939c45
--- /dev/null
+++ b/Week4/src/oo15loipe/Punt.java
@@ -0,0 +1,77 @@
+package oo15loipe;
+
+/**
+ * Een Punt in 2D
+ * @author pieter koopman
+ */
+ 
+public class Punt {
+    private int x, y;
+
+    /**
+     * de gewone constructor
+     * @param i: x
+     * @param j; y
+     */
+    public Punt(int i, int j) {
+        x = i;
+        y = j;
+    }
+    
+    /**
+     * copy constructor
+     * @param p 
+     */
+    public Punt (Punt p) {
+        if (p != null) {
+            x = p.x;
+            y = p.y;
+        } else {
+            x = y = 0;
+        }
+    }
+    
+    /**
+     * getter voor x
+     * @return x
+     */
+    public int getX (){
+        return x;
+    }
+    
+    /**
+     * getter voor y
+     * @return y
+     */
+    public int getY (){
+        return y;
+    }
+    
+    /**
+     * equals methode vergelijkt x en y
+     * @param o
+     * @return 
+     */
+    @Override
+    public boolean equals(Object o) {
+        if (o != null && o instanceof Punt) {
+            Punt p = (Punt) o;
+            return x == p.x && y == p.y;
+        } else {
+            return false;
+        }
+    }
+    
+    /**
+     * Punt naar String conversie
+     * @return Strin met waarde van x en y
+     */
+    @Override
+    public String toString () {
+        return "(" + x + "," + y + ")";
+    }
+    
+    public Punt add(Punt plus) {
+        return new Punt(x + plus.getX(), y + plus.getY());
+    }
+}
diff --git a/Week4/src/week4/Punt.java b/Week4/src/week4/Punt.java
deleted file mode 100644
index daaddd6..0000000
--- a/Week4/src/week4/Punt.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * Een Punt in 2D
- * @author pieter koopman
- */
- 
-public class Punt {
-    private int x, y;
-
-    /**
-     * de gewone constructor
-     * @param i: x
-     * @param j; y
-     */
-    public Punt(int i, int j) {
-        x = i;
-        y = j;
-    }
-    
-    /**
-     * copy constructor
-     * @param p 
-     */
-    public Punt (Punt p) {
-        if (p != null) {
-            x = p.x;
-            y = p.y;
-        } else {
-            x = y = 0;
-        }
-    }
-    
-    /**
-     * getter voor x
-     * @return x
-     */
-    public int getX (){
-        return x;
-    }
-    
-    /**
-     * getter voor y
-     * @return y
-     */
-    public int getY (){
-        return y;
-    }
-    
-    /**
-     * equals methode vergelijkt x en y
-     * @param o
-     * @return 
-     */
-    @Override
-    public boolean equals(Object o) {
-        if (o != null && o instanceof Punt) {
-            Punt p = (Punt) o;
-            return x == p.x && y == p.y;
-        } else {
-            return false;
-        }
-    }
-    
-    /**
-     * Punt naar String conversie
-     * @return Strin met waarde van x en y
-     */
-    @Override
-    public String toString () {
-        return "(" + x + "," + y + ")";
-    }
-}
-- 
cgit v1.2.3