EpicKnarvik97/Jail
EpicKnarvik97/Jail
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Properly output how many cells were loaded, hopefully this has something

Browse Source 
to do with #26 displaying incorrect information.
This commit is contained in:
graywolf336 2014-05-02 01:35:04 -05:00
parent b8dc15decb
commit b3033913c7
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/graywolf336/jail/JailIO.java
View File

@ -378,7 +378,6 @@ public class JailIO {
//that doesn't exist anymore //that doesn't exist anymore
List<Integer> cellsToRemove = new LinkedList<Integer>(); List<Integer> cellsToRemove = new LinkedList<Integer>();
int cs = 0;
try { try {
if(con == null) this.prepareStorage(false); if(con == null) this.prepareStorage(false);
PreparedStatement ps = con.prepareStatement("SELECT * FROM " + prefix + "cells"); PreparedStatement ps = con.prepareStatement("SELECT * FROM " + prefix + "cells");
@ -405,7 +404,6 @@ public class JailIO {
j.addCell(c, false); j.addCell(c, false);
cs++;
}else { }else {
cellsToRemove.add(set.getInt("cellid")); cellsToRemove.add(set.getInt("cellid"));
} }
@ -444,8 +442,6 @@ public class JailIO {
} }
} }
pl.getLogger().info("Loaded " + cs + (cs == 1 ? " cell." : " cells."));
//This list contains a string which refers to the name of the prisoner in sql //This list contains a string which refers to the name of the prisoner in sql
//this list only gets populated if there are prisoners which reference a jail //this list only gets populated if there are prisoners which reference a jail
//that doesn't exist anymore //that doesn't exist anymore
@ -538,6 +534,9 @@ public class JailIO {
int js = pl.getJailManager().getJails().size(); int js = pl.getJailManager().getJails().size();
pl.getLogger().info("Loaded " + js + (js == 1 ? " jail." : " jails.")); pl.getLogger().info("Loaded " + js + (js == 1 ? " jail." : " jails."));
int cs = pl.getJailManager().getAllCells().size();
pl.getLogger().info("Loaded " + cs + (cs == 1 ? " cell." : " cells."));
int ps = pl.getJailManager().getAllPrisoners().size(); int ps = pl.getJailManager().getAllPrisoners().size();
pl.getLogger().info("Loaded " + ps + (ps == 1 ? " prisoner." : " prisoners.")); pl.getLogger().info("Loaded " + ps + (ps == 1 ? " prisoner." : " prisoners."));
} }

17
src/main/java/com/graywolf336/jail/JailManager.java
View File

@ -155,6 +155,20 @@ public class JailManager {
return this.jails.get(name) != null; return this.jails.get(name) != null;
} }
/**
* Gets all the {@link Cell cells} in the jail system, best for system wide count of the cells or touching each cell.
*
* @return HashSet of all the Cells.
*/
public HashSet<Cell> getAllCells() {
HashSet<Cell> cells = new HashSet<Cell>();
for(Jail j : jails.values())
cells.addAll(j.getCells());
return cells;
}
/** /**
* Gets all the prisoners in the system, best for a system wide count of the prisoners or accessing all the prisoners at once. * Gets all the prisoners in the system, best for a system wide count of the prisoners or accessing all the prisoners at once.
* *
@ -163,9 +177,8 @@ public class JailManager {
public HashSet<Prisoner> getAllPrisoners() { public HashSet<Prisoner> getAllPrisoners() {
HashSet<Prisoner> prisoners = new HashSet<Prisoner>(); HashSet<Prisoner> prisoners = new HashSet<Prisoner>();
for(Jail j : jails.values()) { for(Jail j : jails.values())
prisoners.addAll(j.getAllPrisoners()); prisoners.addAll(j.getAllPrisoners());
}
return prisoners; return prisoners;
} }