X-Git-Url: https://wpitchoune.net/gitweb/?a=blobdiff_plain;f=war%2Fsrc%2Fmain%2Fjava%2Fpnews%2Fservlet%2FJSON.java;h=0a9b8cec523804c3a46e0e8a219b373c17d5d25f;hb=386f46525e32212ac5f3653135a6539c1b2639eb;hp=20afaa63103406e8eb04e800b7feb5778fa86cb2;hpb=27591c1933180a43423c78cc8cda28a3da1bfccf;p=pnews.git diff --git a/war/src/main/java/pnews/servlet/JSON.java b/war/src/main/java/pnews/servlet/JSON.java index 20afaa6..0a9b8ce 100644 --- a/war/src/main/java/pnews/servlet/JSON.java +++ b/war/src/main/java/pnews/servlet/JSON.java @@ -14,10 +14,10 @@ import pnews.Category; public class JSON { private static final Logger LOG = Logger.getLogger(JSON.class.getName()); - public static String getStats() { + public static String getStats(Category[] cats) { JsonObject jstats, jreadcounts, jcategories, jmemory; - Article[] articles; Runtime runtime; + Article[] articles; jstats = new JsonObject(); @@ -34,10 +34,11 @@ public class JSON { jcategories = new JsonObject(); jstats.add("categories", jcategories); - for (Category cat: Category.values()) + for (Category cat: cats) try { - jcategories.addProperty(cat.getId(), ArticleProvider.singleton.getArticles(cat).size()); - } catch (IllegalArgumentException | FeedException | IOException e) { + jcategories.addProperty(cat.getName(), + articles.length); + } catch (IllegalArgumentException e) { LOG.log(Level.SEVERE, "Fail to retrieve articles", e); }