Resolved some unchecked Types
This commit is contained in:
+10
-10
@@ -68,8 +68,8 @@ import com.google.common.collect.SetMultimap;
|
||||
public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper, ICellProvider, IMEInventoryHandler
|
||||
{
|
||||
|
||||
HashSet<CraftingCPUCluster> cpuClusters = new HashSet();
|
||||
HashSet<ICraftingProvider> providers = new HashSet();
|
||||
HashSet<CraftingCPUCluster> cpuClusters = new HashSet<CraftingCPUCluster>();
|
||||
HashSet<ICraftingProvider> providers = new HashSet<ICraftingProvider>();
|
||||
|
||||
private HashMap<IGridNode, ICraftingWatcher> watchers = new HashMap<IGridNode, ICraftingWatcher>();
|
||||
|
||||
@@ -77,14 +77,14 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
|
||||
IStorageGrid sg;
|
||||
IEnergyGrid eg;
|
||||
|
||||
HashMap<ICraftingPatternDetails, List<ICraftingMedium>> craftingMethods = new HashMap();
|
||||
HashMap<IAEItemStack, ImmutableList<ICraftingPatternDetails>> craftableItems = new HashMap();
|
||||
HashSet<IAEItemStack> emitableItems = new HashSet();
|
||||
HashMap<String, CraftingLinkNexus> links = new HashMap();
|
||||
HashMap<ICraftingPatternDetails, List<ICraftingMedium>> craftingMethods = new HashMap<ICraftingPatternDetails, List<ICraftingMedium>>();
|
||||
HashMap<IAEItemStack, ImmutableList<ICraftingPatternDetails>> craftableItems = new HashMap<IAEItemStack, ImmutableList<ICraftingPatternDetails>>();
|
||||
HashSet<IAEItemStack> emitableItems = new HashSet<IAEItemStack>();
|
||||
HashMap<String, CraftingLinkNexus> links = new HashMap<String, CraftingLinkNexus>();
|
||||
|
||||
boolean updateList = false;
|
||||
final private SetMultimap<IAEStack, ItemWatcher> interests = HashMultimap.create();
|
||||
final public GenericInterestManager interestManager = new GenericInterestManager( interests );
|
||||
final private SetMultimap<IAEStack, Collection<IAEStack>> interests = HashMultimap.create();
|
||||
final public GenericInterestManager<Collection<IAEStack>> interestManager = new GenericInterestManager<Collection<IAEStack>>( interests );
|
||||
|
||||
class ActiveCpuIterator implements Iterator<ICraftingCPU>
|
||||
{
|
||||
@@ -301,7 +301,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
|
||||
|
||||
// erase list.
|
||||
craftingMethods.clear();
|
||||
craftableItems = new HashMap();
|
||||
craftableItems = new HashMap<IAEItemStack, ImmutableList<ICraftingPatternDetails>>();
|
||||
emitableItems.clear();
|
||||
|
||||
// update the stuff that was in the list...
|
||||
@@ -311,7 +311,7 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
|
||||
for (ICraftingProvider cp : providers)
|
||||
cp.provideCrafting( this );
|
||||
|
||||
HashMap<IAEItemStack, Set<ICraftingPatternDetails>> tmpCraft = new HashMap();
|
||||
HashMap<IAEItemStack, Set<ICraftingPatternDetails>> tmpCraft = new HashMap<IAEItemStack, Set<ICraftingPatternDetails>>();
|
||||
|
||||
// new craftables!
|
||||
for (ICraftingPatternDetails details : craftingMethods.keySet())
|
||||
|
||||
+3
-3
@@ -71,15 +71,15 @@ public class EnergyGridCache implements IEnergyGrid
|
||||
double extra = 0;
|
||||
|
||||
IAEPowerStorage lastProvider;
|
||||
final Set<IAEPowerStorage> providers = new LinkedHashSet();
|
||||
final Set<IAEPowerStorage> providers = new LinkedHashSet<IAEPowerStorage>();
|
||||
|
||||
IAEPowerStorage lastRequester;
|
||||
final Set<IAEPowerStorage> requesters = new LinkedHashSet();
|
||||
final Set<IAEPowerStorage> requesters = new LinkedHashSet<IAEPowerStorage>();
|
||||
|
||||
final public TreeSet<EnergyThreshold> interests = new TreeSet<EnergyThreshold>();
|
||||
final private HashMap<IGridNode, IEnergyWatcher> watchers = new HashMap<IGridNode, IEnergyWatcher>();
|
||||
|
||||
final private Set<IEnergyGrid> localSeen = new HashSet();
|
||||
final private Set<IEnergyGrid> localSeen = new HashSet<IEnergyGrid>();
|
||||
|
||||
private double buffer()
|
||||
{
|
||||
|
||||
+4
-4
@@ -39,10 +39,10 @@ public class GridStorageCache implements IStorageGrid
|
||||
{
|
||||
|
||||
final private SetMultimap<IAEStack, ItemWatcher> interests = HashMultimap.create();
|
||||
final public GenericInterestManager interestManager = new GenericInterestManager( interests );
|
||||
final public GenericInterestManager<ItemWatcher> interestManager = new GenericInterestManager<ItemWatcher>( interests );
|
||||
|
||||
final HashSet<ICellProvider> activeCellProviders = new HashSet();
|
||||
final HashSet<ICellProvider> inactiveCellProviders = new HashSet();
|
||||
final HashSet<ICellProvider> activeCellProviders = new HashSet<ICellProvider>();
|
||||
final HashSet<ICellProvider> inactiveCellProviders = new HashSet<ICellProvider>();
|
||||
final public IGrid myGrid;
|
||||
|
||||
private NetworkInventoryHandler<IAEItemStack> myItemNetwork;
|
||||
@@ -95,7 +95,7 @@ public class GridStorageCache implements IStorageGrid
|
||||
private class CellChangeTracker
|
||||
{
|
||||
|
||||
List<CellChangeTrackerRecord> data = new LinkedList();
|
||||
List<CellChangeTrackerRecord> data = new LinkedList<CellChangeTrackerRecord>();
|
||||
|
||||
public void postChanges(StorageChannel channel, int i, IMEInventoryHandler<? extends IAEStack> h, BaseActionSource actionSrc)
|
||||
{
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@ import com.google.common.collect.Multimap;
|
||||
public class P2PCache implements IGridCache
|
||||
{
|
||||
|
||||
final private HashMap<Long, PartP2PTunnel> inputs = new HashMap();
|
||||
final private HashMap<Long, PartP2PTunnel> inputs = new HashMap<Long, PartP2PTunnel>();
|
||||
final private Multimap<Long, PartP2PTunnel> outputs = LinkedHashMultimap.create();
|
||||
final private TunnelCollection NullColl = new TunnelCollection<PartP2PTunnel>( null, null );
|
||||
|
||||
|
||||
+6
-6
@@ -43,7 +43,7 @@ public class PathGridCache implements IPathingGrid
|
||||
boolean updateNetwork = true;
|
||||
boolean booting = false;
|
||||
|
||||
final LinkedList<PathSegment> active = new LinkedList();
|
||||
final LinkedList<PathSegment> active = new LinkedList<PathSegment>();
|
||||
|
||||
ControllerState controllerState = ControllerState.NO_CONTROLLER;
|
||||
|
||||
@@ -53,13 +53,13 @@ public class PathGridCache implements IPathingGrid
|
||||
public int channelsInUse = 0;
|
||||
int lastChannels = 0;
|
||||
|
||||
final Set<TileController> controllers = new HashSet();
|
||||
final Set<IGridNode> requireChannels = new HashSet();
|
||||
final Set<IGridNode> blockDense = new HashSet();
|
||||
final Set<TileController> controllers = new HashSet<TileController>();
|
||||
final Set<IGridNode> requireChannels = new HashSet<IGridNode>();
|
||||
final Set<IGridNode> blockDense = new HashSet<IGridNode>();
|
||||
|
||||
final IGrid myGrid;
|
||||
private HashSet<IPathItem> semiOpen = new HashSet();
|
||||
private HashSet<IPathItem> closedList = new HashSet();
|
||||
private HashSet<IPathItem> semiOpen = new HashSet<IPathItem>();
|
||||
private HashSet<IPathItem> closedList = new HashSet<IPathItem>();
|
||||
|
||||
public int channelsByBlocks = 0;
|
||||
public double channelPowerUsage = 0.0;
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@ import appeng.me.GridNode;
|
||||
public class SecurityCache implements IGridCache, ISecurityGrid
|
||||
{
|
||||
|
||||
final private List<ISecurityProvider> securityProvider = new ArrayList();
|
||||
final private List<ISecurityProvider> securityProvider = new ArrayList<ISecurityProvider>();
|
||||
final private HashMap<Integer, EnumSet<SecurityPermissions>> playerPerms = new HashMap<Integer, EnumSet<SecurityPermissions>>();
|
||||
|
||||
public SecurityCache(IGrid g) {
|
||||
|
||||
+4
-4
@@ -29,8 +29,8 @@ public class SpatialPylonCache implements IGridCache, ISpatialCache
|
||||
DimensionalCoord captureMax;
|
||||
boolean isValid = false;
|
||||
|
||||
List<TileSpatialIOPort> ioPorts = new LinkedList();
|
||||
HashMap<SpatialPylonCluster, SpatialPylonCluster> clusters = new HashMap();
|
||||
List<TileSpatialIOPort> ioPorts = new LinkedList<TileSpatialIOPort>();
|
||||
HashMap<SpatialPylonCluster, SpatialPylonCluster> clusters = new HashMap<SpatialPylonCluster, SpatialPylonCluster>();
|
||||
|
||||
boolean needsUpdate = false;
|
||||
|
||||
@@ -80,8 +80,8 @@ public class SpatialPylonCache implements IGridCache, ISpatialCache
|
||||
double minPower = 0;
|
||||
double maxPower = 0;
|
||||
|
||||
clusters = new HashMap();
|
||||
ioPorts = new LinkedList();
|
||||
clusters = new HashMap<SpatialPylonCluster, SpatialPylonCluster>();
|
||||
ioPorts = new LinkedList<TileSpatialIOPort>();
|
||||
|
||||
for (IGridNode gm : grid.getMachines( TileSpatialIOPort.class ))
|
||||
{
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@ public class Connections implements Callable
|
||||
{
|
||||
|
||||
final private PartP2PTunnelME me;
|
||||
final public HashMap<IGridNode, TunnelConnection> connections = new HashMap();
|
||||
final public HashMap<IGridNode, TunnelConnection> connections = new HashMap<IGridNode, TunnelConnection>();
|
||||
|
||||
public boolean create = false;
|
||||
public boolean destroy = false;
|
||||
|
||||
@@ -21,8 +21,8 @@ public class TunnelCollection<T extends PartP2PTunnel> implements Iterable<T>
|
||||
public Iterator<T> iterator()
|
||||
{
|
||||
if ( tunnelSources == null )
|
||||
return new NullIterator();
|
||||
return new TunnelIterator( tunnelSources, clz );
|
||||
return new NullIterator<T>();
|
||||
return new TunnelIterator<T>( tunnelSources, clz );
|
||||
}
|
||||
|
||||
public void setSource(Collection<T> c)
|
||||
|
||||
Reference in New Issue
Block a user