From bd656884ed037e9ac7482c0ab8a0e83ad24c0b72 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 1 Jan 2017 03:10:14 +0100 Subject: [PATCH] Small rename --- .../refinedstorage/apiimpl/network/node/NetworkNodeGrid.java | 2 +- .../java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java | 2 +- .../java/com/raoulvdberge/refinedstorage/tile/grid/IGrid.java | 2 +- .../refinedstorage/tile/grid/WirelessFluidGrid.java | 2 +- .../com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeGrid.java index 80686b9bd..d3f50f01d 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeGrid.java @@ -182,7 +182,7 @@ public class NetworkNodeGrid extends NetworkNode implements IGrid { } @Override - public List getFilteredItems() { + public List getFilters() { return filteredItems; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java index bb4a39737..a40860104 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java @@ -167,7 +167,7 @@ public class GuiGrid extends GuiBase implements IGridDisplay { List> filters = GridFilterParser.getFilters( grid, searchField.getText(), - (grid.getTabSelected() >= 0 && grid.getTabSelected() < grid.getTabs().size()) ? grid.getTabs().get(grid.getTabSelected()).getFilters() : grid.getFilteredItems() + (grid.getTabSelected() >= 0 && grid.getTabSelected() < grid.getTabs().size()) ? grid.getTabs().get(grid.getTabSelected()).getFilters() : grid.getFilters() ); Iterator t = stacks.iterator(); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/IGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/IGrid.java index f49c2eeb7..fa43b6f05 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/IGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/IGrid.java @@ -46,7 +46,7 @@ public interface IGrid { void onTabSelectionChanged(int tab); - List getFilteredItems(); + List getFilters(); List getTabs(); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessFluidGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessFluidGrid.java index ce0bffa37..209fb7742 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessFluidGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessFluidGrid.java @@ -153,7 +153,7 @@ public class WirelessFluidGrid implements IGrid { } @Override - public List getFilteredItems() { + public List getFilters() { return Collections.emptyList(); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java index b7aab5764..88c53852f 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java @@ -188,7 +188,7 @@ public class WirelessGrid implements IGrid { } @Override - public List getFilteredItems() { + public List getFilters() { return filteredItems; }