fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #175 from thatsIch/TypeSafety

Browse Source 
Type safety
This commit is contained in:
Chris
2014-09-28 19:51:31 -07:00
parent f63aa6d17e 56757bd828
commit 62fcf26fcc
111 changed files with 237 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java
+2 -2
View File
@@ -46,7 +46,7 @@ public class GuiCraftConfirm extends AEBaseGui
IItemList<IAEItemStack> pending = AEApi.instance().storage().createItemList();
IItemList<IAEItemStack> missing = AEApi.instance().storage().createItemList();
List<IAEItemStack> visual = new ArrayList();
List<IAEItemStack> visual = new ArrayList<IAEItemStack>();
GuiBridge OriginalGui;
@@ -382,7 +382,7 @@ public class GuiCraftConfirm extends AEBaseGui
int viewEnd = viewStart + 3 * rows;
String dspToolTip = "";
List<String> lineList = new LinkedList();
List<String> lineList = new LinkedList<String>();
int toolPosX = 0;
int toolPosY = 0;
src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java
+3 -3
View File
@@ -39,14 +39,14 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
IItemList<IAEItemStack> active = AEApi.instance().storage().createItemList();
IItemList<IAEItemStack> pending = AEApi.instance().storage().createItemList();
List<IAEItemStack> visual = new ArrayList();
List<IAEItemStack> visual = new ArrayList<IAEItemStack>();
public void clearItems()
{
storage = AEApi.instance().storage().createItemList();
active = AEApi.instance().storage().createItemList();
pending = AEApi.instance().storage().createItemList();
visual = new ArrayList();
visual = new ArrayList<IAEItemStack>();
}
protected GuiCraftingCPU(ContainerCraftingCPU container) {
@@ -269,7 +269,7 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
int viewEnd = viewStart + 3 * 6;
String dspToolTip = "";
List<String> lineList = new LinkedList();
List<String> lineList = new LinkedList<String>();
int toolPosX = 0;
int toolPosY = 0;
src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java
+6 -6
View File
@@ -25,11 +25,11 @@ import com.google.common.collect.HashMultimap;
public class GuiInterfaceTerminal extends AEBaseGui
{
HashMap<Long, ClientDCInternalInv> byId = new HashMap();
HashMap<Long, ClientDCInternalInv> byId = new HashMap<Long, ClientDCInternalInv>();
HashMultimap<String, ClientDCInternalInv> byName = HashMultimap.create();
ArrayList<String> names = new ArrayList();
ArrayList<String> names = new ArrayList<String>();
ArrayList<Object> lines = new ArrayList();
ArrayList<Object> lines = new ArrayList<Object>();
private int getTotalRows()
{
@@ -43,7 +43,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
ySize = 222;
}
LinkedList<SlotDisconnected> dcSlots = new LinkedList();
LinkedList<SlotDisconnected> dcSlots = new LinkedList<SlotDisconnected>();
@Override
public void initGui()
@@ -178,12 +178,12 @@ public class GuiInterfaceTerminal extends AEBaseGui
Collections.sort( names );
lines = new ArrayList( getTotalRows() );
lines = new ArrayList<Object>( getTotalRows() );
for (String n : names)
{
lines.add( n );
ArrayList<ClientDCInternalInv> clientInventories = new ArrayList();
ArrayList<ClientDCInternalInv> clientInventories = new ArrayList<ClientDCInternalInv>();
clientInventories.addAll( byName.get( n ) );
Collections.sort( clientInventories );