Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename and relocate Comparators and Predicates

Browse Source
This commit is contained in:
Olof Larsson
2017-03-24 14:25:29 +01:00
parent 2dfce5ea3a
commit 83b12fddc8
11 changed files with 46 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/massivecraft/factions/cmd/CmdFactionsList.java
View File

@@ -1,6 +1,6 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FactionListComparator;
import com.massivecraft.factions.comparator.ComparatorFactionList;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.entity.FactionColl;
@@ -71,7 +71,7 @@ public class CmdFactionsList extends FactionsCommand
public void run()
{
// Pager Items
final List<Faction> factions = FactionColl.get().getAll(FactionListComparator.get(sender));
final List<Faction> factions = FactionColl.get().getAll(ComparatorFactionList.get(sender));
pager.setItems(factions);
// Pager Message

4
src/com/massivecraft/factions/cmd/CmdFactionsStatus.java
View File

@@ -1,6 +1,6 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.PlayerInactivityComparator;
import com.massivecraft.factions.comparator.ComparatorMPlayerInactivity;
import com.massivecraft.factions.cmd.type.TypeFaction;
import com.massivecraft.factions.cmd.type.TypeSortMPlayer;
import com.massivecraft.factions.entity.Faction;
@@ -43,7 +43,7 @@ public class CmdFactionsStatus extends FactionsCommand
// Args
int page = this.readArg();
Faction faction = this.readArg(msenderFaction);
Comparator<MPlayer> sortedBy = this.readArg(PlayerInactivityComparator.get());
Comparator<MPlayer> sortedBy = this.readArg(ComparatorMPlayerInactivity.get());
// MPerm
if ( ! MPerm.getPermStatus().has(msender, faction, true)) return;

12
src/com/massivecraft/factions/cmd/type/TypeSortMPlayer.java
View File

@@ -1,8 +1,8 @@
package com.massivecraft.factions.cmd.type;
import com.massivecraft.factions.PlayerInactivityComparator;
import com.massivecraft.factions.PlayerPowerComparator;
import com.massivecraft.factions.PlayerRoleComparator;
import com.massivecraft.factions.comparator.ComparatorMPlayerInactivity;
import com.massivecraft.factions.comparator.ComparatorMPlayerPower;
import com.massivecraft.factions.comparator.ComparatorMPlayerRole;
import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.massivecore.command.type.TypeAbstractChoice;
@@ -20,9 +20,9 @@ public class TypeSortMPlayer extends TypeAbstractChoice<Comparator<MPlayer>>
{
super(Comparator.class);
this.setAll(
PlayerRoleComparator.get(),
PlayerPowerComparator.get(),
PlayerInactivityComparator.get()
ComparatorMPlayerRole.get(),
ComparatorMPlayerPower.get(),
ComparatorMPlayerInactivity.get()
);
}