projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Expose following times from FriendProvider
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
web
/
page
/
FreenetTemplatePage.java
diff --git
a/src/main/java/net/pterodactylus/sone/web/page/FreenetTemplatePage.java
b/src/main/java/net/pterodactylus/sone/web/page/FreenetTemplatePage.java
index
5c027e5
..
9cfd026
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/page/FreenetTemplatePage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/page/FreenetTemplatePage.java
@@
-1,5
+1,5
@@
/*
/*
- * Sone - FreenetTemplatePage.java - Copyright © 2010 David Roden
+ * Sone - FreenetTemplatePage.java - Copyright © 2010
–2016
David Roden
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-17,8
+17,12
@@
package net.pterodactylus.sone.web.page;
package net.pterodactylus.sone.web.page;
+import static java.lang.String.format;
+import static java.util.logging.Logger.getLogger;
+
import java.io.IOException;
import java.io.StringWriter;
import java.io.IOException;
import java.io.StringWriter;
+import java.net.URI;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@
-27,7
+31,6
@@
import java.util.Map.Entry;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.logging.Level;
import java.util.logging.Logger;
-import net.pterodactylus.util.logging.Logging;
import net.pterodactylus.util.template.Template;
import net.pterodactylus.util.template.TemplateContext;
import net.pterodactylus.util.template.TemplateContextFactory;
import net.pterodactylus.util.template.Template;
import net.pterodactylus.util.template.TemplateContext;
import net.pterodactylus.util.template.TemplateContextFactory;
@@
-47,10
+50,10
@@
import freenet.support.HTMLNode;
*
* @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
*/
*
* @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
*/
-public class FreenetTemplatePage implements
Page<FreenetRequest>
, LinkEnabledCallback {
+public class FreenetTemplatePage implements
FreenetPage
, LinkEnabledCallback {
/** The logger. */
/** The logger. */
- private static final Logger logger =
Logging.getLogger(FreenetTemplatePage.class
);
+ private static final Logger logger =
getLogger(FreenetTemplatePage.class.getName()
);
/** The path of the page. */
private final String path;
/** The path of the page. */
private final String path;
@@
-99,6
+102,7
@@
public class FreenetTemplatePage implements Page<FreenetRequest>, LinkEnabledCal
* The request to serve
* @return The title of the page
*/
* The request to serve
* @return The title of the page
*/
+ @SuppressWarnings("static-method")
protected String getPageTitle(FreenetRequest request) {
return null;
}
protected String getPageTitle(FreenetRequest request) {
return null;
}
@@
-115,7
+119,7
@@
public class FreenetTemplatePage implements Page<FreenetRequest>, LinkEnabledCal
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- public Response handleRequest(FreenetRequest request, Response response) throws IOException {
+ public
final
Response handleRequest(FreenetRequest request, Response response) throws IOException {
String redirectTarget = getRedirectTarget(request);
if (redirectTarget != null) {
return new RedirectResponse(redirectTarget);
String redirectTarget = getRedirectTarget(request);
if (redirectTarget != null) {
return new RedirectResponse(redirectTarget);
@@
-154,7
+158,7
@@
public class FreenetTemplatePage implements Page<FreenetRequest>, LinkEnabledCal
long start = System.nanoTime();
processTemplate(request, templateContext);
long finish = System.nanoTime();
long start = System.nanoTime();
processTemplate(request, templateContext);
long finish = System.nanoTime();
- logger.log(Level.FINEST,
"Template was rendered in " + ((finish - start) / 1000) / 1000.0 + "ms."
);
+ logger.log(Level.FINEST,
format("Template was rendered in %.2fms.", (finish - start) / 1000000.0)
);
} catch (RedirectException re1) {
return new RedirectResponse(re1.getTarget());
}
} catch (RedirectException re1) {
return new RedirectResponse(re1.getTarget());
}
@@
-174,6
+178,7
@@
public class FreenetTemplatePage implements Page<FreenetRequest>, LinkEnabledCal
*
* @return Additional style sheets to load
*/
*
* @return Additional style sheets to load
*/
+ @SuppressWarnings("static-method")
protected Collection<String> getStyleSheets() {
return Collections.emptySet();
}
protected Collection<String> getStyleSheets() {
return Collections.emptySet();
}
@@
-183,6
+188,7
@@
public class FreenetTemplatePage implements Page<FreenetRequest>, LinkEnabledCal
*
* @return The URL of the shortcut icon, or {@code null} for no icon
*/
*
* @return The URL of the shortcut icon, or {@code null} for no icon
*/
+ @SuppressWarnings("static-method")
protected String getShortcutIcon() {
return null;
}
protected String getShortcutIcon() {
return null;
}
@@
-226,6
+232,7
@@
public class FreenetTemplatePage implements Page<FreenetRequest>, LinkEnabledCal
* The request that is processed
* @return The URL to redirect to, or {@code null} to not redirect
*/
* The request that is processed
* @return The URL to redirect to, or {@code null} to not redirect
*/
+ @SuppressWarnings("static-method")
protected String getRedirectTarget(FreenetRequest request) {
return null;
}
protected String getRedirectTarget(FreenetRequest request) {
return null;
}
@@
-237,6
+244,7
@@
public class FreenetTemplatePage implements Page<FreenetRequest>, LinkEnabledCal
* The request for which to return the link nodes
* @return All link nodes that should be added to the HTML head
*/
* The request for which to return the link nodes
* @return All link nodes that should be added to the HTML head
*/
+ @SuppressWarnings("static-method")
protected List<Map<String, String>> getAdditionalLinkNodes(FreenetRequest request) {
return Collections.emptyList();
}
protected List<Map<String, String>> getAdditionalLinkNodes(FreenetRequest request) {
return Collections.emptyList();
}
@@
-248,10
+256,19
@@
public class FreenetTemplatePage implements Page<FreenetRequest>, LinkEnabledCal
* @return {@code true} if this page should only be allowed for hosts with
* full access, {@code false} to allow this page for any host
*/
* @return {@code true} if this page should only be allowed for hosts with
* full access, {@code false} to allow this page for any host
*/
+ @SuppressWarnings("static-method")
protected boolean isFullAccessOnly() {
return false;
}
protected boolean isFullAccessOnly() {
return false;
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean isLinkExcepted(URI link) {
+ return false;
+ }
+
//
// INTERFACE LinkEnabledCallback
//
//
// INTERFACE LinkEnabledCallback
//
@@
-296,6
+313,11
@@
public class FreenetTemplatePage implements Page<FreenetRequest>, LinkEnabledCal
return target;
}
return target;
}
+ @Override
+ public String toString() {
+ return format("RedirectException{target='%s'}", target);
+ }
+
}
}
}
}