Finally use Java7 <>

This commit is contained in:
yueh
2017-07-20 21:21:45 +02:00
parent 8ec8babb6a
commit 7de90ed0ae
145 changed files with 315 additions and 315 deletions
@@ -58,7 +58,7 @@ public class CraftingJob implements Runnable, ICraftingJob
private final World world;
private final IItemList<IAEItemStack> crafting = AEApi.instance().storage().createItemList();
private final IItemList<IAEItemStack> missing = AEApi.instance().storage().createItemList();
private final HashMap<String, TwoIntegers> opsAndMultiplier = new HashMap<String, TwoIntegers>();
private final HashMap<String, TwoIntegers> opsAndMultiplier = new HashMap<>();
private final Object monitor = new Object();
private final Stopwatch watch = Stopwatch.createUnstarted();
private CraftingTreeNode tree;
@@ -52,7 +52,7 @@ public class CraftingTreeNode
// what item is this?
private final IAEItemStack what;
// what are the crafting patterns for this?
private final ArrayList<CraftingTreeProcess> nodes = new ArrayList<CraftingTreeProcess>();
private final ArrayList<CraftingTreeProcess> nodes = new ArrayList<>();
private int bytes = 0;
private boolean canEmit = false;
private long missing = 0;
@@ -121,7 +121,7 @@ public class CraftingTreeNode
{
this.job.handlePausing();
final List<IAEItemStack> thingsUsed = new LinkedList<IAEItemStack>();
final List<IAEItemStack> thingsUsed = new LinkedList<>();
this.what.setStackSize( l );
if( this.getSlot() >= 0 && this.parent != null && this.parent.details.isCraftable() )
@@ -47,7 +47,7 @@ public class CraftingTreeProcess
private final CraftingTreeNode parent;
final ICraftingPatternDetails details;
private final CraftingJob job;
private final Map<CraftingTreeNode, Long> nodes = new HashMap<CraftingTreeNode, Long>();
private final Map<CraftingTreeNode, Long> nodes = new HashMap<>();
private final int depth;
boolean possible = true;
private World world;
@@ -37,7 +37,7 @@ public class CraftingWatcher implements ICraftingWatcher
private final CraftingGridCache gsc;
private final ICraftingWatcherHost host;
private final Set<IAEStack> myInterests = new HashSet<IAEStack>();
private final Set<IAEStack> myInterests = new HashSet<>();
public CraftingWatcher( final CraftingGridCache cache, final ICraftingWatcherHost host )
{