projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove @author tags
[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
97ee53b
..
a9710ee
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–201
2
David Roden
+ * Sone - FreenetTemplatePage.java - Copyright © 2010–201
6
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,6
+17,9
@@
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.net.URI;
import java.io.IOException;
import java.io.StringWriter;
import java.net.URI;
@@
-28,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;
@@
-45,13
+47,11
@@
import freenet.support.HTMLNode;
/**
* Base class for all {@link Page}s that are rendered with {@link Template}s and
* fit into Freenet’s web interface.
/**
* Base class for all {@link Page}s that are rendered with {@link Template}s and
* fit into Freenet’s web interface.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
*/
public class FreenetTemplatePage implements FreenetPage, LinkEnabledCallback {
/** The logger. */
*/
public class FreenetTemplatePage implements FreenetPage, LinkEnabledCallback {
/** 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;
@@
-117,7
+117,7
@@
public class FreenetTemplatePage implements FreenetPage, LinkEnabledCallback {
* {@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);
@@
-156,7
+156,7
@@
public class FreenetTemplatePage implements FreenetPage, LinkEnabledCallback {
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 %dms.", ((finish - start) / 1000) / 1000.0
);
+ 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());
}
@@
-284,8
+284,6
@@
public class FreenetTemplatePage implements FreenetPage, LinkEnabledCallback {
* wants to redirect the user during the
* {@link FreenetTemplatePage#processTemplate(FreenetRequest, TemplateContext)}
* method call.
* wants to redirect the user during the
* {@link FreenetTemplatePage#processTemplate(FreenetRequest, TemplateContext)}
* method call.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
*/
public static class RedirectException extends Exception {
*/
public static class RedirectException extends Exception {
@@
-311,6
+309,11
@@
public class FreenetTemplatePage implements FreenetPage, LinkEnabledCallback {
return target;
}
return target;
}
+ @Override
+ public String toString() {
+ return format("RedirectException{target='%s'}", target);
+ }
+
}
}
}
}