Cleanup, checked UML class diagram, added diagram to TeX

1 files changed, 9 insertions, 9 deletions

diff --git a/Week9/src/com/camilstaps/shop/User.java b/Week9/src/com/camilstaps/shop/User.java
index 5696a60..12cfd4d 100644
--- a/Week9/src/com/camilstaps/shop/User.java
+++ b/Week9/src/com/camilstaps/shop/User.java
@@ -51,11 +51,19 @@ public class User extends DatabaseItem {
         return cart;
     }
     
+    public void setBlocked(boolean set) {
+        isBlocked = set;
+    }
+    
+    public boolean isBlocked() {
+        return isBlocked;
+    }
+    
     public Set<Article> getArticles() {
         Set<Article> articles = Database.getInstance().getArticles();
         Set<Article> result = new HashSet<>();
         for (Article a : articles) {
-            if (a.getUser().getNr().equals(nr)) {
+            if (a.getOwner().getNr().equals(nr)) {
                 result.add(a);
             }
         }
@@ -73,14 +81,6 @@ public class User extends DatabaseItem {
         return result;
     }
     
-    public void setBlocked(boolean set) {
-        isBlocked = set;
-    }
-    
-    public boolean isBlocked() {
-        return isBlocked;
-    }
-    
     /**
      * Set a random new password for the user
      * @return the new password