From 8068b292cfdaaea2941dd769cbc522b862ec756d Mon Sep 17 00:00:00 2001
From: NorbiPeti <szatmari.norbert.peter@gmail.com>
Date: Tue, 2 Aug 2016 15:10:39 +0200
Subject: [PATCH] Fixes

---
 .../chat/server/data/LoaderCollection.java         | 14 +++++++++++++-
 .../norbipeti/chat/server/data/LoaderIterator.java |  2 --
 .../norbipeti/chat/server/db/domain/User.java      |  1 -
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/io/github/norbipeti/chat/server/data/LoaderCollection.java b/src/io/github/norbipeti/chat/server/data/LoaderCollection.java
index 1b251fe..f07ab44 100644
--- a/src/io/github/norbipeti/chat/server/data/LoaderCollection.java
+++ b/src/io/github/norbipeti/chat/server/data/LoaderCollection.java
@@ -14,6 +14,7 @@ public class LoaderCollection<T extends ChatDatabaseEntity> implements List<T>,
 	private static final long serialVersionUID = 5426152406394894301L;
 	private List<Long> contacts;
 	private Class<T> cl;
+	private transient boolean forsave = false;
 
 	/**
 	 * Only used for serialization
@@ -39,7 +40,10 @@ public class LoaderCollection<T extends ChatDatabaseEntity> implements List<T>,
 
 	@Override
 	public Iterator<T> iterator() {
-		return new LoaderIterator<T>(contacts.iterator(), cl);
+		if (forsave)
+			return contacts.iterator(); // TODO: Fix
+		else
+			return new LoaderIterator<T>(contacts.iterator(), cl);
 	}
 
 	@Override
@@ -205,4 +209,12 @@ public class LoaderCollection<T extends ChatDatabaseEntity> implements List<T>,
 		sb.append("]");
 		return sb.toString();
 	}
+
+	public boolean isForsave() {
+		return forsave;
+	}
+
+	public void setForsave(boolean forsave) {
+		this.forsave = forsave;
+	}
 }
diff --git a/src/io/github/norbipeti/chat/server/data/LoaderIterator.java b/src/io/github/norbipeti/chat/server/data/LoaderIterator.java
index bf73a2b..99ad816 100644
--- a/src/io/github/norbipeti/chat/server/data/LoaderIterator.java
+++ b/src/io/github/norbipeti/chat/server/data/LoaderIterator.java
@@ -1,8 +1,6 @@
 package io.github.norbipeti.chat.server.data;
 
 import java.util.Iterator;
-import java.util.ListIterator;
-
 import io.github.norbipeti.chat.server.db.domain.ChatDatabaseEntity;
 
 public final class LoaderIterator<T extends ChatDatabaseEntity> implements Iterator<T> {
diff --git a/src/io/github/norbipeti/chat/server/db/domain/User.java b/src/io/github/norbipeti/chat/server/db/domain/User.java
index 25a9f55..2c625f0 100644
--- a/src/io/github/norbipeti/chat/server/db/domain/User.java
+++ b/src/io/github/norbipeti/chat/server/db/domain/User.java
@@ -1,7 +1,6 @@
 package io.github.norbipeti.chat.server.db.domain;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;