Merge remote-tracking branch 'origin/master'

src/main/java/fr/insa/clavardator/users/UserList.java

@@ -195,14 +195,6 @@ public class UserList {
 		}
 	}
 
-	public Map<Integer, PeerUser> getActiveUsers() {
-		return activeUsers;
-	}
-
-	public Map<Integer, PeerUser> getInactiveUsers() {
-		return inactiveUsers;
-	}
-
 	public interface UserConnectionCallback {
 		void onUserConnected(PeerUser user);
 	}

src/main/java/fr/insa/clavardator/util/ErrorHandler.java

@@ -1,27 +0,0 @@
-package fr.insa.clavardator.util;
-
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeSupport;
-
-@Deprecated
-public class ErrorHandler {
-	private ErrorHandler() {}
-
-	// Make this class observable
-	private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
-	public void addObserver(PropertyChangeListener listener) { pcs.addPropertyChangeListener(listener); }
-	public void removeObserver(PropertyChangeListener listener) { pcs.removePropertyChangeListener(listener); }
-
-	private static ErrorHandler instance;
-
-	public static ErrorHandler getInstance() {
-		if (instance == null)
-			instance = new ErrorHandler();
-		return instance;
-	}
-
-
-	public void notifyError(Exception exception) {
-		pcs.firePropertyChange("exception", null, exception);
-	}
-}