Renames, visibility, other cleanups

src/main/java/appeng/me/cache/CraftingGridCache.java

@@ -59,15 +59,15 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 	private final Map<IGridNode, ICraftingWatcher> craftingWatchers = new HashMap<IGridNode, ICraftingWatcher>();
 
 	private final IGrid grid;
-	IStorageGrid storageGrid;
+	private IStorageGrid storageGrid;
-	IEnergyGrid energyGrid;
+	private IEnergyGrid energyGrid;
 
 	private final Map<ICraftingPatternDetails, List<ICraftingMedium>> craftingMethods = new HashMap<ICraftingPatternDetails, List<ICraftingMedium>>();
 	private final Map<IAEItemStack, ImmutableList<ICraftingPatternDetails>> craftableItems = new HashMap<IAEItemStack, ImmutableList<ICraftingPatternDetails>>();
 	private final Set<IAEItemStack> emitableItems = new HashSet<IAEItemStack>();
 	private final Map<String, CraftingLinkNexus> craftingLinks = new HashMap<String, CraftingLinkNexus>();
 
-	boolean updateList = false;
+	private boolean updateList = false;
 	private final Multimap<IAEStack, CraftingWatcher> interests = HashMultimap.create();
 	public final GenericInterestManager<CraftingWatcher> interestManager = new GenericInterestManager<CraftingWatcher>( this.interests );
 
@@ -140,42 +140,50 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 		this.storageGrid.registerCellProvider( this );
 	}
 
-	public void addLink(CraftingLink l)
+	public void addLink(CraftingLink link)
 	{
-		if ( l.isStandalone() )
+		if ( link.isStandalone() )
+		{
 			return;
+		}
 
-		CraftingLinkNexus n = craftingLinks.get( l.getCraftingID() );
+		CraftingLinkNexus nexus = this.craftingLinks.get( link.getCraftingID() );
-		if ( n == null )
+		if ( nexus == null )
-			craftingLinks.put( l.getCraftingID(), n = new CraftingLinkNexus( l.getCraftingID() ) );
+		{
+			this.craftingLinks.put( link.getCraftingID(), nexus = new CraftingLinkNexus( link.getCraftingID() ) );
+		}
 
-		l.setNexus( n );
+		link.setNexus( nexus );
 	}
 
 	@Override
 	public void onUpdateTick()
 	{
-		if ( updateList )
+		if ( this.updateList )
 		{
-			updateList = false;
+			this.updateList = false;
-			updateCPUClusters();
+			this.updateCPUClusters();
 		}
 
-		Iterator<CraftingLinkNexus> i = craftingLinks.values().iterator();
+		Iterator<CraftingLinkNexus> craftingLinkIterator = this.craftingLinks.values().iterator();
-		while (i.hasNext())
+		while (craftingLinkIterator.hasNext())
 		{
-			if ( i.next().isDead( grid, this ) )
+			if ( craftingLinkIterator.next().isDead( this.grid, this ) )
-				i.remove();
+			{
+				craftingLinkIterator.remove();
+			}
 		}
 
-		for (CraftingCPUCluster cpu : craftingCPUClusters)
+		for (CraftingCPUCluster cpu : this.craftingCPUClusters)
-			cpu.updateCraftingLogic( grid, energyGrid, this );
+		{
+			cpu.updateCraftingLogic( this.grid, this.energyGrid, this );
+		}
 	}
 
 	@MENetworkEventSubscribe
 	public void updateCPUClusters(MENetworkCraftingCpuChange c)
 	{
-		updateList = true;
+		this.updateList = true;
 	}
 
 	@MENetworkEventSubscribe
@@ -189,31 +197,34 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 	{
 		if ( machine instanceof ICraftingWatcherHost )
 		{
-			ICraftingWatcher myWatcher = craftingWatchers.get( machine );
+			ICraftingWatcher craftingWatcher = this.craftingWatchers.get( machine );
-			if ( myWatcher != null )
+			if ( craftingWatcher != null )
 			{
-				myWatcher.clear();
+				craftingWatcher.clear();
-				craftingWatchers.remove( machine );
+				this.craftingWatchers.remove( machine );
 			}
 		}
 
 		if ( machine instanceof ICraftingRequester )
 		{
-			for (CraftingLinkNexus n : craftingLinks.values())
+			for (CraftingLinkNexus link : this.craftingLinks.values())
 			{
-				if ( n.isMachine( machine ) )
+				if ( link.isMachine( machine ) )
 				{
-					n.removeNode();
+					link.removeNode();
 				}
 			}
 		}
 
 		if ( machine instanceof TileCraftingTile )
-			updateList = true;
+		{
+			this.updateList = true;
+		}
+
 		if ( machine instanceof ICraftingProvider )
 		{
-			craftingProviders.remove( machine );
+			this.craftingProviders.remove( machine );
-			updatePatterns();
+			this.updatePatterns();
 		}
 	}
 
@@ -222,43 +233,51 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 	{
 		if ( machine instanceof ICraftingWatcherHost )
 		{
-			ICraftingWatcherHost swh = (ICraftingWatcherHost) machine;
+			ICraftingWatcherHost watcherHost = (ICraftingWatcherHost) machine;
-			CraftingWatcher iw = new CraftingWatcher( this, swh );
+			CraftingWatcher watcher = new CraftingWatcher( this, watcherHost );
-			craftingWatchers.put( gridNode, iw );
+			craftingWatchers.put( gridNode, watcher );
-			swh.updateWatcher( iw );
+			watcherHost.updateWatcher( watcher );
 		}
 
 		if ( machine instanceof ICraftingRequester )
 		{
-			for (ICraftingLink l : ((ICraftingRequester) machine).getRequestedJobs())
+			for (ICraftingLink link : ((ICraftingRequester) machine).getRequestedJobs())
 			{
-				if ( l instanceof CraftingLink )
+				if ( link instanceof CraftingLink )
-					addLink( (CraftingLink) l );
+				{
+					this.addLink( (CraftingLink) link );
+				}
 			}
 		}
 
 		if ( machine instanceof TileCraftingTile )
-			updateList = true;
+		{
+			this.updateList = true;
+		}
+
 		if ( machine instanceof ICraftingProvider )
 		{
-			craftingProviders.add( (ICraftingProvider) machine );
+			this.craftingProviders.add( (ICraftingProvider) machine );
-			updatePatterns();
+			this.updatePatterns();
 		}
 	}
 
 	private void updateCPUClusters()
 	{
-		craftingCPUClusters.clear();
+		this.craftingCPUClusters.clear();
-		for (IGridNode cst : grid.getMachines( TileCraftingStorageTile.class ))
+
+		for (IGridNode cst : this.grid.getMachines( TileCraftingStorageTile.class ))
 		{
 			TileCraftingStorageTile tile = (TileCraftingStorageTile) cst.getMachine();
 			CraftingCPUCluster cluster = (CraftingCPUCluster) tile.getCluster();
 			if ( cluster != null )
 			{
-				craftingCPUClusters.add( cluster );
+				this.craftingCPUClusters.add( cluster );
 
 				if ( cluster.myLastLink != null )
+				{
 					addLink( (CraftingLink) cluster.myLastLink );
+				}
 			}
 		}
 	}
@@ -266,45 +285,50 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 	@Override
 	public void addCraftingOption(ICraftingMedium medium, ICraftingPatternDetails api)
 	{
-		List<ICraftingMedium> details = craftingMethods.get( api );
+		List<ICraftingMedium> details = this.craftingMethods.get( api );
 		if ( details == null )
 		{
 			details = new ArrayList<ICraftingMedium>();
 			details.add( medium );
-			craftingMethods.put( api, details );
+			this.craftingMethods.put( api, details );
 		}
 		else
+		{
 			details.add( medium );
+		}
 	}
 
-	static final Comparator<ICraftingPatternDetails> comp = new Comparator<ICraftingPatternDetails>(){
+	static final Comparator<ICraftingPatternDetails> comp = new Comparator<ICraftingPatternDetails>()
+	{
 		@Override
-		public int compare(ICraftingPatternDetails o1,
+		public int compare(ICraftingPatternDetails firstDetail, ICraftingPatternDetails nextDetail)
-				ICraftingPatternDetails o2) {
+		{
-			return o2.getPriority() - o1.getPriority();
+			return nextDetail.getPriority() - firstDetail.getPriority();
 		}
 	};
 
 	private void updatePatterns()
 	{
-		Map<IAEItemStack, ImmutableList<ICraftingPatternDetails>> oldItems = craftableItems;
+		Map<IAEItemStack, ImmutableList<ICraftingPatternDetails>> oldItems = this.craftableItems;
 
 		// erase list.
-		craftingMethods.clear();
+		this.craftingMethods.clear();
-		craftableItems.clear();
+		this.craftableItems.clear();
-		emitableItems.clear();
+		this.emitableItems.clear();
 
 		// update the stuff that was in the list...
-		storageGrid.postAlterationOfStoredItems( StorageChannel.ITEMS, oldItems.keySet(), new BaseActionSource() );
+		this.storageGrid.postAlterationOfStoredItems( StorageChannel.ITEMS, oldItems.keySet(), new BaseActionSource() );
 
 		// re-create list..
-		for (ICraftingProvider cp : craftingProviders)
+		for (ICraftingProvider provider : this.craftingProviders)
-			cp.provideCrafting( this );
+		{
+			provider.provideCrafting( this );
+		}
 
-		HashMap<IAEItemStack, Set<ICraftingPatternDetails>> tmpCraft = new HashMap<IAEItemStack, Set<ICraftingPatternDetails>>();
+		Map<IAEItemStack, Set<ICraftingPatternDetails>> tmpCraft = new HashMap<IAEItemStack, Set<ICraftingPatternDetails>>();
 
 		// new craftables!
-		for (ICraftingPatternDetails details : craftingMethods.keySet())
+		for (ICraftingPatternDetails details : this.craftingMethods.keySet())
 		{
 			for (IAEItemStack out : details.getOutputs())
 			{
@@ -315,7 +339,9 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 				Set<ICraftingPatternDetails> methods = tmpCraft.get( out );
 
 				if ( methods == null )
-					tmpCraft.put( out, methods = new TreeSet<ICraftingPatternDetails>(comp) );
+				{
+					tmpCraft.put( out, methods = new TreeSet<ICraftingPatternDetails>( comp ) );
+				}
 
 				methods.add( details );
 			}
@@ -323,9 +349,11 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 
 		// make them immutable
 		for (Entry<IAEItemStack, Set<ICraftingPatternDetails>> e : tmpCraft.entrySet())
-			craftableItems.put( e.getKey(), ImmutableList.copyOf( e.getValue() ) );
+		{
+			this.craftableItems.put( e.getKey(), ImmutableList.copyOf( e.getValue() ) );
+		}
 
-		storageGrid.postAlterationOfStoredItems( StorageChannel.ITEMS, craftableItems.keySet(), new BaseActionSource() );
+		this.storageGrid.postAlterationOfStoredItems( StorageChannel.ITEMS, this.craftableItems.keySet(), new BaseActionSource() );
 	}
 
 	@Override
@@ -348,9 +376,13 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 	@Override
 	public List<IMEInventoryHandler> getCellArray(StorageChannel channel)
 	{
-		ArrayList<IMEInventoryHandler> list = new ArrayList<IMEInventoryHandler>( 1 );
+		List<IMEInventoryHandler> list = new ArrayList<IMEInventoryHandler>( 1 );
+
 		if ( channel == StorageChannel.ITEMS )
+		{
 			list.add( this );
+		}
+
 		return list;
 	}
 
@@ -370,11 +402,15 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 	public IItemList<IAEStack> getAvailableItems(IItemList<IAEStack> out)
 	{
 		// add craftable items!
-		for (IAEItemStack st : craftableItems.keySet())
+		for (IAEItemStack stack : this.craftableItems.keySet())
-			out.addCrafting( st );
+		{
+			out.addCrafting( stack );
+		}
 
-		for (IAEItemStack st : emitableItems)
+		for (IAEItemStack st : this.emitableItems)
+		{
 			out.addCrafting( st );
+		}
 
 		return out;
 	}
@@ -400,8 +436,10 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 	@Override
 	public IAEStack injectItems(IAEStack input, Actionable type, BaseActionSource src)
 	{
-		for (CraftingCPUCluster cpu : craftingCPUClusters)
+		for (CraftingCPUCluster cpu : this.craftingCPUClusters)
+		{
 			input = cpu.injectItems( input, type, src );
+		}
 
 		return input;
 	}
@@ -409,29 +447,36 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 	@Override
 	public boolean canAccept(IAEStack input)
 	{
-		for (CraftingCPUCluster cpu : craftingCPUClusters)
+		for (CraftingCPUCluster cpu : this.craftingCPUClusters)
+		{
 			if ( cpu.canAccept( input ) )
+			{
 				return true;
+			}
+		}
 
 		return false;
 	}
 
 	@Override
-	public ICraftingLink submitJob(ICraftingJob job, ICraftingRequester requestingMachine, ICraftingCPU target, final boolean prioritizePower,
+	public ICraftingLink submitJob(ICraftingJob job, ICraftingRequester requestingMachine, ICraftingCPU target, final boolean prioritizePower, BaseActionSource src)
-			BaseActionSource src)
 	{
 		if ( job.isSimulation() )
+		{
 			return null;
+		}
 
 		CraftingCPUCluster cpuCluster = null;
 
 		if ( target instanceof CraftingCPUCluster )
+		{
 			cpuCluster = (CraftingCPUCluster) target;
+		}
 
 		if ( target == null )
 		{
 			List<CraftingCPUCluster> validCpusClusters = new ArrayList<CraftingCPUCluster>();
-			for (CraftingCPUCluster cpu : craftingCPUClusters)
+			for (CraftingCPUCluster cpu : this.craftingCPUClusters)
 			{
 				if ( cpu.isActive() && !cpu.isBusy() && cpu.getAvailableStorage() >= job.getByteTotal() )
 				{
@@ -439,29 +484,31 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 				}
 			}
 
-			Collections.sort( validCpusClusters, new Comparator<CraftingCPUCluster>() {
+			Collections.sort( validCpusClusters, new Comparator<CraftingCPUCluster>()
-
+			{
 				@Override
-				public int compare(CraftingCPUCluster o1, CraftingCPUCluster o2)
+				public int compare(CraftingCPUCluster firstCluster, CraftingCPUCluster nextCluster)
 				{
 					if ( prioritizePower )
 					{
-						int a = ItemSorters.compareLong( o2.getCoProcessors(), o1.getCoProcessors() );
+						int comparison = ItemSorters.compareLong( nextCluster.getCoProcessors(), firstCluster.getCoProcessors() );
-						if ( a != 0 )
+						if ( comparison != 0 )
-							return a;
+							return comparison;
-						return ItemSorters.compareLong( o2.getAvailableStorage(), o1.getAvailableStorage() );
+						return ItemSorters.compareLong( nextCluster.getAvailableStorage(), firstCluster.getAvailableStorage() );
 					}
 
-					int a = ItemSorters.compareLong( o1.getCoProcessors(), o2.getCoProcessors() );
+					int comparison = ItemSorters.compareLong( firstCluster.getCoProcessors(), nextCluster.getCoProcessors() );
-					if ( a != 0 )
+					if ( comparison != 0 )
-						return a;
+						return comparison;
-					return ItemSorters.compareLong( o1.getAvailableStorage(), o2.getAvailableStorage() );
+					return ItemSorters.compareLong( firstCluster.getAvailableStorage(), nextCluster.getAvailableStorage() );
 				}
 
 			} );
 
 			if ( !validCpusClusters.isEmpty() )
+			{
 				cpuCluster = validCpusClusters.get( 0 );
+			}
 		}
 
 		if ( cpuCluster != null )
@@ -481,19 +528,19 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 	@Override
 	public ImmutableCollection<ICraftingPatternDetails> getCraftingFor(IAEItemStack whatToCraft, ICraftingPatternDetails details, int slotIndex, World world)
 	{
-		ImmutableList<ICraftingPatternDetails> res = craftableItems.get( whatToCraft );
+		ImmutableList<ICraftingPatternDetails> res = this.craftableItems.get( whatToCraft );
 
 		if ( res == null )
 		{
 			if ( details != null && details.isCraftable() )
 			{
-				for (IAEItemStack ais : craftableItems.keySet())
+				for (IAEItemStack ais : this.craftableItems.keySet())
 				{
 					if ( ais.getItem() == whatToCraft.getItem() && (!ais.getItem().getHasSubtypes() || ais.getItemDamage() == whatToCraft.getItemDamage()) )
 					{
 						if ( details.isValidItemForSlot( slotIndex, ais.getItemStack(), world ) )
 						{
-							return craftableItems.get( ais );
+							return this.craftableItems.get( ais );
 						}
 					}
 				}
@@ -507,12 +554,14 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 
 	public List<ICraftingMedium> getMediums(ICraftingPatternDetails key)
 	{
-		List<ICraftingMedium> o = craftingMethods.get( key );
+		List<ICraftingMedium> mediums = craftingMethods.get( key );
 
-		if ( o == null )
+		if ( mediums == null )
-			o = ImmutableList.of();
+		{
+			mediums = ImmutableList.of();
+		}
 
-		return o;
+		return mediums;
 	}
 
 	@Override
@@ -542,36 +591,44 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 	public Future<ICraftingJob> beginCraftingJob(World world, IGrid grid, BaseActionSource actionSrc, IAEItemStack slotItem, ICraftingCallback cb)
 	{
 		if ( world == null || grid == null || actionSrc == null || slotItem == null )
+		{
 			throw new RuntimeException( "Invalid Crafting Job Request" );
+		}
 
-		CraftingJob cj = new CraftingJob( world, grid, actionSrc, slotItem, cb );
+		CraftingJob job = new CraftingJob( world, grid, actionSrc, slotItem, cb );
-		return craftingPool.submit( cj, (ICraftingJob) cj );
+
+		return craftingPool.submit( job, (ICraftingJob) job );
 	}
 
 	public boolean hasCpu(ICraftingCPU cpu)
 	{
-		return craftingCPUClusters.contains( cpu );
+		return this.craftingCPUClusters.contains( cpu );
 	}
 
 	@Override
 	public boolean isRequesting(IAEItemStack what)
 	{
-		for (CraftingCPUCluster c : craftingCPUClusters)
+		for (CraftingCPUCluster cluster : this.craftingCPUClusters)
-			if ( c.isMaking( what ) )
+		{
+			if ( cluster.isMaking( what ) )
+			{
 				return true;
+			}
+		}
+
 		return false;
 	}
 
 	@Override
-	public boolean canEmitFor(IAEItemStack what)
+	public boolean canEmitFor(IAEItemStack someItem)
 	{
-		return emitableItems.contains( what );
+		return this.emitableItems.contains( someItem );
 	}
 
 	@Override
-	public void setEmitable(IAEItemStack what)
+	public void setEmitable(IAEItemStack someItem)
 	{
-		emitableItems.add( what.copy() );
+		this.emitableItems.add( someItem.copy() );
 	}
 
 }