Merge remote-tracking branch 'beak/next' into next

[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 9878358..fe8c32e 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
@@ -97,6 +97,9 @@ public class CreateSonePage extends SoneTemplatePage {
        @Override
        protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
                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) {
@@ -115,7 +118,7 @@ public class CreateSonePage extends SoneTemplatePage {
                        /* 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 */
                        }