projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
♻️ Move generic error pages to custom classes
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
fcp
/
GetSonesCommand.java
diff --git
a/src/main/java/net/pterodactylus/sone/fcp/GetSonesCommand.java
b/src/main/java/net/pterodactylus/sone/fcp/GetSonesCommand.java
index
770cb22
..
ec43143
100644
(file)
--- 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–201
5
David Roden
+ * Sone - GetSonesCommand.java - Copyright © 2011–201
9
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
*
* 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,6
+17,8
@@
package net.pterodactylus.sone.fcp;
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 java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@
-24,12
+26,9
@@
import java.util.List;
import net.pterodactylus.sone.core.Core;
import net.pterodactylus.sone.data.Sone;
import freenet.support.SimpleFieldSet;
import net.pterodactylus.sone.core.Core;
import net.pterodactylus.sone.data.Sone;
import freenet.support.SimpleFieldSet;
-import freenet.support.api.Bucket;
/**
* Implements the “GetSones” FCP command that returns the list of known Sones.
/**
* Implements the “GetSones” FCP command that returns the list of known Sones.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
*/
public class GetSonesCommand extends AbstractSoneCommand {
*/
public class GetSonesCommand extends AbstractSoneCommand {
@@
-47,15
+46,15
@@
public class GetSonesCommand extends AbstractSoneCommand {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- public Response execute(SimpleFieldSet parameters
, Bucket data, AccessType accessType
) {
+ public Response execute(SimpleFieldSet parameters) {
int startSone = getInt(parameters, "StartSone", 0);
int maxSones = getInt(parameters, "MaxSones", -1);
int startSone = getInt(parameters, "StartSone", 0);
int maxSones = getInt(parameters, "MaxSones", -1);
- List<Sone> sones = new ArrayList<
Sone
>(getCore().getSones());
+ List<Sone> sones = new ArrayList<>(getCore().getSones());
if (sones.size() < startSone) {
if (sones.size() < startSone) {
- return new Response("Sones", encodeSones(Collections.<Sone> emptyList(), ""));
+ return new Response("Sones", encodeSones(Collections.<Sone> emptyList(), "
Sones.
"));
}
Collections.sort(sones, Sone.NICE_NAME_COMPARATOR);
}
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.
"));
}
}
}
}