projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
🔀 Merge “release/v81” into “master”
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
main
/
DefaultLoaders.java
diff --git
a/src/main/java/net/pterodactylus/sone/main/DefaultLoaders.java
b/src/main/java/net/pterodactylus/sone/main/DefaultLoaders.java
index
4978d7c
..
2a2bd8c
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/main/DefaultLoaders.java
+++ b/
src/main/java/net/pterodactylus/sone/main/DefaultLoaders.java
@@
-1,27
+1,30
@@
package net.pterodactylus.sone.main;
package net.pterodactylus.sone.main;
-import static net.pterodactylus.util.template.TemplateParser.parse;
-
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.io.UnsupportedEncodingException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.io.UnsupportedEncodingException;
+import javax.annotation.Nonnull;
+import net.pterodactylus.sone.web.WebInterface;
import net.pterodactylus.util.io.Closer;
import net.pterodactylus.util.io.Closer;
+import net.pterodactylus.util.template.ClassPathTemplateProvider;
import net.pterodactylus.util.template.Template;
import net.pterodactylus.util.template.Template;
+import net.pterodactylus.util.template.TemplateProvider;
import net.pterodactylus.util.web.Page;
import net.pterodactylus.util.web.Request;
import net.pterodactylus.util.web.StaticPage;
import net.pterodactylus.util.web.Page;
import net.pterodactylus.util.web.Request;
import net.pterodactylus.util.web.StaticPage;
+import static net.pterodactylus.util.template.TemplateParser.parse;
+
/**
* Default {@link Loaders} implementation that loads resources from the classpath.
/**
* Default {@link Loaders} implementation that loads resources from the classpath.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
*/
public class DefaultLoaders implements Loaders {
*/
public class DefaultLoaders implements Loaders {
+ @Nonnull
@Override
@Override
- public Template loadTemplate(String path) {
+ public Template loadTemplate(
@Nonnull
String path) {
InputStream templateInputStream = null;
Reader reader = null;
try {
InputStream templateInputStream = null;
Reader reader = null;
try {
@@
-36,9
+39,17
@@
public class DefaultLoaders implements Loaders {
}
}
}
}
+ @Nonnull
+ @Override
+ public <REQ extends Request> Page<REQ> loadStaticPage(@Nonnull String pathPrefix, @Nonnull String basePath, @Nonnull String mimeType) {
+ return new StaticPage<REQ>(pathPrefix, basePath, mimeType) {
+ };
+ }
+
+ @Nonnull
@Override
@Override
- public
<REQ extends Request> Page<REQ> loadStaticPage(String pathPrefix, String basePath, String mimeType
) {
- return new
StaticPage<REQ>(pathPrefix, basePath, mimeType
);
+ public
TemplateProvider getTemplateProvider(
) {
+ return new
ClassPathTemplateProvider(WebInterface.class, "/templates/"
);
}
}
}
}