projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
If no current Sone exists, return an error.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
web
/
CreateSonePage.java
diff --git
a/src/main/java/net/pterodactylus/sone/web/CreateSonePage.java
b/src/main/java/net/pterodactylus/sone/web/CreateSonePage.java
index
3f940a3
..
2c183df
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/CreateSonePage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/CreateSonePage.java
@@
-1,5
+1,5
@@
/*
/*
- * Sone - CreateSonePage.java - Copyright © 2010 David Roden
+ * Sone - CreateSonePage.java - Copyright © 2010
–2013
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
@@
-28,10
+28,11
@@
import java.util.logging.Logger;
import net.pterodactylus.sone.core.Core;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.freenet.wot.OwnIdentity;
import net.pterodactylus.sone.core.Core;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.freenet.wot.OwnIdentity;
-import net.pterodactylus.sone.web.page.
Page.Request.Method
;
+import net.pterodactylus.sone.web.page.
FreenetRequest
;
import net.pterodactylus.util.logging.Logging;
import net.pterodactylus.util.template.Template;
import net.pterodactylus.util.template.TemplateContext;
import net.pterodactylus.util.logging.Logging;
import net.pterodactylus.util.template.Template;
import net.pterodactylus.util.template.TemplateContext;
+import net.pterodactylus.util.web.Method;
import freenet.clients.http.ToadletContext;
/**
import freenet.clients.http.ToadletContext;
/**
@@
-90,12
+91,12
@@
public class CreateSonePage extends SoneTemplatePage {
// TEMPLATEPAGE METHODS
//
// TEMPLATEPAGE METHODS
//
- /**
- * {@inheritDoc}
- */
@Override
@Override
- protected void processTemplate(Request request, TemplateContext templateContext) throws RedirectException {
+ protected void processTemplate(
Freenet
Request request, TemplateContext templateContext) throws RedirectException {
super.processTemplate(request, templateContext);
super.processTemplate(request, templateContext);
+ List<Sone> localSones = new ArrayList<Sone>(webInterface.getCore().getLocalSones());
+ Collections.sort(localSones, Sone.NICE_NAME_COMPARATOR);
+ templateContext.set("sones", localSones);
List<OwnIdentity> ownIdentitiesWithoutSone = getOwnIdentitiesWithoutSone(webInterface.getCore());
templateContext.set("identitiesWithoutSone", ownIdentitiesWithoutSone);
if (request.getMethod() == Method.POST) {
List<OwnIdentity> ownIdentitiesWithoutSone = getOwnIdentitiesWithoutSone(webInterface.getCore());
templateContext.set("identitiesWithoutSone", ownIdentitiesWithoutSone);
if (request.getMethod() == Method.POST) {
@@
-114,7
+115,7
@@
public class CreateSonePage extends SoneTemplatePage {
/* create Sone. */
Sone sone = webInterface.getCore().createSone(selectedIdentity);
if (sone == null) {
/* create Sone. */
Sone sone = webInterface.getCore().createSone(selectedIdentity);
if (sone == null) {
- logger.log(Level.SEVERE,
"Could not create Sone for OwnIdentity: %s", selectedIdentity
);
+ logger.log(Level.SEVERE,
String.format("Could not create Sone for OwnIdentity: %s", selectedIdentity)
);
/* TODO - go somewhere else */
}
/* TODO - go somewhere else */
}
@@
-124,9
+125,6
@@
public class CreateSonePage extends SoneTemplatePage {
}
}
}
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isEnabled(ToadletContext toadletContext) {
if (webInterface.getCore().getPreferences().isRequireFullAccess() && !toadletContext.isAllowedFullAccess()) {
@Override
public boolean isEnabled(ToadletContext toadletContext) {
if (webInterface.getCore().getPreferences().isRequireFullAccess() && !toadletContext.isAllowedFullAccess()) {