Unify field name generation.

[Sone.git] / src / main / java / net / pterodactylus / sone / fcp / AbstractSoneCommand.java

diff --git a/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java b/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java
index 4f53321..6473e4d 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java
+++ b/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java
@@ -139,11 +139,11 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
                int soneIndex = 0;
                soneBuilder.put(prefix + "Count", sones.size());
                for (Sone sone : sones) {
-                       String sonePrefix = prefix + soneIndex++;
-                       soneBuilder.put(sonePrefix + ".ID", sone.getId());
-                       soneBuilder.put(sonePrefix + ".Name", sone.getName());
-                       soneBuilder.put(sonePrefix + ".NiceName", SoneAccessor.getNiceName(sone));
-                       soneBuilder.put(sonePrefix + ".Time", sone.getTime());
+                       String sonePrefix = prefix + soneIndex++ + ".";
+                       soneBuilder.put(sonePrefix + "ID", sone.getId());
+                       soneBuilder.put(sonePrefix + "Name", sone.getName());
+                       soneBuilder.put(sonePrefix + "NiceName", SoneAccessor.getNiceName(sone));
+                       soneBuilder.put(sonePrefix + "Time", sone.getTime());
                }
 
                return soneBuilder.get();
@@ -194,7 +194,7 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
         *            include the replies
         * @return The simple field set containing the posts
         */
-       public SimpleFieldSet encodePosts(Collection<? extends Post> posts, String prefix, boolean includeReplies) {
+       protected SimpleFieldSet encodePosts(Collection<? extends Post> posts, String prefix, boolean includeReplies) {
                SimpleFieldSetBuilder postBuilder = new SimpleFieldSetBuilder();
 
                int postIndex = 0;
@@ -220,17 +220,17 @@ public abstract class AbstractSoneCommand extends AbstractCommand {
         *            {@code null})
         * @return The simple field set containing the replies
         */
-       public SimpleFieldSet encodeReplies(Collection<? extends Reply> replies, String prefix) {
+       protected SimpleFieldSet encodeReplies(Collection<? extends Reply> replies, String prefix) {
                SimpleFieldSetBuilder replyBuilder = new SimpleFieldSetBuilder();
 
                int replyIndex = 0;
                replyBuilder.put(prefix + "Replies.Count", replies.size());
                for (Reply reply : replies) {
-                       String replyPrefix = prefix + "Replies." + replyIndex++;
-                       replyBuilder.put(replyPrefix + ".ID", reply.getId());
-                       replyBuilder.put(replyPrefix + ".Sone", reply.getSone().getId());
-                       replyBuilder.put(replyPrefix + ".Time", reply.getTime());
-                       replyBuilder.put(replyPrefix + ".Text", reply.getText());
+                       String replyPrefix = prefix + "Replies." + replyIndex++ + ".";
+                       replyBuilder.put(replyPrefix + "ID", reply.getId());
+                       replyBuilder.put(replyPrefix + "Sone", reply.getSone().getId());
+                       replyBuilder.put(replyPrefix + "Time", reply.getTime());
+                       replyBuilder.put(replyPrefix + "Text", reply.getText());
                }
 
                return replyBuilder.get();