From 4aa7a2acdb7b4cd58cdac12a50d971a720301968 Mon Sep 17 00:00:00 2001
From: Andrew Moore <admoore9@gmail.com>
Date: Thu, 7 May 2015 15:48:45 -0500
Subject: [PATCH] Some random changes by me

---
 src/main/java/com/team1/chat/interfaces/UserInterface.java | 4 +---
 src/main/java/com/team1/chat/models/ChatService.java       | 2 +-
 src/main/java/com/team1/chat/models/User.java              | 7 +------
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/team1/chat/interfaces/UserInterface.java b/src/main/java/com/team1/chat/interfaces/UserInterface.java
index 697c15b..a9ac804 100644
--- a/src/main/java/com/team1/chat/interfaces/UserInterface.java
+++ b/src/main/java/com/team1/chat/interfaces/UserInterface.java
@@ -21,7 +21,7 @@ public interface UserInterface
     String getPassword();
 
     // Iteration 2
-    boolean addPrivateChannel(Channel c);
+    boolean addChannel(Channel c);
 
     boolean deleteChannel(Channel c);
 
@@ -52,8 +52,6 @@ public interface UserInterface
 
     boolean declineChannelInvite(Channel c);
 
-    String getPublicName();
-
     String getCurrentChannel();
 
     boolean setCurrentChannel(String uid, String cname);
diff --git a/src/main/java/com/team1/chat/models/ChatService.java b/src/main/java/com/team1/chat/models/ChatService.java
index 52cad40..d50d522 100644
--- a/src/main/java/com/team1/chat/models/ChatService.java
+++ b/src/main/java/com/team1/chat/models/ChatService.java
@@ -262,7 +262,7 @@ public boolean createChannel(String cname, String aid)
             {
             	return false;
             }
-            u.addPrivateChannel(c);
+            u.addChannel(c);
             c.whiteListUser(aid, u);
 
             return this.getDatabaseSupportInstance().putChannel(c) &&
diff --git a/src/main/java/com/team1/chat/models/User.java b/src/main/java/com/team1/chat/models/User.java
index bf789eb..73f2a84 100644
--- a/src/main/java/com/team1/chat/models/User.java
+++ b/src/main/java/com/team1/chat/models/User.java
@@ -54,11 +54,6 @@ public String getId()
         return uid;
     }
 
-    public String getPublicName()
-    {
-        return publicName;
-    }
-
     public String getUsername()
     {
         return username;
@@ -263,7 +258,7 @@ public boolean setCurrentChannel(String uid, String cname){
      * @param c Channel to add
      * @return true on success
      */
-    public boolean addPrivateChannel(Channel c)
+    public boolean addChannel(Channel c)
     {
         privateChannels.add(c.getName());
         return true;