cleanup and refactored to move to net.wpitchoune package

[pnews.git] / war / src / main / java / pnews / servlet / HTML.java

diff --git a/war/src/main/java/pnews/servlet/HTML.java b/war/src/main/java/pnews/servlet/HTML.java
index d20d415..ac7a749 100644 (file)
--- a/war/src/main/java/pnews/servlet/HTML.java
+++ b/war/src/main/java/pnews/servlet/HTML.java
@@ -9,10 +9,11 @@ import java.util.logging.Logger;
 
 import com.rometools.rome.io.FeedException;
 
-import pnews.Article;
-import pnews.Category;
-import pnews.EntityStat;
-import pnews.Language;
+import net.wpitchoune.pnews.Article;
+import net.wpitchoune.pnews.Category;
+import net.wpitchoune.pnews.Config;
+import net.wpitchoune.pnews.EntityStat;
+import net.wpitchoune.pnews.Language;
 
 public class HTML {
         private static final String CLASS_NAME= HTML.class.getName();
@@ -48,9 +49,9 @@ public class HTML {
                buf.append("<div class='article'>\n");
                
                buf.append("<div class='article-image'>\n");
-               if (a.thumbnail != null) {
+               if (a.getThumbnail() != null) {
                        buf.append("<img class='left' src='");
-                       buf.append(a.thumbnail);
+                       buf.append(a.getThumbnail());
                        buf.append("'/>\n");
                }
                buf.append("</div>\n");
@@ -58,18 +59,18 @@ public class HTML {
                buf.append("<div class='article-content'>\n");
 
                buf.append("<div class='article-title'>\n");
-               appendA(buf, a.title, "/redirect?url=" + URLEncoder.encode(a.link, "UTF-8"), null);
+               appendA(buf, a.getTitle(), "/redirect?url=" + URLEncoder.encode(a.getLink(), "UTF-8"), null);
                buf.append("</div>\n");
                
-               buf.append("<div class='article-info'>" + a.website + " - " + a.publicationDate + "</div>");
+               buf.append("<div class='article-info'>" + a.getWebsite() + " - " + a.getPublicationDate() + "</div>");
                
                buf.append("<div class='article-description'>\n");
-               if (a.description != null) {
+               if (a.getDescription() != null) {
                        buf.append("<p>");
-                       if (a.description.length() < 512) {
-                               buf.append(a.description);
+                       if (a.getDescription().length() < 512) {
+                               buf.append(a.getDescription());
                        } else {
-                               buf.append(a.description.substring(0, 512));
+                               buf.append(a.getDescription().substring(0, 512));
                                buf.append("[..]");
                        }
                        buf.append("</p>");