From c492429b25c1ef711620a4f509975c7edc3ffa4a Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 14 Jan 2016 12:16:49 +0300
Subject: Update libraries and refactoring

---
 src/main/java/com/juick/http/www/PM.java | 33 ++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

(limited to 'src/main/java/com/juick/http/www/PM.java')

diff --git a/src/main/java/com/juick/http/www/PM.java b/src/main/java/com/juick/http/www/PM.java
index d0d2f514..a9505bdb 100644
--- a/src/main/java/com/juick/http/www/PM.java
+++ b/src/main/java/com/juick/http/www/PM.java
@@ -27,6 +27,7 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.sql.Connection;
 import java.util.ArrayList;
+import java.util.List;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -50,7 +51,7 @@ public class PM {
          */
 
         String title = "PM: Inbox";
-        ArrayList<com.juick.Message> msgs = PMQueries.getLastPMInbox(sql, visitor.UID);
+        List<com.juick.Message> msgs = PMQueries.getLastPMInbox(sql, visitor.getUID());
 
         response.setContentType("text/html; charset=UTF-8");
         PrintWriter out = response.getWriter();
@@ -66,16 +67,16 @@ public class PM {
                 for (int i = msgs.size() - 1; i >= 0; i--) {
                     com.juick.Message msg = msgs.get(i);
 
-                    String txt = PageTemplates.formatMessage(msg.Text);
+                    String txt = PageTemplates.formatMessage(msg.getText());
 
                     out.println("  <li class=\"msg\">");
-                    out.println("    <div class=\"msg-avatar\"><a href=\"/" + msg.User.UName + "/\"><img src=\"//i.juick.com/a/" + msg.User.UID + ".png\" alt=\"" + msg.User.UName + "\"/></a></div>");
+                    out.println("    <div class=\"msg-avatar\"><a href=\"/" + msg.getUser().getUName() + "/\"><img src=\"//i.juick.com/a/" + msg.getUser().getUID() + ".png\" alt=\"" + msg.getUser().getUName() + "\"/></a></div>");
                     out.println("    <div class=\"msg-cont\">");
-                    out.println("      <div class=\"msg-header\"><a href=\"/" + msg.User.UName + "/\">@" + msg.User.UName + "</a>:</div>");
+                    out.println("      <div class=\"msg-header\"><a href=\"/" + msg.getUser().getUName() + "/\">@" + msg.getUser().getUName() + "</a>:</div>");
                     out.println("      <div class=\"msg-ts\"><a href=\"#\" onclick=\"return false\" title=\"" + msg.TimestampString + " GMT\">" + PageTemplates.formatDate(msg.TimeAgo, msg.TimestampString) + "</a></div>");
                     out.println("      <div class=\"msg-txt\">" + txt + "</div>");
 
-                    out.println("      <form action=\"/pm/send\" method=\"POST\" enctype=\"multipart/form-data\"><input type=\"hidden\" name=\"uname\" value=\"" + msg.User.UName + "\"/>");
+                    out.println("      <form action=\"/pm/send\" method=\"POST\" enctype=\"multipart/form-data\"><input type=\"hidden\" name=\"uname\" value=\"" + msg.getUser().getUName() + "\"/>");
                     out.println("        <div class=\"msg-comment\"><div class=\"ta-wrapper\"><textarea name=\"body\" rows=\"1\" class=\"replypm\" placeholder=\"Написать ответ\" onkeypress=\"postformListener(this.form,event)\"></textarea></div></div>");
                     out.println("      </form>");
 
@@ -114,7 +115,7 @@ public class PM {
          */
 
         String title = "PM: Sent";
-        ArrayList<com.juick.Message> msgs = PMQueries.getLastPMSent(sql, visitor.UID);
+        List<com.juick.Message> msgs = PMQueries.getLastPMSent(sql, visitor.getUID());
 
         String uname = request.getParameter("uname");
         if (!UserQueries.checkUserNameValid(uname)) {
@@ -143,12 +144,12 @@ public class PM {
                 for (int i = msgs.size() - 1; i >= 0; i--) {
                     com.juick.Message msg = msgs.get(i);
 
-                    String txt = PageTemplates.formatMessage(msg.Text);
+                    String txt = PageTemplates.formatMessage(msg.getText());
 
                     out.println("  <li class=\"msg\">");
-                    out.println("    <div class=\"msg-avatar\"><img src=\"//i.juick.com/a/" + visitor.UID + ".png\"/></div>");
+                    out.println("    <div class=\"msg-avatar\"><img src=\"//i.juick.com/a/" + visitor.getUID() + ".png\"/></div>");
                     out.println("    <div class=\"msg-cont\">");
-                    out.println("      <div class=\"msg-header\">→ <a href=\"/" + msg.User.UName + "/\">@" + msg.User.UName + "</a>:</div>");
+                    out.println("      <div class=\"msg-header\">→ <a href=\"/" + msg.getUser().getUName() + "/\">@" + msg.getUser().getUName() + "</a>:</div>");
                     out.println("      <div class=\"msg-ts\"><a href=\"#\" onclick=\"return false\" title=\"" + msg.TimestampString + " GMT\">" + PageTemplates.formatDate(msg.TimeAgo, msg.TimestampString) + "</a></div>");
                     out.println("      <div class=\"msg-txt\">" + txt + "</div>");
                     out.println("    </div>");
@@ -189,18 +190,18 @@ public class PM {
             return;
         }
 
-        if (UserQueries.isInBLAny(sql, uid, visitor.UID)) {
+        if (UserQueries.isInBLAny(sql, uid, visitor.getUID())) {
             response.sendError(403);
             return;
         }
 
-        if (PMQueries.createPM(sql, visitor.UID, uid, body)) {
+        if (PMQueries.createPM(sql, visitor.getUID(), uid, body)) {
             Message msg = new Message();
             msg.from = new JID("juick", "juick.com", null);
             msg.to = new JID(Integer.toString(uid), "push.juick.com", null);
             JuickMessage jmsg = new JuickMessage();
-            jmsg.User = UserQueries.getUserByUID(sql, visitor.UID);
-            jmsg.Text = body;
+            jmsg.setUser(UserQueries.getUserByUID(sql, visitor.getUID()));
+            jmsg.setText(body);
             msg.childs.add(jmsg);
             xmpp.send(msg);
 
@@ -212,12 +213,12 @@ public class PM {
                 Message mm = new Message();
                 mm.to = new JID(jid);
                 mm.type = Message.Type.chat;
-                if (PMQueries.havePMinRoster(sql, visitor.UID, jid)) {
-                    mm.from = new JID(jmsg.User.UName, "juick.com", "Juick");
+                if (PMQueries.havePMinRoster(sql, visitor.getUID(), jid)) {
+                    mm.from = new JID(jmsg.getUser().getUName(), "juick.com", "Juick");
                     mm.body = body;
                 } else {
                     mm.from = new JID("juick", "juick.com", "Juick");
-                    mm.body = "Private message from @" + jmsg.User.UName + ":\n" + body;
+                    mm.body = "Private message from @" + jmsg.getUser().getUName() + ":\n" + body;
                 }
                 xmpp.send(mm);
             }
-- 
cgit v1.2.3