/hg/icedtea-web: Authors made as links in html docs
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Mon Sep 25 16:05:59 UTC 2017
changeset 676a6ba5bc31 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=676a6ba5bc31
author: Jiri Vanek <jvanek at redhat.com>
date: Mon Sep 25 18:05:33 2017 +0200
Authors made as links in html docs
* netx/net/sourceforge/jnlp/util/docprovider/TextsProvider.java: isntanceof replaced by correct interface method
* netx/net/sourceforge/jnlp/util/docprovider/formatters/formatters/Formatter.java: added getAdressLink and replaceLtGtCharacters methods
* netx/net/sourceforge/jnlp/util/docprovider/formatters/formatters/HtmlFormatter.java: implemented newmethods. Added dummy antispam protection
* netx/net/sourceforge/jnlp/util/docprovider/formatters/formatters/ReplacingTextFormatter.java: dummy impl of new methods
* tests/netx/unit/net/sourceforge/jnlp/util/docprovider/ReadAutorsTest.java: adapted
diffstat:
ChangeLog | 10 +
netx/net/sourceforge/jnlp/util/docprovider/TextsProvider.java | 8 +-
netx/net/sourceforge/jnlp/util/docprovider/formatters/formatters/Formatter.java | 4 +
netx/net/sourceforge/jnlp/util/docprovider/formatters/formatters/HtmlFormatter.java | 37 +++-
netx/net/sourceforge/jnlp/util/docprovider/formatters/formatters/ReplacingTextFormatter.java | 10 +-
tests/netx/unit/net/sourceforge/jnlp/util/docprovider/ReadAutorsTest.java | 81 +++++----
6 files changed, 102 insertions(+), 48 deletions(-)
diffs (252 lines):
diff -r e9102a5cb03c -r 676a6ba5bc31 ChangeLog
--- a/ChangeLog Thu Sep 14 15:13:49 2017 +0200
+++ b/ChangeLog Mon Sep 25 18:05:33 2017 +0200
@@ -1,3 +1,13 @@
+2017-09-25 Jiri Vanek <jvanek at redhat.com>
+ Tomáš Votava <tomcacolca at gmail.com>
+
+ Authors made as links in html docs
+ * netx/net/sourceforge/jnlp/util/docprovider/TextsProvider.java: isntanceof replaced by correct interface method
+ * netx/net/sourceforge/jnlp/util/docprovider/formatters/formatters/Formatter.java: added getAdressLink and replaceLtGtCharacters methods
+ * netx/net/sourceforge/jnlp/util/docprovider/formatters/formatters/HtmlFormatter.java: implemented newmethods. Added dummy antispam protection
+ * netx/net/sourceforge/jnlp/util/docprovider/formatters/formatters/ReplacingTextFormatter.java: dummy impl of new methods
+ * tests/netx/unit/net/sourceforge/jnlp/util/docprovider/ReadAutorsTest.java: adapted
+
2017-09-14 Jiri Vanek <jvanek at redhat.com>
Tomáš Votava <tomcacolca at gmail.com>
diff -r e9102a5cb03c -r 676a6ba5bc31 netx/net/sourceforge/jnlp/util/docprovider/TextsProvider.java
--- a/netx/net/sourceforge/jnlp/util/docprovider/TextsProvider.java Thu Sep 14 15:13:49 2017 +0200
+++ b/netx/net/sourceforge/jnlp/util/docprovider/TextsProvider.java Mon Sep 25 18:05:33 2017 +0200
@@ -743,13 +743,7 @@
if (line.trim().isEmpty()) {
areAuthors = !areAuthors;
}
- if (getFormatter() instanceof HtmlFormatter) {
- String replace = line.replaceAll("<", "<");
- String replaceAll = replace.replaceAll(">", ">");
- sb.append(getFormatter().process(replaceAll));
- } else {
- sb.append(getFormatter().process(line));
- }
+ sb.append(getFormatter().process(getFormatter().getAdressLink(line)));
if (getFormatter() instanceof HtmlFormatter || areAuthors == false) {
sb.append(getFormatter().getNewLine());
}
diff -r e9102a5cb03c -r 676a6ba5bc31 netx/net/sourceforge/jnlp/util/docprovider/formatters/formatters/Formatter.java
--- a/netx/net/sourceforge/jnlp/util/docprovider/formatters/formatters/Formatter.java Thu Sep 14 15:13:49 2017 +0200
+++ b/netx/net/sourceforge/jnlp/util/docprovider/formatters/formatters/Formatter.java Mon Sep 25 18:05:33 2017 +0200
@@ -74,5 +74,9 @@
public String getTail();
public String getFileSuffix();
+
+ public String getAdressLink(String s);
+
+ public String replaceLtGtCharacters(String s);
}
diff -r e9102a5cb03c -r 676a6ba5bc31 netx/net/sourceforge/jnlp/util/docprovider/formatters/formatters/HtmlFormatter.java
--- a/netx/net/sourceforge/jnlp/util/docprovider/formatters/formatters/HtmlFormatter.java Thu Sep 14 15:13:49 2017 +0200
+++ b/netx/net/sourceforge/jnlp/util/docprovider/formatters/formatters/HtmlFormatter.java Mon Sep 25 18:05:33 2017 +0200
@@ -33,8 +33,7 @@
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
exception statement from your version.
-*/
-
+ */
package net.sourceforge.jnlp.util.docprovider.formatters.formatters;
import java.util.Date;
@@ -43,14 +42,15 @@
import java.util.TreeMap;
import net.sourceforge.jnlp.runtime.JNLPRuntime;
-
public class HtmlFormatter extends ReplacingTextFormatter {
private final Map<String, String> content = new TreeMap<>();
private final boolean allowContext;
private final boolean allowLogo;
private final boolean includeXmlHeader;
- public static final String SUFFIX = "html";
+ private final String lT = "<";
+ private final String gT = ">";
+ public static final String SUFFIX = "html";
@Override
public String process(String s) {
@@ -58,7 +58,6 @@
return s;
}
-
public HtmlFormatter(boolean allowContext, boolean allowLogo, boolean includeXmlHeader) {
this.allowContext = allowContext;
this.allowLogo = allowLogo;
@@ -146,7 +145,7 @@
@Override
public String getFileSuffix() {
- return "."+SUFFIX;
+ return "." + SUFFIX;
}
@Override
@@ -182,4 +181,30 @@
return "<li><b>" + key + " </b> - " + process(value) + "</li>";
}
+ @Override
+ public String getAdressLink(String s) {
+ String emailDelBracket = s.replaceAll(".*<", "");
+ String adress = emailDelBracket.replaceAll(">.*", "");
+ if (s.contains("@")) {
+ String name = s.replaceAll("<.*", "").trim();
+ return "<a href=\"mailto:" + antiSpam(adress) + "\" target=\"_top\">" + name + "</a>";
+ } else {
+ return s.replaceAll("<.*>", "<a href=\"" + adress + "\">" + adress + "</a>");
+ }
+ }
+
+ @Override
+ public String replaceLtGtCharacters(String s) {
+ String replaceLt = s.replaceAll("<", lT);
+ String replaceLtGt = replaceLt.replaceAll(">", gT);
+ return replaceLtGt;
+ }
+
+ private static String antiSpam(String adress) {
+ StringBuilder sb = new StringBuilder();
+ for (int x = 0; x < adress.length(); x++) {
+ sb.append(adress.charAt(x)).append(" ");
+ }
+ return sb.toString().trim();
+ }
}
diff -r e9102a5cb03c -r 676a6ba5bc31 netx/net/sourceforge/jnlp/util/docprovider/formatters/formatters/ReplacingTextFormatter.java
--- a/netx/net/sourceforge/jnlp/util/docprovider/formatters/formatters/ReplacingTextFormatter.java Thu Sep 14 15:13:49 2017 +0200
+++ b/netx/net/sourceforge/jnlp/util/docprovider/formatters/formatters/ReplacingTextFormatter.java Mon Sep 25 18:05:33 2017 +0200
@@ -99,8 +99,16 @@
return sb.toString();
}
+ @Override
+ public String getAdressLink(String s) {
+ return s;
+ }
-
+ @Override
+ public String replaceLtGtCharacters(String s) {
+ return s;
+ }
+
}
diff -r e9102a5cb03c -r 676a6ba5bc31 tests/netx/unit/net/sourceforge/jnlp/util/docprovider/ReadAutorsTest.java
--- a/tests/netx/unit/net/sourceforge/jnlp/util/docprovider/ReadAutorsTest.java Thu Sep 14 15:13:49 2017 +0200
+++ b/tests/netx/unit/net/sourceforge/jnlp/util/docprovider/ReadAutorsTest.java Mon Sep 25 18:05:33 2017 +0200
@@ -50,46 +50,48 @@
public static final String NEWLINE = System.getProperty("line.separator");
public static final String HTMLNEWLINE = "<BR/>";
public static final String MANNEWLINE = ".br";
+ private static final String ANTISPAM_EMAIL="t e s t @ t e s t . t e s t";
- public static final String TESTTEXT = "<test at test.test><<>><><>" + NEWLINE + "<><><>";
- public static final String BRACKETSTESTREPLACEDHTML = "<test at test.test><<>><><>" + HTMLNEWLINE + NEWLINE + "<><><>" + HTMLNEWLINE + NEWLINE;
- public static final String BRACKETSTESTREPLACEDMAN = "<test at test.test><<>><><>" + NEWLINE + MANNEWLINE + NEWLINE + "<><><>" + NEWLINE + MANNEWLINE + NEWLINE;
+ public static final String TESTTEXT = "NAME SURNAME <test at test.test>" + NEWLINE + "<><><>";
+ public static final String BRACKETSTESTREPLACED = "NAME SURNAME <test at test.test>" + NEWLINE + "<><><>";
+ public static final String BRACKETSTESTREPLACEDHTML = "<a href=\"mailto:"+ANTISPAM_EMAIL+"\"" + " target=\"_top\">NAME SURNAME</a>" + HTMLNEWLINE + NEWLINE + "<a href=\"\"></a>" + HTMLNEWLINE + NEWLINE;
+ public static final String BRACKETSTESTREPLACEDMAN = "NAME SURNAME <test at test.test>" + NEWLINE + MANNEWLINE + NEWLINE + "<><><>" + NEWLINE + MANNEWLINE + NEWLINE;
public static final String BRACKETSTESTREPLACEDPLAIN = TESTTEXT + NEWLINE;
- public static final String FILESTREAM = "RANDOM TEXT" + NEWLINE + "RANDOM TEXT" + NEWLINE
+ public static final String FILESTREAM = "This is autor list." + NEWLINE + "This is random text." + NEWLINE
+ NEWLINE
- + "ANOTHER RANDOM TEXT" + NEWLINE
- + "ANOTHER RANDOM TEXT" + NEWLINE
- + "ANOTHER RANDOM TEXT" + NEWLINE
- + "ANOTHER RANDOM TEXT" + NEWLINE
- + "ANOTHER RANDOM TEXT" + NEWLINE
- + "ANOTHER RANDOM TEXT" + NEWLINE
+ + "NAME SURNAME <test at test.test>" + NEWLINE
+ + "NAME SURNAME <test at test.test>" + NEWLINE
+ + "NAME SURNAME <test at test.test>" + NEWLINE
+ + "NAME SURNAME <test at test.test>" + NEWLINE
+ + "NAME SURNAME <test at test.test>" + NEWLINE
+ + "NAME SURNAME <test at test.test>" + NEWLINE
+ NEWLINE
- + "MORE RANDOM TEXT" + NEWLINE
- + "MORE RANDOM TEXT" + NEWLINE
- + "MORE RANDOM TEXT" + NEWLINE;
- public static final String FILESTREAMHTML = "RANDOM TEXT" + HTMLNEWLINE + NEWLINE + "RANDOM TEXT" + HTMLNEWLINE + NEWLINE
+ + "This is list with links" + NEWLINE
+ + "OpenJDK <http://openjdk.java.net/>" + NEWLINE
+ + "OpenJDK <http://openjdk.java.net/>" + NEWLINE;
+ public static final String FILESTREAMHTML = "This is autor list." + HTMLNEWLINE + NEWLINE + "This is random text." + HTMLNEWLINE + NEWLINE
+ HTMLNEWLINE + NEWLINE
- + "ANOTHER RANDOM TEXT" + HTMLNEWLINE + NEWLINE
- + "ANOTHER RANDOM TEXT" + HTMLNEWLINE + NEWLINE
- + "ANOTHER RANDOM TEXT" + HTMLNEWLINE + NEWLINE
- + "ANOTHER RANDOM TEXT" + HTMLNEWLINE + NEWLINE
- + "ANOTHER RANDOM TEXT" + HTMLNEWLINE + NEWLINE
- + "ANOTHER RANDOM TEXT" + HTMLNEWLINE + NEWLINE
+ + "<a href=\"mailto:"+ANTISPAM_EMAIL+"\" target=\"_top\">NAME SURNAME</a>" + HTMLNEWLINE + NEWLINE
+ + "<a href=\"mailto:"+ANTISPAM_EMAIL+"\" target=\"_top\">NAME SURNAME</a>" + HTMLNEWLINE + NEWLINE
+ + "<a href=\"mailto:"+ANTISPAM_EMAIL+"\" target=\"_top\">NAME SURNAME</a>" + HTMLNEWLINE + NEWLINE
+ + "<a href=\"mailto:"+ANTISPAM_EMAIL+"\" target=\"_top\">NAME SURNAME</a>" + HTMLNEWLINE + NEWLINE
+ + "<a href=\"mailto:"+ANTISPAM_EMAIL+"\" target=\"_top\">NAME SURNAME</a>" + HTMLNEWLINE + NEWLINE
+ + "<a href=\"mailto:"+ANTISPAM_EMAIL+"\" target=\"_top\">NAME SURNAME</a>" + HTMLNEWLINE + NEWLINE
+ HTMLNEWLINE + NEWLINE
- + "MORE RANDOM TEXT" + HTMLNEWLINE + NEWLINE
- + "MORE RANDOM TEXT" + HTMLNEWLINE + NEWLINE
- + "MORE RANDOM TEXT" + HTMLNEWLINE + NEWLINE;
- public static final String FILESTREAMPLAIN = "RANDOM TEXT" + NEWLINE + "RANDOM TEXT" + NEWLINE
- + "ANOTHER RANDOM TEXT"
- + "ANOTHER RANDOM TEXT"
- + "ANOTHER RANDOM TEXT"
- + "ANOTHER RANDOM TEXT"
- + "ANOTHER RANDOM TEXT"
- + "ANOTHER RANDOM TEXT" + NEWLINE
- + "MORE RANDOM TEXT" + NEWLINE
- + "MORE RANDOM TEXT" + NEWLINE
- + "MORE RANDOM TEXT" + NEWLINE;
+ + "This is list with links" + HTMLNEWLINE + NEWLINE
+ + "OpenJDK <a href=\"http://openjdk.java.net/\">http://openjdk.java.net/</a>" + HTMLNEWLINE + NEWLINE
+ + "OpenJDK <a href=\"http://openjdk.java.net/\">http://openjdk.java.net/</a>" + HTMLNEWLINE + NEWLINE;
+ public static final String FILESTREAMPLAIN = "This is autor list." + NEWLINE + "This is random text." + NEWLINE
+ + "NAME SURNAME <test at test.test>"
+ + "NAME SURNAME <test at test.test>"
+ + "NAME SURNAME <test at test.test>"
+ + "NAME SURNAME <test at test.test>"
+ + "NAME SURNAME <test at test.test>"
+ + "NAME SURNAME <test at test.test>" + NEWLINE
+ + "This is list with links" + NEWLINE
+ + "OpenJDK <http://openjdk.java.net/>" + NEWLINE
+ + "OpenJDK <http://openjdk.java.net/>" + NEWLINE;
@Test
public void replaceBracketsWithEntitiesHtml() throws IOException {
@@ -150,6 +152,17 @@
};
String output = tp.readAuthorsImpl(new StringReader(FILESTREAM));
assertEquals(FILESTREAMPLAIN, output);
-
+ }
+
+ @Test
+ public void replaceLtGtTest() throws IOException {
+ TextsProvider tp = new TextsProvider("utf-8", new HtmlFormatter(), true, true) {
+ @Override
+ public String getId() {
+ return "test6";
+ }
+ };
+ String output = tp.getFormatter().replaceLtGtCharacters(TESTTEXT);
+ assertEquals(BRACKETSTESTREPLACED, output);
}
}
More information about the distro-pkg-dev
mailing list