From c88fa70f82de79e6c8b3c3c48a8803d466ba0572 Mon Sep 17 00:00:00 2001 From: str4d <str4d@mail.i2p> Date: Fri, 21 Nov 2014 12:52:24 +0000 Subject: [PATCH] Cleanups --- .../java/src/net/i2p/router/news/NewsXMLParser.java | 4 ++-- .../java/src/net/i2p/router/update/NewsFetcher.java | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/news/NewsXMLParser.java b/apps/routerconsole/java/src/net/i2p/router/news/NewsXMLParser.java index e643643ce8..2ad84c3d2f 100644 --- a/apps/routerconsole/java/src/net/i2p/router/news/NewsXMLParser.java +++ b/apps/routerconsole/java/src/net/i2p/router/news/NewsXMLParser.java @@ -35,7 +35,7 @@ public class NewsXMLParser { private NewsMetadata _metadata; private XHTMLMode _mode; - private static final Set xhtmlWhitelist = new HashSet(Arrays.asList(new String[] { + private static final Set<String> xhtmlWhitelist = new HashSet<String>(Arrays.asList(new String[] { "a", "b", "br", "div", "i", "p", "span", "font", "blockquote", "hr", "del", "ins", "em", "strong", "mark", "sub", "sup", "tt", "code", "strike", "s", "u", "h4", "h5", "h6", @@ -46,7 +46,7 @@ public class NewsXMLParser { })); // http://www.w3.org/TR/html-markup/global-attributes.html#common.attrs.event-handler - private static final Set attributeBlacklist = new HashSet(Arrays.asList(new String[] { + private static final Set<String> attributeBlacklist = new HashSet<String>(Arrays.asList(new String[] { "onabort", "onblur", "oncanplay", "oncanplaythrough", "onchange", "onclick", "oncontextmenu", "ondblclick", "ondrag", "ondragend", "ondragenter", "ondragleave", "ondragover", "ondragstart", "ondrop", "ondurationchange", "onemptied", diff --git a/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java b/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java index 063068cdca..9b9bc1ffbe 100644 --- a/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java +++ b/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java @@ -1,12 +1,9 @@ package net.i2p.router.update; import java.io.BufferedWriter; -import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; -import java.io.FilterInputStream; import java.io.FileOutputStream; -import java.io.InputStream; import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; @@ -14,15 +11,12 @@ import java.io.Writer; import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.Date; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.Set; import java.util.StringTokenizer; import net.i2p.crypto.SU3File; -- GitLab