X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffcp%2FGetSonesCommand.java;h=eedf120442888ccd2c9d8de2d8a24a0400537ad7;hb=23e09dfc13a0cc6dfc7d7b8cc09c78acc6984ec7;hp=fa805e1e99711996bc30e9ab51f352b21c0d3041;hpb=ffd92ca2374c0b2218e583d02e0bdd24b8c110ae;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 fa805e1..eedf120 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â2016 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,18 +17,20 @@
package net.pterodactylus.sone.fcp;
+import static net.pterodactylus.sone.data.SoneKt.*;
+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.data.*;
+
import freenet.support.SimpleFieldSet;
/**
* Implements the âGetSonesâ FCP command that returns the list of known Sones.
- *
- * @author David âBombeâ Roden
*/
public class GetSonesCommand extends AbstractSoneCommand {
@@ -49,11 +51,11 @@ public class GetSonesCommand extends AbstractSoneCommand {
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(), "Sones."));
}
- Collections.sort(sones, Sone.NICE_NAME_COMPARATOR);
+ sones.sort(niceNameComparator());
return new Response("Sones", encodeSones(sones.subList(startSone, (maxSones == -1) ? sones.size() : Math.min(startSone + maxSones, sones.size())), "Sones."));
}