{"push_id":872564091,"size":17,"distinct_size":0,"ref":"refs/heads/master","head":"8d7a92c705daaa1885400301378d91cd72de3ff5","before":"cde7903e7f6cd32f33bef882be60f81fb1d70596","commits":[{"sha":"2472a87c2b6e5e56a1df7a0f600222ac2b2c574a","author":{"email":"63b97412aa33f10b7bae9901a22dafc67e4c7166@gmail.com","name":"Nathan Jent"},"message":"Updates to network message sending.\n Reflection seems to be working.","distinct":false,"url":"https://api.github.com/repos/rsanchez-wsu/fa15-ceg3120/commits/2472a87c2b6e5e56a1df7a0f600222ac2b2c574a"},{"sha":"0ec3c4c505051ed5c61ea2942ec6d0e66072425b","author":{"email":"63b97412aa33f10b7bae9901a22dafc67e4c7166@gmail.com","name":"Nathan Jent"},"message":"Merge remote-tracking branch 'remotes/origin/networking' into networking-chat\n\n# Conflicts:\n#\tcommon/src/edu/wright/cs/fa15/ceg3120/concon/common/net/ConConClient.java\n#\tcommon/src/edu/wright/cs/fa15/ceg3120/concon/common/net/ConConServer.java\n#\tcommon/src/edu/wright/cs/fa15/ceg3120/concon/common/net/NetworkManager.java\n#\tcommon/src/edu/wright/cs/fa15/ceg3120/concon/common/net/data/UserData.java\n#\tcommon/src/edu/wright/cs/fa15/ceg3120/concon/common/net/message/ChatMessage.java\n#\tcommon/src/edu/wright/cs/fa15/ceg3120/concon/common/net/message/DataRequestMessage.java\n#\tcommon/src/edu/wright/cs/fa15/ceg3120/concon/common/ui/ChatPanel.java","distinct":false,"url":"https://api.github.com/repos/rsanchez-wsu/fa15-ceg3120/commits/0ec3c4c505051ed5c61ea2942ec6d0e66072425b"},{"sha":"5242de67bc29c7a8cc09d76b92ea9f4619deefdb","author":{"email":"63b97412aa33f10b7bae9901a22dafc67e4c7166@gmail.com","name":"Nathan Jent"},"message":"Updated chat message client.\n Removed unused leftover classes.\n Message sending updated to use MeesageHolder class.","distinct":false,"url":"https://api.github.com/repos/rsanchez-wsu/fa15-ceg3120/commits/5242de67bc29c7a8cc09d76b92ea9f4619deefdb"},{"sha":"82ea087f6335f447ed5c5e8ba65dbdbfb0dd7f90","author":{"email":"63b97412aa33f10b7bae9901a22dafc67e4c7166@gmail.com","name":"Nathan Jent"},"message":"Fixed socket handling to pass messages between client and server.\nI set it up to break the socket input stream read loop when it came across the </java> end tag in the JavaBean XML. This allows multiple messages to be passed back and forth. There is still an issue with ending the message passing cleanly.\nLoginRequestMessage can be sent to the server and methods are invoked properly now.\nThe LoginRequestMessage invokes a method which returns a UserData object for the requested accountName.","distinct":false,"url":"https://api.github.com/repos/rsanchez-wsu/fa15-ceg3120/commits/82ea087f6335f447ed5c5e8ba65dbdbfb0dd7f90"},{"sha":"a711b47fe39c192731a878f91d9f98a9c919b5e3","author":{"email":"63b97412aa33f10b7bae9901a22dafc67e4c7166@gmail.com","name":"Nathan Jent"},"message":"Merge branch 'networking-chat' of https://github.com/rsanchez-wsu/fa15-ceg3120 into networking-chat\n\n# Conflicts:\n#\tcommon/src/edu/wright/cs/fa15/ceg3120/concon/common/net/message/ChatMessage.java\n#\tcommon/src/edu/wright/cs/fa15/ceg3120/concon/common/ui/ChatPanel.java","distinct":false,"url":"https://api.github.com/repos/rsanchez-wsu/fa15-ceg3120/commits/a711b47fe39c192731a878f91d9f98a9c919b5e3"},{"sha":"5a92ecc5377b70e7edf3b8b32d075f0b488b053b","author":{"email":"63b97412aa33f10b7bae9901a22dafc67e4c7166@gmail.com","name":"Nathan Jent"},"message":"Chat panel is working.\nI finally realized how to use the NetworkHandler channels.\nData objects can be setup to invoke different methods depending on the specified channel.\nThe client and server can now exit the message loop cleanly on both ends.","distinct":false,"url":"https://api.github.com/repos/rsanchez-wsu/fa15-ceg3120/commits/5a92ecc5377b70e7edf3b8b32d075f0b488b053b"},{"sha":"f66e4396c27725ff887dfeba8081ab3e08c37967","author":{"email":"e6f6c245ff3ab2c1c28dfe4ee1e61429bab18750@gmail.com","name":"Oliver Ceccopieri"},"message":"Extracted \"to\" field from incoming chat messages","distinct":false,"url":"https://api.github.com/repos/rsanchez-wsu/fa15-ceg3120/commits/f66e4396c27725ff887dfeba8081ab3e08c37967"},{"sha":"b95ca68b825eccf267c229645231ea77a06972a4","author":{"email":"e6f6c245ff3ab2c1c28dfe4ee1e61429bab18750@gmail.com","name":"Oliver Ceccopieri"},"message":"Made ConConClient connections persistent\n\nSo that we can keep a running list of who is online and available to\nsend messages to.","distinct":false,"url":"https://api.github.com/repos/rsanchez-wsu/fa15-ceg3120/commits/b95ca68b825eccf267c229645231ea77a06972a4"},{"sha":"37f72133662cbe33525b174c90b8c89361e7031e","author":{"email":"e6f6c245ff3ab2c1c28dfe4ee1e61429bab18750@gmail.com","name":"Oliver Ceccopieri"},"message":"Added some comments for the most recent changes","distinct":false,"url":"https://api.github.com/repos/rsanchez-wsu/fa15-ceg3120/commits/37f72133662cbe33525b174c90b8c89361e7031e"},{"sha":"773692ffe2228d71a6ecc7a8fe6ef7b5c25b264b","author":{"email":"e6f6c245ff3ab2c1c28dfe4ee1e61429bab18750@gmail.com","name":"Oliver Ceccopieri"},"message":"ConConServer and ConConClient implement Closable\n\nSo Eclipse will warn if they are not eventually closed.","distinct":false,"url":"https://api.github.com/repos/rsanchez-wsu/fa15-ceg3120/commits/773692ffe2228d71a6ecc7a8fe6ef7b5c25b264b"},{"sha":"928b82cc69e8a20071676afc5f2c710ed8a80209","author":{"email":"e6f6c245ff3ab2c1c28dfe4ee1e61429bab18750@gmail.com","name":"Oliver Ceccopieri"},"message":"ConConServer sends chat messages to their proper recipient.\n\nThe chat now /almost/ works...","distinct":false,"url":"https://api.github.com/repos/rsanchez-wsu/fa15-ceg3120/commits/928b82cc69e8a20071676afc5f2c710ed8a80209"},{"sha":"ebd53f85b49656ade1df7d7376d38a94b043fb14","author":{"email":"63b97412aa33f10b7bae9901a22dafc67e4c7166@gmail.com","name":"Nathan Jent"},"message":"Moved test client to client module.\nAdded \"end\" message to network message handling.","distinct":false,"url":"https://api.github.com/repos/rsanchez-wsu/fa15-ceg3120/commits/ebd53f85b49656ade1df7d7376d38a94b043fb14"},{"sha":"b1c23342e34ebdf1fa28758d25eb7f010439381b","author":{"email":"63b97412aa33f10b7bae9901a22dafc67e4c7166@gmail.com","name":"Nathan Jent"},"message":"Merge branch 'networking-chat' of https://github.com/rsanchez-wsu/fa15-ceg3120 into networking-chat\n\n# Conflicts:\n#\tcommon/src/edu/wright/cs/fa15/ceg3120/concon/common/net/ConConServer.java\n#\tcommon/src/edu/wright/cs/fa15/ceg3120/concon/common/net/data/ChatData.java\n#\tcommon/src/edu/wright/cs/fa15/ceg3120/concon/common/ui/ChatPanel.java\n#\tmodules/server/src/edu/wright/cs/fa15/ceg3120/concon/server/TestClient.java\n\nReverted changes to server message handling. It did not follow the networking model. Data objects should have NetworkHandler methods to handle specifics. The server only processes those objects. It is a subscribe and post model. Chat messages should be posted to the server, as in stored on the database, then the receiving client will fetch messages from the server periodically.","distinct":false,"url":"https://api.github.com/repos/rsanchez-wsu/fa15-ceg3120/commits/b1c23342e34ebdf1fa28758d25eb7f010439381b"},{"sha":"6d7f392f72fb80f5e5973bd2a6f627e24662d5f7","author":{"email":"63b97412aa33f10b7bae9901a22dafc67e4c7166@gmail.com","name":"Nathan Jent"},"message":"Merge remote-tracking branch 'remotes/origin/networking' into networking-chat\n\n# Conflicts:\n#\tcommon/src/edu/wright/cs/fa15/ceg3120/concon/common/net/MessageHolder.java","distinct":false,"url":"https://api.github.com/repos/rsanchez-wsu/fa15-ceg3120/commits/6d7f392f72fb80f5e5973bd2a6f627e24662d5f7"},{"sha":"19e8e1abd8ad8ea4027ba90e013346e691b15eb0","author":{"email":"63b97412aa33f10b7bae9901a22dafc67e4c7166@gmail.com","name":"Nathan Jent"},"message":"Added custom annotation processor to process NetworkHandler annotation.\nAdded processorpath argument to compiler.\nFixed a transient field in ChatPanel that FindBugs found.","distinct":false,"url":"https://api.github.com/repos/rsanchez-wsu/fa15-ceg3120/commits/19e8e1abd8ad8ea4027ba90e013346e691b15eb0"},{"sha":"48ae3dc70a8115b9f9b1394ed66c2bf918edf591","author":{"email":"63b97412aa33f10b7bae9901a22dafc67e4c7166@gmail.com","name":"Nathan Jent"},"message":"Merge remote-tracking branch 'remotes/origin/master' into networking\n\nI saw some issues with committed code containing diff annotations.\n\n# Conflicts:\n#\t.classpath\n#\tcommon/src/edu/wright/cs/fa15/ceg3120/concon/common/data/Server.java\n#\tcommon/src/edu/wright/cs/fa15/ceg3120/concon/common/net/ConConClient.java\nSockets should not be persisted. The client must fetch new messages from the server with a new socket each time.\n#\tcommon/src/edu/wright/cs/fa15/ceg3120/concon/common/net/NetworkHandler.java\n#\tcommon/src/edu/wright/cs/fa15/ceg3120/concon/common/net/NetworkManager.java\n#\tcommon/src/edu/wright/cs/fa15/ceg3120/concon/common/net/data/LoginData.java\n#\tcommon/src/edu/wright/cs/fa15/ceg3120/concon/common/net/data/UserData.java\n#\tcommon/src/edu/wright/cs/fa15/ceg3120/concon/common/net/message/ChatMessage.java\n#\tcommon/src/edu/wright/cs/fa15/ceg3120/concon/common/net/message/DataMessage.java\n#\tcommon/src/edu/wright/cs/fa15/ceg3120/concon/common/ui/ChatPanel.java\n#\tmodules/server/src/edu/wright/cs/fa15/ceg3120/concon/server/TestClient.java","distinct":false,"url":"https://api.github.com/repos/rsanchez-wsu/fa15-ceg3120/commits/48ae3dc70a8115b9f9b1394ed66c2bf918edf591"},{"sha":"8d7a92c705daaa1885400301378d91cd72de3ff5","author":{"email":"63b97412aa33f10b7bae9901a22dafc67e4c7166@gmail.com","name":"Nathan Jent"},"message":"I missed deleting a broken method during the last merge.","distinct":false,"url":"https://api.github.com/repos/rsanchez-wsu/fa15-ceg3120/commits/8d7a92c705daaa1885400301378d91cd72de3ff5"}]}