amalthea-mc/ShopChest
1
0
Fork 0
mirror of https://github.com/amalthea-mc/ShopChest.git synced 2024-11-22 10:22:29 +00:00
Code Issues Projects Releases Wiki Activity

Use collection instead of array in Database#getShops

Browse Source
This commit is contained in:
Eric 2017-07-31 14:02:56 +02:00
parent 3b9d26c079
commit 397304c748
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/de/epiceric/shopchest/sql/Database.java
View File

@ -21,6 +21,8 @@ import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
@ -227,10 +229,10 @@ public abstract class Database {
/** /**
* Get all shops from the database * Get all shops from the database
* @param callback Callback that - if succeeded - returns an array of all shops (as {@code Shop[]}) * @param callback Callback that - if succeeded - returns a read-only collection of all shops (as {@code Collection<Shop>})
* @param showConsoleMessages Whether console messages (errors or warnings) should be shown * @param showConsoleMessages Whether console messages (errors or warnings) should be shown
*/ */
public void getShops(final boolean showConsoleMessages, final Callback<Shop[]> callback) { public void getShops(final boolean showConsoleMessages, final Callback<Collection<Shop>> callback) {
new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
@ -276,7 +278,7 @@ public abstract class Database {
shops.add(new Shop(id, plugin, vendor, product, location, buyPrice, sellPrice, shopType)); shops.add(new Shop(id, plugin, vendor, product, location, buyPrice, sellPrice, shopType));
} }
if (callback != null) callback.callSyncResult(shops.toArray(new Shop[shops.size()])); if (callback != null) callback.callSyncResult(Collections.unmodifiableCollection(shops));
} catch (SQLException ex) { } catch (SQLException ex) {
if (callback != null) callback.callSyncError(ex); if (callback != null) callback.callSyncError(ex);
plugin.getLogger().severe("Failed to access database"); plugin.getLogger().severe("Failed to access database");

6
src/main/java/de/epiceric/shopchest/utils/ShopUtils.java
View File

@ -242,9 +242,9 @@ public class ShopUtils {
plugin.debug("Removed shop (#" + shop.getID() + ")"); plugin.debug("Removed shop (#" + shop.getID() + ")");
} }
plugin.getShopDatabase().getShops(showConsoleMessages, new Callback<Shop[]>(plugin) { plugin.getShopDatabase().getShops(showConsoleMessages, new Callback<Collection<Shop>>(plugin) {
@Override @Override
public void onResult(Shop[] result) { public void onResult(Collection<Shop> result) {
for (Shop shop : result) { for (Shop shop : result) {
if (shop.create(showConsoleMessages)) { if (shop.create(showConsoleMessages)) {
addShop(shop, false); addShop(shop, false);
@ -255,7 +255,7 @@ public class ShopUtils {
updateShops(player, true); updateShops(player, true);
} }
if (callback != null) callback.callSyncResult(result.length); if (callback != null) callback.callSyncResult(result.size());
} }
@Override @Override