\n");
- // Get news content.
- String newsContent = getContent();
- if (newsContent != "") {
- buf.append("
\n");
- // Parse news content for headings.
- int start = newsContent.indexOf("");
- while (start >= 0) {
- // Add offset to start:
- // 4 - gets rid of
- // 16 - gets rid of the date as well (assuming form "yyyy-mm-dd: Foobarbaz...")
- newsContent = newsContent.substring(start+16, newsContent.length());
- int end = newsContent.indexOf("
");
- if (end >= 0) {
- String heading = newsContent.substring(0, end);
- buf.append("
- ").append(heading).append("
\n");
- }
- start = newsContent.indexOf("");
- }
- buf.append("
\n");
- buf.append(newsUrl).append(Messages.getString("Show news", _context)).append("\n");
- } else {
- buf.append("
").append(_("none")).append("");
- }
- // Add post-headings stuff.
- buf.append("
\n");
- }
- return buf.toString();
+ SummaryBarRenderer renderer = new SummaryBarRenderer(_context, this);
+ return renderer.renderNewsHeadingsHTML();
}
/** @since 0.8.12 */
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
index 86ad131419..2fd6c80732 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
@@ -14,10 +14,20 @@ import net.i2p.router.RouterContext;
public class SummaryBarRenderer {
private final RouterContext _context;
private final SummaryHelper _helper;
+ private final NewsHelper _newshelper;
public SummaryBarRenderer(RouterContext context, SummaryHelper helper) {
+ this(context, helper, null);
+ }
+
+ public SummaryBarRenderer(RouterContext context, NewsHelper newshelper) {
+ this(context, null, newshelper);
+ }
+
+ public SummaryBarRenderer(RouterContext context, SummaryHelper helper, NewsHelper newshelper) {
_context = context;
_helper = helper;
+ _newshelper = newshelper;
}
/**
@@ -83,7 +93,7 @@ public class SummaryBarRenderer {
.append("