Revert "more merging"

This reverts commit d9716f3560f5ff19b204b842df951e88e8f809f4.

Client/Client.iml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -10,10 +10,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-<<<<<<< HEAD
 
-=======
->>>>>>> parent of decda75... ugh
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.6" level="project" />

Client/pom.xml

@@ -29,7 +29,4 @@
             <version>4.12</version>
             <scope>test</scope>
         </dependency>
-
-    </dependencies>
-
 </project>

Client/src/main/java/SimpleShell.java

@@ -1,6 +1,8 @@
+import com.sun.tools.javac.tree.Pretty;
 import ids.Id;
 import ids.IdController;
 import message.MessageController;
+import message.PrettyPrintMessage;
 import shellutilities.YouAreEll;
 
 import java.io.BufferedReader;
@@ -67,8 +69,10 @@ public class SimpleShell {
 
                 // messages - all messages
                 if (commands[0].equals("message")) {
-                    MessageController mc = new MessageController(commands);
-                    mc.messageController();
+//                    MessageController mc = new MessageController(commands);
+//                    mc.messageController();
+                    YouAreEll webber =  new YouAreEll();
+                    PrettyPrintMessage.prettyPrintMessageArray(webber.get_messages());
                     continue;
                 }
                 // you need to add a bunch more.

Client/src/main/java/message/MessageController.java

@@ -8,7 +8,7 @@ import java.io.IOException;
 
 public class MessageController {
     private YouAreEll url;
-    private final String MAIN_URL = "/message";
+    private final String MAIN_URL = "/messages";
     private Console c;
     private String[] userLine;
     private int size;
@@ -20,8 +20,14 @@ public class MessageController {
         size = userLine.length;
     }
 
-    public void messageController() throws IOException {
+    /*
+    messagees - returns last 20 messages
+    messages your_github_id - last 20 sent to you
+    send your_github_id "Hello World" - sends to everyone
+    send your_github_id 'my string message' to some_friend_githubid
+     */
 
+    public void messageController() throws IOException {
         PrettyPrintMessage.prettyPrintMessageArray(get_messages());
     }
 
@@ -30,4 +36,10 @@ public class MessageController {
         return url.MakeURLCall(MAIN_URL, RequestType.GET, "");
     }
 
+    private String getMessagesToMe() {
+
+
+        return null;
+    }
+
 }

Client/src/main/java/message/PrettyPrintMessage.java

@@ -13,9 +13,9 @@ public class PrettyPrintMessage {
         ObjectMapper mapper = new ObjectMapper();
         mapper.registerModule(new JsonOrgModule());
 
-        List<Message> idArray = mapper.readValue(output, new TypeReference<List<Message>>(){});
+        List<Message> messageArray = mapper.readValue(output, new TypeReference<List<Message>>(){});
 
-        System.out.println(idArray.toString());
+        System.out.println(messageArray.toString());
 
     }
     //

Client/src/main/java/shellutilities/YouAreEll.java

@@ -7,6 +7,7 @@ import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.methods.HttpPut;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.HttpClientBuilder;
+import sun.net.www.http.HttpClient;
 
 import java.io.BufferedReader;
 import java.io.IOException;