X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2FBasicReader.java;fp=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2FBasicReader.java;h=e0970e3ef09621e9f8c582d65fb7e4a2c2afba13;hp=c749a59cdc6e1c1149282a78c6b777ef1f680a2b;hb=53f76130c5337a77362b191f22115b461811ba36;hpb=7879b47fdbdcaf465327bcbee53a7e31331feb97 diff --git a/src/be/nikiroo/fanfix/reader/BasicReader.java b/src/be/nikiroo/fanfix/reader/BasicReader.java index c749a59..e0970e3 100644 --- a/src/be/nikiroo/fanfix/reader/BasicReader.java +++ b/src/be/nikiroo/fanfix/reader/BasicReader.java @@ -232,9 +232,11 @@ public abstract class BasicReader implements Reader { metaDesc.put("Published on", meta.getPublisher()); metaDesc.put("URL", meta.getUrl()); if (meta.isImageDocument()) { - metaDesc.put("Number of images", format(meta.getWords())); + metaDesc.put("Number of images", + StringUtils.formatNumber(meta.getWords())); } else { - metaDesc.put("Number of words", format(meta.getWords())); + metaDesc.put("Number of words", + StringUtils.formatNumber(meta.getWords())); } metaDesc.put("Source", meta.getSource()); metaDesc.put("Subject", meta.getSubject()); @@ -351,32 +353,6 @@ public abstract class BasicReader implements Reader { } } - /** - * @deprecated use StringUtils when updated - */ - @Deprecated - static private String format(long value) { - //TODO: use StringUtils - - String display = ""; - String suffix = ""; - - if (value > 4000) { - value = value / 1000; - suffix = "k"; - } - - while (value > 0) { - if (!display.isEmpty()) { - display = "." + display; - } - display = (value % 1000) + display; - value = value / 1000; - } - - return display + suffix; - } - static private String formatDate(String date) { long ms = 0;