Rename “localSones” method to a more traditional “getSones”.

[Sone.git] / src / main / java / net / pterodactylus / sone / core / Core.java

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 7498356..7ddc247 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -95,8 +95,8 @@ public class Core extends AbstractService {
         *
         * @return The local Sones
         */
-       public Set<Sone> localSones() {
-               return localSones;
+       public Set<Sone> getSones() {
+               return Collections.unmodifiableSet(localSones);
        }
 
        //
@@ -137,15 +137,20 @@ public class Core extends AbstractService {
                if ((name == null) || (name.trim().length() == 0)) {
                        throw new SoneException(Type.INVALID_SONE_NAME);
                }
+               String finalRequestUri;
+               String finalInsertUri;
                if ((requestUri == null) || (insertUri == null)) {
                        String[] keyPair = freenetInterface.generateKeyPair();
-                       requestUri = keyPair[0];
-                       insertUri = keyPair[1];
+                       finalRequestUri = keyPair[0];
+                       finalInsertUri = keyPair[1];
+               } else {
+                       finalRequestUri = requestUri;
+                       finalInsertUri = insertUri;
                }
                Sone sone;
                try {
-                       logger.log(Level.FINEST, "Creating new Sone “%s” at %s (%s)…", new Object[] { name, requestUri, insertUri });
-                       sone = new Sone(UUID.randomUUID(), name, new FreenetURI(requestUri), new FreenetURI(insertUri));
+                       logger.log(Level.FINEST, "Creating new Sone “%s” at %s (%s)…", new Object[] { name, finalRequestUri, finalInsertUri });
+                       sone = new Sone(UUID.randomUUID(), name, new FreenetURI(finalRequestUri), new FreenetURI(finalInsertUri));
                } catch (MalformedURLException mue1) {
                        throw new SoneException(Type.INVALID_URI);
                }