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/UserThread.java | 148 +++++++++++------------
 1 file changed, 74 insertions(+), 74 deletions(-)

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

diff --git a/src/main/java/com/juick/http/www/UserThread.java b/src/main/java/com/juick/http/www/UserThread.java
index 73809f6c..8b6707eb 100644
--- a/src/main/java/com/juick/http/www/UserThread.java
+++ b/src/main/java/com/juick/http/www/UserThread.java
@@ -17,12 +17,15 @@
  */
 package com.juick.http.www;
 
+import com.juick.Message;
+import com.juick.Tag;
 import com.juick.server.MessagesQueries;
 import com.juick.server.UserQueries;
 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;
@@ -36,7 +39,7 @@ public class UserThread {
     protected void doGetThread(Connection sql, HttpServletRequest request, HttpServletResponse response, int MID) throws ServletException, IOException {
         com.juick.User visitor = Utils.getVisitorUser(sql, request, response);
 
-        if (!MessagesQueries.canViewThread(sql, MID, visitor != null ? visitor.UID : 0)) {
+        if (!MessagesQueries.canViewThread(sql, MID, visitor != null ? visitor.getUID() : 0)) {
             response.sendError(403);
             return;
         }
@@ -49,27 +52,27 @@ public class UserThread {
             if (paramView.equals("list")) {
                 listview = true;
                 if (visitor != null) {
-                    UserQueries.setUserOptionInt(sql, visitor.UID, "repliesview", 1);
+                    UserQueries.setUserOptionInt(sql, visitor.getUID(), "repliesview", 1);
                 }
             } else if (paramView.equals("tree") && visitor != null) {
-                UserQueries.setUserOptionInt(sql, visitor.UID, "repliesview", 0);
+                UserQueries.setUserOptionInt(sql, visitor.getUID(), "repliesview", 0);
             }
-        } else if (visitor != null && UserQueries.getUserOptionInt(sql, visitor.UID, "repliesview", 0) == 1) {
+        } else if (visitor != null && UserQueries.getUserOptionInt(sql, visitor.getUID(), "repliesview", 0) == 1) {
             listview = true;
         }
 
-        String title = msg.User.UName + ": " + msg.getTagsString();
+        String title = msg.getUser().getUName() + ": " + msg.getTagsString();
 
         if (visitor == null) {
-            User.pageUserRefCookie(request, response, msg.User.UID);
+            User.pageUserRefCookie(request, response, msg.getUser().getUID());
         }
 
         response.setContentType("text/html; charset=UTF-8");
         PrintWriter out = response.getWriter();
         try {
-            String headers = "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"@" + msg.User.UName + "\" href=\"//rss.juick.com/" + msg.User.UName + "/blog\"/>";
+            String headers = "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"@" + msg.getUser().getUName() + "\" href=\"//rss.juick.com/" + msg.getUser().getUName() + "/blog\"/>";
             if (paramView != null) {
-                headers += "<link rel=\"canonical\" href=\"http://juick.com/" + msg.User.UName + "/" + msg.MID + "\"/>";
+                headers += "<link rel=\"canonical\" href=\"http://juick.com/" + msg.getUser().getUName() + "/" + msg.getMID() + "\"/>";
             }
             if (msg.Hidden) {
                 headers += "<meta name=\"robots\" content=\"noindex\"/>";
@@ -85,10 +88,10 @@ public class UserThread {
             PageTemplates.pageFooter(request, out, visitor, false);
 
             out.println("<script type='text/javascript'>");
-            if (visitor != null && visitor.UID == 1 && msg.User.UID == 1) {
+            if (visitor != null && visitor.getUID() == 1 && msg.getUser().getUID() == 1) {
                 out.println("var juickDebug=1;");
             }
-            out.println("var pageMID=" + msg.MID + ";");
+            out.println("var pageMID=" + msg.getMID() + ";");
             out.println("initWS();");
             out.println("</script>");
 
@@ -101,7 +104,7 @@ public class UserThread {
     public static com.juick.Message printMessage(PrintWriter out, Connection sql, com.juick.Message msg, com.juick.User visitor) {
         msg.VisitorCanComment = visitor != null;
 
-        ArrayList<com.juick.Tag> tags = MessagesQueries.getMessageTags(sql, msg.MID);
+        List<Tag> tags = MessagesQueries.getMessageTags(sql, msg.getMID());
         String tagsStr = PageTemplates.formatTags(tags);
         if (msg.ReadOnly) {
             tagsStr += " *readonly";
@@ -113,9 +116,9 @@ public class UserThread {
 
         String txt;
         if (!msg.Tags.isEmpty() && msg.Tags.contains("code")) {
-            txt = PageTemplates.formatMessageCode(msg.Text);
+            txt = PageTemplates.formatMessageCode(msg.getText());
         } else {
-            txt = PageTemplates.formatMessage(msg.Text);
+            txt = PageTemplates.formatMessage(msg.getText());
         }
 
         if (!tags.isEmpty()) {
@@ -123,24 +126,24 @@ public class UserThread {
         }
 
         out.println("<ul>");
-        out.println("  <li id=\"msg-" + msg.MID + "\" class=\"msg msgthread\">");
-        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("  <li id=\"msg-" + msg.getMID() + "\" class=\"msg msgthread\">");
+        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-menu\"><a href=\"#\" onclick=\"showMessageLinksDialog(" + msg.MID + "); return false\"></a></div>");
-        out.println("    <div class=\"msg-header\"><a href=\"/" + msg.User.UName + "/\">@" + msg.User.UName + "</a>:" + tagsStr + "</div>");
+        out.println("    <div class=\"msg-menu\"><a href=\"#\" onclick=\"showMessageLinksDialog(" + msg.getMID() + "); return false\"></a></div>");
+        out.println("    <div class=\"msg-header\"><a href=\"/" + msg.getUser().getUName() + "/\">@" + msg.getUser().getUName() + "</a>:" + tagsStr + "</div>");
         out.println("    <div class=\"msg-ts\">" + PageTemplates.formatJSLocalTime(msg.TimestampString) + "</div>");
         out.println("    <div class=\"msg-txt\">" + txt + "</div>");
 
         if (msg.AttachmentType != null) {
-            out.println("    <div class=\"msg-media\"><a href=\"//i.juick.com/p/" + msg.MID + "." + msg.AttachmentType + "\"><img src=\"//i.juick.com/photos-512/" + msg.MID + "." + msg.AttachmentType + "\" alt=\"\"/></a></div>");
+            out.println("    <div class=\"msg-media\"><a href=\"//i.juick.com/p/" + msg.getMID() + "." + msg.AttachmentType + "\"><img src=\"//i.juick.com/photos-512/" + msg.getMID() + "." + msg.AttachmentType + "\" alt=\"\"/></a></div>");
         }
 
         boolean visitorInBL = false;
         if (visitor != null) {
-            if (visitor.UID == msg.User.UID) {
+            if (visitor.getUID() == msg.getUser().getUID()) {
                 msg.VisitorCanComment = true;
             } else {
-                visitorInBL = UserQueries.isInBL(sql, msg.User.UID, visitor.UID);
+                visitorInBL = UserQueries.isInBL(sql, msg.getUser().getUID(), visitor.getUID());
                 if (visitorInBL) {
                     msg.VisitorCanComment = false;
                 }
@@ -148,12 +151,12 @@ public class UserThread {
         }
 
         if (msg.VisitorCanComment) {
-            out.println("    <form action=\"/comment\" method=\"POST\" enctype=\"multipart/form-data\"><input type=\"hidden\" name=\"mid\" value=\"" + msg.MID + "\"/>");
+            out.println("    <form action=\"/comment\" method=\"POST\" enctype=\"multipart/form-data\"><input type=\"hidden\" name=\"mid\" value=\"" + msg.getMID() + "\"/>");
             out.println("      <div class=\"msg-comment\"><div class=\"ta-wrapper\"><textarea name=\"body\" rows=\"1\" class=\"reply\" placeholder=\"Написать комментарий\" onkeypress=\"postformListener(this.form,event)\"></textarea></div></div>");
             out.println("    </form>");
         }
 
-        ArrayList<String> recomm = MessagesQueries.getMessageRecommendations(sql, msg.MID);
+        List<String> recomm = MessagesQueries.getMessageRecommendations(sql, msg.getMID());
         if (!recomm.isEmpty()) {
             out.print("    <div class=\"" + (msg.VisitorCanComment ? "msg-recomms" : "msg-comments") + "\">Рекомендовали (" + recomm.size() + "): ");
             for (int i = 0; i < recomm.size(); i++) {
@@ -168,19 +171,19 @@ public class UserThread {
         out.println("  </li>");
 
         out.println("  <li id=\"mtoolbar\"><ul>");
-        out.println("    <li><a href=\"/" + msg.MID + "\"><div style=\"background-position: -64px 0\"></div>" + msg.MID + "</a></li>");
+        out.println("    <li><a href=\"/" + msg.getMID() + "\"><div style=\"background-position: -64px 0\"></div>" + msg.getMID() + "</a></li>");
         if (visitor != null) {
-            if (visitor.UID != msg.User.UID) {
-                if (MessagesQueries.isSubscribed(sql, visitor.UID, msg.MID)) {
-                    out.println("    <li><a href=\"/post?body=U+%23" + msg.MID + "\"><div style=\"background-position: -48px 0\"></div>Подписан</a></li>");
+            if (visitor.getUID() != msg.getUser().getUID()) {
+                if (MessagesQueries.isSubscribed(sql, visitor.getUID(), msg.getMID())) {
+                    out.println("    <li><a href=\"/post?body=U+%23" + msg.getMID() + "\"><div style=\"background-position: -48px 0\"></div>Подписан</a></li>");
                 } else {
-                    out.println("    <li><a href=\"/post?body=S+%23" + msg.MID + "\"><div style=\"background-position: -16px 0\"></div>Подписаться</a></li>");
+                    out.println("    <li><a href=\"/post?body=S+%23" + msg.getMID() + "\"><div style=\"background-position: -16px 0\"></div>Подписаться</a></li>");
                 }
                 if (!visitorInBL) {
-                    out.println("    <li><a href=\"/post?body=%21+%23" + msg.MID + "\"><div style=\"background-position: -32px 0\"></div>Рекомендовать</a></li>");
+                    out.println("    <li><a href=\"/post?body=%21+%23" + msg.getMID() + "\"><div style=\"background-position: -32px 0\"></div>Рекомендовать</a></li>");
                 }
             } else {
-                out.println("    <li><a href=\"/post?body=D+%23" + msg.MID + "\"><div style=\"background-position: 0\"></div>Удалить</a></li>");
+                out.println("    <li><a href=\"/post?body=D+%23" + msg.getMID() + "\"><div style=\"background-position: 0\"></div>Удалить</a></li>");
             }
         }
         out.println("  </ul></li>");
@@ -190,18 +193,18 @@ public class UserThread {
     }
 
     public static void printReplies(PrintWriter out, Connection sql, com.juick.Message msg, com.juick.User visitor, boolean listview) {
-        ArrayList<com.juick.Message> replies = MessagesQueries.getReplies(sql, msg.MID);
+        List<com.juick.Message> replies = MessagesQueries.getReplies(sql, msg.getMID());
 
-        ArrayList<Integer> blUIDs = new ArrayList<Integer>();
+        List<Integer> blUIDs = new ArrayList<Integer>();
         for (int i = 0; i < replies.size(); i++) {
             com.juick.Message reply = replies.get(i);
-            if (reply.User.UID != msg.User.UID && !blUIDs.contains(reply.User.UID)) {
-                blUIDs.add(reply.User.UID);
+            if (reply.getUser().getUID() != msg.getUser().getUID() && !blUIDs.contains(reply.getUser().getUID())) {
+                blUIDs.add(reply.getUser().getUID());
             }
             if (reply.ReplyTo > 0) {
                 boolean added = false;
                 for (int n = 0; n < replies.size(); n++) {
-                    if (replies.get(n).RID == reply.ReplyTo) {
+                    if (replies.get(n).getRID() == reply.ReplyTo) {
                         replies.get(n).childs.add(reply);
                         added = true;
                         break;
@@ -214,19 +217,18 @@ public class UserThread {
         }
 
         if (!replies.isEmpty()) {
-            if (visitor != null && msg.User.UID == visitor.UID) {
-                for (int i = 0; i < replies.size(); i++) {
-                    replies.get(i).VisitorCanComment = true;
+            if (visitor != null && msg.getUser().getUID() == visitor.getUID()) {
+                for (Message reply : replies) {
+                    reply.VisitorCanComment = true;
                 }
             } else if (visitor != null && msg.VisitorCanComment) {
-                blUIDs = UserQueries.checkBL(sql, visitor.UID, blUIDs);
-                for (int i = 0; i < replies.size(); i++) {
-                    com.juick.Message reply = replies.get(i);
-                    reply.VisitorCanComment = reply.User.UID == visitor.UID || !blUIDs.contains(reply.User.UID);
+                blUIDs = UserQueries.checkBL(sql, visitor.getUID(), blUIDs);
+                for (Message reply : replies) {
+                    reply.VisitorCanComment = reply.getUser().getUID() == visitor.getUID() || !blUIDs.contains(reply.getUser().getUID());
                 }
             } else {
-                for (int i = 0; i < replies.size(); i++) {
-                    replies.get(i).VisitorCanComment = false;
+                for (Message reply : replies) {
+                    reply.VisitorCanComment = false;
                 }
             }
 
@@ -266,14 +268,14 @@ public class UserThread {
                 PageTemplates.pageYandexAd728(out, 1);
             }
 
-            for (int i = 0; i < replies.size(); i++) {
-                replies.get(i).cleanupChilds();
+            for (Message reply : replies) {
+                reply.cleanupChilds();
             }
             replies.clear();
         }
     }
 
-    public static void printTree(PrintWriter out, ArrayList<com.juick.Message> replies, com.juick.User visitor, int ReplyTo, int margin, boolean hidden) {
+    public static void printTree(PrintWriter out, List<com.juick.Message> replies, com.juick.User visitor, int ReplyTo, int margin, boolean hidden) {
         if (margin > 240) {
             margin = 240;
         }
@@ -282,7 +284,7 @@ public class UserThread {
             com.juick.Message msg = replies.get(i);
             if (msg.ReplyTo == ReplyTo) {
 
-                out.print("  <li id=\"" + msg.RID + "\" class=\"msg\" style=\"");
+                out.print("  <li id=\"" + msg.getRID() + "\" class=\"msg\" style=\"");
                 if (margin > 0) {
                     out.print("margin-left: " + margin + "px;");
                 }
@@ -290,25 +292,25 @@ public class UserThread {
                     out.print("display:none;");
                 }
                 out.println("\">");
-                if (msg.User.Banned == false) {
-                    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>");
+                if (!msg.getUser().Banned) {
+                    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>");
                 } else {
                     out.println("    <div class=\"msg-avatar\"><img src=\"//i.juick.com/av-96.png\"/></div>");
                 }
                 out.println("    <div class=\"msg-cont\">");
-                out.println("    <div class=\"msg-menu\"><a href=\"#\" onclick=\"showMessageLinksDialog(" + msg.MID + "," + msg.RID + "); return false\"></a></div>");
-                if (msg.User.Banned == false) {
-                    out.println("    <div class=\"msg-header\"><a href=\"/" + msg.User.UName + "/\">@" + msg.User.UName + "</a>:</div>");
+                out.println("    <div class=\"msg-menu\"><a href=\"#\" onclick=\"showMessageLinksDialog(" + msg.getMID() + "," + msg.getRID() + "); return false\"></a></div>");
+                if (!msg.getUser().Banned) {
+                    out.println("    <div class=\"msg-header\"><a href=\"/" + msg.getUser().getUName() + "/\">@" + msg.getUser().getUName() + "</a>:</div>");
                 } else {
                     out.println("    <div class=\"msg-header\">[удалено]:</div>");
                 }
-                out.println("    <div class=\"msg-ts\"><a href=\"/" + msg.MID + "#" + msg.RID + "\" title=\"" + msg.TimestampString + " GMT\">" + PageTemplates.formatDate(msg.TimeAgo, msg.TimestampString) + "</a></div>");
-                out.println("    <div class=\"msg-txt\">" + PageTemplates.formatMessage(msg.Text) + "</div>");
+                out.println("    <div class=\"msg-ts\"><a href=\"/" + msg.getMID() + "#" + msg.getRID() + "\" title=\"" + msg.TimestampString + " GMT\">" + PageTemplates.formatDate(msg.TimeAgo, msg.TimestampString) + "</a></div>");
+                out.println("    <div class=\"msg-txt\">" + PageTemplates.formatMessage(msg.getText()) + "</div>");
                 if (msg.AttachmentType != null) {
-                    out.println("    <div class=\"msg-media\"><a href=\"//i.juick.com/p/" + msg.MID + "-" + msg.RID + "." + msg.AttachmentType + "\"><img src=\"//i.juick.com/photos-512/" + msg.MID + "-" + msg.RID + "." + msg.AttachmentType + "\" alt=\"\"/></a></div>");
+                    out.println("    <div class=\"msg-media\"><a href=\"//i.juick.com/p/" + msg.getMID() + "-" + msg.getRID() + "." + msg.AttachmentType + "\"><img src=\"//i.juick.com/photos-512/" + msg.getMID() + "-" + msg.getRID() + "." + msg.AttachmentType + "\" alt=\"\"/></a></div>");
                 }
                 if (msg.VisitorCanComment) {
-                    out.println("    <div class=\"msg-links\"><a href=\"#\" onclick=\"return showCommentForm(" + msg.MID + "," + msg.RID + ")\">Ответить</a></div>");
+                    out.println("    <div class=\"msg-links\"><a href=\"#\" onclick=\"return showCommentForm(" + msg.getMID() + "," + msg.getRID() + ")\">Ответить</a></div>");
                     out.println("    <div class=\"msg-comment\" style=\"display: none\"></div>");
                 } else if (visitor == null) {
                     out.println("    <div class=\"msg-links\"><a href=\"#\" onclick=\"return openDialogLogin()\">Ответить</a></div>");
@@ -316,49 +318,47 @@ public class UserThread {
 
                 int childs = msg.getChildsCount();
                 if (ReplyTo == 0 && childs > 1 && replies.size() > 10) {
-                    out.println("    <div class=\"msg-comments\"><a href=\"#\" onclick=\"return showMoreReplies(" + msg.RID + ")\">" + PageTemplates.formatReplies(childs) + "</a></div>");
+                    out.println("    <div class=\"msg-comments\"><a href=\"#\" onclick=\"return showMoreReplies(" + msg.getRID() + ")\">" + PageTemplates.formatReplies(childs) + "</a></div>");
 
                 }
                 out.println("    </div>");
                 out.println("  </li>");
 
                 if (ReplyTo == 0 && childs > 1 && replies.size() > 10) {
-                    printTree(out, msg.childs, visitor, msg.RID, margin + 20, true);
+                    printTree(out, msg.childs, visitor, msg.getRID(), margin + 20, true);
                 } else if (childs > 0) {
-                    printTree(out, msg.childs, visitor, msg.RID, margin + 20, hidden);
+                    printTree(out, msg.childs, visitor, msg.getRID(), margin + 20, hidden);
                 }
             }
         }
     }
 
-    public static void printList(PrintWriter out, ArrayList<com.juick.Message> replies, com.juick.User visitor) {
-        for (int i = 0; i < replies.size(); i++) {
-            com.juick.Message msg = replies.get(i);
-
-            out.print("  <li id=\"" + msg.RID + "\" class=\"msg\">");
-            if (msg.User.Banned == false) {
-                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>");
+    public static void printList(PrintWriter out, List<com.juick.Message> replies, com.juick.User visitor) {
+        for (Message msg : replies) {
+            out.print("  <li id=\"" + msg.getRID() + "\" class=\"msg\">");
+            if (!msg.getUser().Banned) {
+                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>");
             } else {
                 out.println("    <div class=\"msg-avatar\"><img src=\"//i.juick.com/av-96.png\"/></div>");
             }
             out.println("    <div class=\"msg-cont\">");
-            out.println("    <div class=\"msg-menu\"><a href=\"#\" onclick=\"showMessageLinksDialog(" + msg.MID + "," + msg.RID + "); return false\"></a></div>");
-            if (msg.User.Banned == false) {
-                out.println("    <div class=\"msg-header\"><a href=\"/" + msg.User.UName + "/\">@" + msg.User.UName + "</a>:</div>");
+            out.println("    <div class=\"msg-menu\"><a href=\"#\" onclick=\"showMessageLinksDialog(" + msg.getMID() + "," + msg.getRID() + "); return false\"></a></div>");
+            if (!msg.getUser().Banned) {
+                out.println("    <div class=\"msg-header\"><a href=\"/" + msg.getUser().getUName() + "/\">@" + msg.getUser().getUName() + "</a>:</div>");
             } else {
                 out.println("    <div class=\"msg-header\">[удалено]:</div>");
             }
-            out.println("    <div class=\"msg-ts\"><a href=\"/" + msg.MID + "#" + msg.RID + "\" title=\"" + msg.TimestampString + " GMT\">" + PageTemplates.formatDate(msg.TimeAgo, msg.TimestampString) + "</a></div>");
-            out.println("    <div class=\"msg-txt\">" + PageTemplates.formatMessage(msg.Text) + "</div>");
+            out.println("    <div class=\"msg-ts\"><a href=\"/" + msg.getMID() + "#" + msg.getRID() + "\" title=\"" + msg.TimestampString + " GMT\">" + PageTemplates.formatDate(msg.TimeAgo, msg.TimestampString) + "</a></div>");
+            out.println("    <div class=\"msg-txt\">" + PageTemplates.formatMessage(msg.getText()) + "</div>");
             if (msg.AttachmentType != null) {
-                out.println("    <div class=\"msg-media\"><a href=\"//i.juick.com/p/" + msg.MID + "-" + msg.RID + "." + msg.AttachmentType + "\"><img src=\"//i.juick.com/photos-512/" + msg.MID + "-" + msg.RID + "." + msg.AttachmentType + "\" alt=\"\"/></a></div>");
+                out.println("    <div class=\"msg-media\"><a href=\"//i.juick.com/p/" + msg.getMID() + "-" + msg.getRID() + "." + msg.AttachmentType + "\"><img src=\"//i.juick.com/photos-512/" + msg.getMID() + "-" + msg.getRID() + "." + msg.AttachmentType + "\" alt=\"\"/></a></div>");
             }
-            out.print("    <div class=\"msg-links\">/" + msg.RID);
+            out.print("    <div class=\"msg-links\">/" + msg.getRID());
             if (msg.ReplyTo > 0) {
                 out.print(" в ответ на <a href=\"#" + msg.ReplyTo + "\">/" + msg.ReplyTo + "</a>");
             }
             if (msg.VisitorCanComment) {
-                out.println(" &#183; <a href=\"#\" onclick=\"return showCommentForm(" + msg.MID + "," + msg.RID + ")\">Ответить</a></div>");
+                out.println(" &#183; <a href=\"#\" onclick=\"return showCommentForm(" + msg.getMID() + "," + msg.getRID() + ")\">Ответить</a></div>");
                 out.println("    <div class=\"msg-comment\" style=\"display: none\"></div>");
             } else if (visitor == null) {
                 out.println("    <div class=\"msg-links\"><a href=\"#\" onclick=\"return openDialogLogin()\">Ответить</a></div>");
-- 
cgit v1.2.3