Finally use Java7 <>

src/main/java/appeng/container/implementations/ContainerCellWorkbench.java

@@ -234,7 +234,7 @@ public class ContainerCellWorkbench extends ContainerUpgradeable
 		final IMEInventory<IAEItemStack> cellInv = AEApi.instance().registries().cell().getCellInventory(
 				this.getUpgradeable().getInventoryByName( "cell" ).getStackInSlot( 0 ), null, StorageChannel.ITEMS );
 
-		Iterator<IAEItemStack> i = new NullIterator<IAEItemStack>();
+		Iterator<IAEItemStack> i = new NullIterator<>();
 		if( cellInv != null )
 		{
 			final IItemList<IAEItemStack> list = cellInv.getAvailableItems( AEApi.instance().storage().createItemList() );

src/main/java/appeng/container/implementations/ContainerCraftConfirm.java

@@ -69,7 +69,7 @@ import appeng.util.Platform;
 public class ContainerCraftConfirm extends AEBaseContainer
 {
 
-	private final ArrayList<CraftingCPURecord> cpus = new ArrayList<CraftingCPURecord>();
+	private final ArrayList<CraftingCPURecord> cpus = new ArrayList<>();
 	private Future<ICraftingJob> job;
 	private ICraftingJob result;
 	@GuiSync( 0 )

src/main/java/appeng/container/implementations/ContainerCraftingStatus.java

@@ -37,7 +37,7 @@ import appeng.util.Platform;
 public class ContainerCraftingStatus extends ContainerCraftingCPU
 {
 
-	private final List<CraftingCPURecord> cpus = new ArrayList<CraftingCPURecord>();
+	private final List<CraftingCPURecord> cpus = new ArrayList<>();
 	@GuiSync( 5 )
 	public int selectedCpu = -1;
 	@GuiSync( 6 )

src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java

@@ -62,8 +62,8 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer
 	 */
 
 	private static long autoBase = Long.MIN_VALUE;
-	private final Map<IInterfaceHost, InvTracker> diList = new HashMap<IInterfaceHost, InvTracker>();
-	private final Map<Long, InvTracker> byId = new HashMap<Long, InvTracker>();
+	private final Map<IInterfaceHost, InvTracker> diList = new HashMap<>();
+	private final Map<Long, InvTracker> byId = new HashMap<>();
 	private IGrid grid;
 	private NBTTagCompound data = new NBTTagCompound();
 

src/main/java/appeng/container/implementations/ContainerPatternTerm.java

@@ -282,7 +282,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
 		}
 		else
 		{
-			final List<ItemStack> list = new ArrayList<ItemStack>( 3 );
+			final List<ItemStack> list = new ArrayList<>( 3 );
 			boolean hasValue = false;
 
 			for( final OptionalSlotFake outputSlot : this.outputSlots )

src/main/java/appeng/container/implementations/ContainerStorageBus.java

@@ -157,7 +157,7 @@ public class ContainerStorageBus extends ContainerUpgradeable
 
 		final IMEInventory<IAEItemStack> cellInv = this.storageBus.getInternalHandler();
 
-		Iterator<IAEItemStack> i = new NullIterator<IAEItemStack>();
+		Iterator<IAEItemStack> i = new NullIterator<>();
 		if( cellInv != null )
 		{
 			final IItemList<IAEItemStack> list = cellInv.getAvailableItems( AEApi.instance().storage().createItemList() );