X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FGetSonesCommand.java;h=83167cdd6826104bab7b33628699048237b4de0b;hb=3b744b825c91ea77c619a6fd7b9855fa0f6fbd3e;hp=5c9c117973047b5fb7e1ba5d510cb009b8b8dbf2;hpb=50ce65f69e49ed10abeedaeb6615ffb37a0c0772;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/fcp/GetSonesCommand.java b/src/main/java/net/pterodactylus/sone/fcp/GetSonesCommand.java
index 5c9c117..83167cd 100644
--- a/src/main/java/net/pterodactylus/sone/fcp/GetSonesCommand.java
+++ b/src/main/java/net/pterodactylus/sone/fcp/GetSonesCommand.java
@@ -1,5 +1,5 @@
/*
- * Sone - GetSonesCommand.java - Copyright © 2011â2012 David Roden
+ * Sone - GetSonesCommand.java - Copyright © 2011â2020 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
@@ -17,20 +17,18 @@
package net.pterodactylus.sone.fcp;
+import static net.pterodactylus.sone.fcp.AbstractSoneCommandKt.encodeSones;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import net.pterodactylus.sone.core.Core;
import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.freenet.fcp.FcpException;
import freenet.support.SimpleFieldSet;
-import freenet.support.api.Bucket;
/**
* Implements the âGetSonesâ FCP command that returns the list of known Sones.
- *
- * @author David âBombeâ Roden
*/
public class GetSonesCommand extends AbstractSoneCommand {
@@ -48,15 +46,15 @@ public class GetSonesCommand extends AbstractSoneCommand {
* {@inheritDoc}
*/
@Override
- public Response execute(SimpleFieldSet parameters, Bucket data, AccessType accessType) throws FcpException {
+ public Response execute(SimpleFieldSet parameters) {
int startSone = getInt(parameters, "StartSone", 0);
int maxSones = getInt(parameters, "MaxSones", -1);
- List sones = new ArrayList(getCore().getSones());
+ List sones = new ArrayList<>(getCore().getSones());
if (sones.size() < startSone) {
- return new Response("Sones", encodeSones(Collections. emptyList(), ""));
+ return new Response("Sones", encodeSones(Collections. emptyList(), "Sones."));
}
Collections.sort(sones, Sone.NICE_NAME_COMPARATOR);
- return new Response("Sones", encodeSones(sones.subList(startSone, (maxSones == -1) ? sones.size() : Math.min(startSone + maxSones, sones.size())), ""));
+ return new Response("Sones", encodeSones(sones.subList(startSone, (maxSones == -1) ? sones.size() : Math.min(startSone + maxSones, sones.size())), "Sones."));
}
}