From 7b8a970adb62ec5d1c5ca07b5bbbb5750f0cdd62 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Wed, 18 Oct 2017 23:54:20 +0200 Subject: [PATCH] converters in the servlet package --- war/src/main/java/pnews/HTML.java | 127 ---------------------------- war/src/main/java/pnews/JSON.java | 28 ------- war/src/main/java/pnews/servlet/HTML.java | 130 +++++++++++++++++++++++++++++ war/src/main/java/pnews/servlet/JSON.java | 28 +++++++ war/src/main/java/pnews/servlet/Pnews.java | 2 - 5 files changed, 158 insertions(+), 157 deletions(-) delete mode 100644 war/src/main/java/pnews/HTML.java delete mode 100644 war/src/main/java/pnews/JSON.java create mode 100644 war/src/main/java/pnews/servlet/HTML.java create mode 100644 war/src/main/java/pnews/servlet/JSON.java diff --git a/war/src/main/java/pnews/HTML.java b/war/src/main/java/pnews/HTML.java deleted file mode 100644 index 4b4af8b..0000000 --- a/war/src/main/java/pnews/HTML.java +++ /dev/null @@ -1,127 +0,0 @@ -package pnews; - -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -public class HTML { - private static final String CLASS_NAME= HTML.class.getName(); - private static final Logger LOG = Logger.getLogger(CLASS_NAME); - - private static void appendA(StringBuffer buf, String child, String href, String cl) { - buf.append("'); - buf.append(child); - buf.append(""); - } - - private static void appendDiv(StringBuffer buf, String child) { - buf.append("
"); - buf.append(child); - buf.append("
\n"); - } - - private static void appendP(StringBuffer buf, String child) { - buf.append("

"); - buf.append(child); - buf.append("

\n"); - } - - private static void append(StringBuffer buf, Article a) throws UnsupportedEncodingException { - buf.append("
\n"); - - buf.append("
\n"); - if (a.thumbnail != null) { - buf.append("\n"); - } - buf.append("
\n"); - - buf.append("
\n"); - - buf.append("
\n"); - appendA(buf, a.title, "redirect?url=" + URLEncoder.encode(a.link, "UTF-8"), null); - buf.append("
\n"); - - buf.append("
" + a.website + " - " + a.publicationDate + "
"); - - buf.append("
\n"); - if (a.description != null) { - buf.append("

"); - buf.append(a.description); - buf.append("

"); - } - buf.append("
\n"); - - buf.append("
\n"); - - buf.append("
\n"); - } - - private static void appendMenu(StringBuffer buf, Category catActive) { - String cl; - - buf.append("\n"); - } - - public static String toHTML(List
articles, Category catActive) { - StringBuffer buf; - int i; - - buf = new StringBuffer(); - buf.append("\n"); - buf.append("\n"); - buf.append("\n"); - buf.append("\n"); - buf.append("\n"); - buf.append("PNews\n"); - buf.append("\n"); - buf.append("\n"); - - appendMenu(buf, catActive); - - i = 0; - for (Article e: articles) { - try { - append(buf, e); - } catch (UnsupportedEncodingException e1) { - LOG.log(Level.SEVERE, "fail to convert article to HTML", e1); - } - if (i == 100) - break; - else - i++; - } - - buf.append("\n"); - buf.append("\n"); - - return buf.toString(); - } -} diff --git a/war/src/main/java/pnews/JSON.java b/war/src/main/java/pnews/JSON.java deleted file mode 100644 index d01173d..0000000 --- a/war/src/main/java/pnews/JSON.java +++ /dev/null @@ -1,28 +0,0 @@ -package pnews; - -import com.google.gson.Gson; -import com.google.gson.JsonObject; - -import pnews.servlet.ArticleStore; - -public class JSON { - public static String getStats() { - JsonObject jarticles, jreadcounts; - Article[] articles; - - jarticles = new JsonObject(); - - jarticles.addProperty("articles-count", ArticleStore.singleton.size()); - - jreadcounts = new JsonObject(); - jarticles.add("read-counts", jreadcounts); - - articles = ArticleStore.singleton.getArticles(); - for (Article a: articles) - if (a.readCount.get() > 0) - jreadcounts.addProperty(a.link, a.readCount); - - return new Gson().toJson(jarticles); - - } -} diff --git a/war/src/main/java/pnews/servlet/HTML.java b/war/src/main/java/pnews/servlet/HTML.java new file mode 100644 index 0000000..b78d29b --- /dev/null +++ b/war/src/main/java/pnews/servlet/HTML.java @@ -0,0 +1,130 @@ +package pnews.servlet; + +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +import pnews.Article; +import pnews.Category; + +public class HTML { + private static final String CLASS_NAME= HTML.class.getName(); + private static final Logger LOG = Logger.getLogger(CLASS_NAME); + + private static void appendA(StringBuffer buf, String child, String href, String cl) { + buf.append("'); + buf.append(child); + buf.append(""); + } + + private static void appendDiv(StringBuffer buf, String child) { + buf.append("
"); + buf.append(child); + buf.append("
\n"); + } + + private static void appendP(StringBuffer buf, String child) { + buf.append("

"); + buf.append(child); + buf.append("

\n"); + } + + private static void append(StringBuffer buf, Article a) throws UnsupportedEncodingException { + buf.append("
\n"); + + buf.append("
\n"); + if (a.thumbnail != null) { + buf.append("\n"); + } + buf.append("
\n"); + + buf.append("
\n"); + + buf.append("
\n"); + appendA(buf, a.title, "redirect?url=" + URLEncoder.encode(a.link, "UTF-8"), null); + buf.append("
\n"); + + buf.append("
" + a.website + " - " + a.publicationDate + "
"); + + buf.append("
\n"); + if (a.description != null) { + buf.append("

"); + buf.append(a.description); + buf.append("

"); + } + buf.append("
\n"); + + buf.append("
\n"); + + buf.append("
\n"); + } + + private static void appendMenu(StringBuffer buf, Category catActive) { + String cl; + + buf.append("\n"); + } + + public static String toHTML(List
articles, Category catActive) { + StringBuffer buf; + int i; + + buf = new StringBuffer(); + buf.append("\n"); + buf.append("\n"); + buf.append("\n"); + buf.append("\n"); + buf.append("\n"); + buf.append("PNews\n"); + buf.append("\n"); + buf.append("\n"); + + appendMenu(buf, catActive); + + i = 0; + for (Article e: articles) { + try { + append(buf, e); + } catch (UnsupportedEncodingException e1) { + LOG.log(Level.SEVERE, "fail to convert article to HTML", e1); + } + if (i == 100) + break; + else + i++; + } + + buf.append("\n"); + buf.append("\n"); + + return buf.toString(); + } +} diff --git a/war/src/main/java/pnews/servlet/JSON.java b/war/src/main/java/pnews/servlet/JSON.java new file mode 100644 index 0000000..5167186 --- /dev/null +++ b/war/src/main/java/pnews/servlet/JSON.java @@ -0,0 +1,28 @@ +package pnews.servlet; + +import com.google.gson.Gson; +import com.google.gson.JsonObject; + +import pnews.Article; + +public class JSON { + public static String getStats() { + JsonObject jarticles, jreadcounts; + Article[] articles; + + jarticles = new JsonObject(); + + jarticles.addProperty("articles-count", ArticleStore.singleton.size()); + + jreadcounts = new JsonObject(); + jarticles.add("read-counts", jreadcounts); + + articles = ArticleStore.singleton.getArticles(); + for (Article a: articles) + if (a.readCount.get() > 0) + jreadcounts.addProperty(a.link, a.readCount); + + return new Gson().toJson(jarticles); + + } +} diff --git a/war/src/main/java/pnews/servlet/Pnews.java b/war/src/main/java/pnews/servlet/Pnews.java index 428ec87..79ee9f6 100644 --- a/war/src/main/java/pnews/servlet/Pnews.java +++ b/war/src/main/java/pnews/servlet/Pnews.java @@ -22,8 +22,6 @@ import com.rometools.rome.io.FeedException; import pnews.Article; import pnews.Category; -import pnews.HTML; -import pnews.JSON; public class Pnews extends HttpServlet { private static final Logger LOG = Logger.getLogger(Pnews.class.getName()); -- 2.7.4