From 118f13edff67b262d643e27d16e7b532171a13c4 Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Wed, 12 Feb 2014 10:35:42 -0600 Subject: [PATCH] Fixed typos, added proper argument-javadoc - Api Sync. --- api | 2 +- .../implementations/ContainerMEMonitorable.java | 4 ++-- helpers/WirelessTerminalGuiObject.java | 6 +++--- me/storage/MEMonitorIInventory.java | 14 +++++++------- me/storage/MEMonitorPassthu.java | 16 ++++++++-------- parts/automation/PartLevelEmitter.java | 4 ++-- parts/misc/PartStorageBus.java | 4 ++-- tile/storage/TileChest.java | 4 ++-- util/Platform.java | 4 ++-- 9 files changed, 29 insertions(+), 29 deletions(-) diff --git a/api b/api index e9440a4d..abd2deac 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit e9440a4d13ef512aa4de508665a9ee74e822f00e +Subproject commit abd2deac47e677ac3321d3eb49422ff8c6b75293 diff --git a/container/implementations/ContainerMEMonitorable.java b/container/implementations/ContainerMEMonitorable.java index 5495fb84..a63bec0d 100644 --- a/container/implementations/ContainerMEMonitorable.java +++ b/container/implementations/ContainerMEMonitorable.java @@ -18,7 +18,7 @@ import appeng.api.networking.energy.IEnergyGrid; import appeng.api.networking.security.BaseActionSource; import appeng.api.parts.IPart; import appeng.api.storage.IMEMonitor; -import appeng.api.storage.IMEMonitorHandlerReciever; +import appeng.api.storage.IMEMonitorHandlerReceiver; import appeng.api.storage.IStorageMonitorable; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; @@ -29,7 +29,7 @@ import appeng.core.sync.packets.PacketMEInventoryUpdate; import appeng.util.Platform; import appeng.util.item.ItemList; -public class ContainerMEMonitorable extends AEBaseContainer implements IMEMonitorHandlerReciever +public class ContainerMEMonitorable extends AEBaseContainer implements IMEMonitorHandlerReceiver { final IMEMonitor monitor; diff --git a/helpers/WirelessTerminalGuiObject.java b/helpers/WirelessTerminalGuiObject.java index 2bdfcaa3..556ec87b 100644 --- a/helpers/WirelessTerminalGuiObject.java +++ b/helpers/WirelessTerminalGuiObject.java @@ -17,7 +17,7 @@ import appeng.api.networking.IMachineSet; import appeng.api.networking.security.BaseActionSource; import appeng.api.networking.storage.IStorageGrid; import appeng.api.storage.IMEMonitor; -import appeng.api.storage.IMEMonitorHandlerReciever; +import appeng.api.storage.IMEMonitorHandlerReceiver; import appeng.api.storage.StorageChannel; import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IAEItemStack; @@ -154,14 +154,14 @@ public class WirelessTerminalGuiObject implements IPortableCell } @Override - public void addListener(IMEMonitorHandlerReciever l, Object verificationToken) + public void addListener(IMEMonitorHandlerReceiver l, Object verificationToken) { if ( itemStorage != null ) itemStorage.addListener( l, verificationToken ); } @Override - public void removeListener(IMEMonitorHandlerReciever l) + public void removeListener(IMEMonitorHandlerReceiver l) { if ( itemStorage != null ) itemStorage.removeListener( l ); diff --git a/me/storage/MEMonitorIInventory.java b/me/storage/MEMonitorIInventory.java index e6fb9594..aa1593f9 100644 --- a/me/storage/MEMonitorIInventory.java +++ b/me/storage/MEMonitorIInventory.java @@ -15,7 +15,7 @@ import appeng.api.networking.security.BaseActionSource; import appeng.api.networking.ticking.TickRateModulation; import appeng.api.storage.IMEInventory; import appeng.api.storage.IMEMonitor; -import appeng.api.storage.IMEMonitorHandlerReciever; +import appeng.api.storage.IMEMonitorHandlerReceiver; import appeng.api.storage.StorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; @@ -54,18 +54,18 @@ public class MEMonitorIInventory implements IMEInventory, IMEMonit final TreeMap memory; final IItemList list = new ItemList(); - final HashMap, Object> listeners = new HashMap(); + final HashMap, Object> listeners = new HashMap(); public BaseActionSource mySource; @Override - public void addListener(IMEMonitorHandlerReciever l, Object verificationToken) + public void addListener(IMEMonitorHandlerReceiver l, Object verificationToken) { listeners.put( l, verificationToken ); } @Override - public void removeListener(IMEMonitorHandlerReciever l) + public void removeListener(IMEMonitorHandlerReceiver l) { listeners.remove( l ); } @@ -234,11 +234,11 @@ public class MEMonitorIInventory implements IMEInventory, IMEMonit // AELog.info( a.getItemStack().getUnlocalizedName() + " @ " + a.getStackSize() ); if ( a != null ) { - Iterator, Object>> i = listeners.entrySet().iterator(); + Iterator, Object>> i = listeners.entrySet().iterator(); while (i.hasNext()) { - Entry, Object> l = i.next(); - IMEMonitorHandlerReciever key = l.getKey(); + Entry, Object> l = i.next(); + IMEMonitorHandlerReceiver key = l.getKey(); if ( key.isValid( l.getValue() ) ) key.postChange( this, a, mySource ); else diff --git a/me/storage/MEMonitorPassthu.java b/me/storage/MEMonitorPassthu.java index a3880465..a2e66e05 100644 --- a/me/storage/MEMonitorPassthu.java +++ b/me/storage/MEMonitorPassthu.java @@ -7,16 +7,16 @@ import java.util.Map.Entry; import appeng.api.networking.security.BaseActionSource; import appeng.api.storage.IMEInventory; import appeng.api.storage.IMEMonitor; -import appeng.api.storage.IMEMonitorHandlerReciever; +import appeng.api.storage.IMEMonitorHandlerReceiver; import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IItemList; import appeng.util.Platform; import appeng.util.item.ItemList; -public class MEMonitorPassthu> extends MEPassthru implements IMEMonitor, IMEMonitorHandlerReciever +public class MEMonitorPassthu> extends MEPassthru implements IMEMonitor, IMEMonitorHandlerReceiver { - HashMap, Object> listeners = new HashMap(); + HashMap, Object> listeners = new HashMap(); IMEMonitor monitor; public BaseActionSource changeSource; @@ -49,13 +49,13 @@ public class MEMonitorPassthu> extends MEPassthru imple } @Override - public void addListener(IMEMonitorHandlerReciever l, Object verificationToken) + public void addListener(IMEMonitorHandlerReceiver l, Object verificationToken) { listeners.put( l, verificationToken ); } @Override - public void removeListener(IMEMonitorHandlerReciever l) + public void removeListener(IMEMonitorHandlerReceiver l) { listeners.remove( l ); } @@ -77,11 +77,11 @@ public class MEMonitorPassthu> extends MEPassthru imple @Override public void postChange(IMEMonitor monitor, T change, BaseActionSource source) { - Iterator, Object>> i = listeners.entrySet().iterator(); + Iterator, Object>> i = listeners.entrySet().iterator(); while (i.hasNext()) { - Entry, Object> e = i.next(); - IMEMonitorHandlerReciever recv = e.getKey(); + Entry, Object> e = i.next(); + IMEMonitorHandlerReceiver recv = e.getKey(); if ( recv.isValid( e.getValue() ) ) recv.postChange( this, change, source ); else diff --git a/parts/automation/PartLevelEmitter.java b/parts/automation/PartLevelEmitter.java index 7da138d1..3902bedd 100644 --- a/parts/automation/PartLevelEmitter.java +++ b/parts/automation/PartLevelEmitter.java @@ -27,7 +27,7 @@ import appeng.api.networking.storage.IStackWatcherHost; import appeng.api.parts.IPartCollsionHelper; import appeng.api.parts.IPartRenderHelper; import appeng.api.storage.IMEMonitor; -import appeng.api.storage.IMEMonitorHandlerReciever; +import appeng.api.storage.IMEMonitorHandlerReceiver; import appeng.api.storage.StorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEStack; @@ -42,7 +42,7 @@ import appeng.util.Platform; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class PartLevelEmitter extends PartUpgradeable implements IStackWatcherHost, IMEMonitorHandlerReciever +public class PartLevelEmitter extends PartUpgradeable implements IStackWatcherHost, IMEMonitorHandlerReceiver { final int FLAG_ON = 4; diff --git a/parts/misc/PartStorageBus.java b/parts/misc/PartStorageBus.java index ae349b83..508563c7 100644 --- a/parts/misc/PartStorageBus.java +++ b/parts/misc/PartStorageBus.java @@ -34,7 +34,7 @@ import appeng.api.storage.IExternalStorageHandler; import appeng.api.storage.IMEInventory; import appeng.api.storage.IMEInventoryHandler; import appeng.api.storage.IMEMonitor; -import appeng.api.storage.IMEMonitorHandlerReciever; +import appeng.api.storage.IMEMonitorHandlerReceiver; import appeng.api.storage.StorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; @@ -59,7 +59,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @Interface(modid = "BuildCraft|Transport", iface = "buildcraft.api.transport.IPipeConnection") -public class PartStorageBus extends PartUpgradeable implements IGridTickable, ICellContainer, IMEMonitorHandlerReciever, IPipeConnection, +public class PartStorageBus extends PartUpgradeable implements IGridTickable, ICellContainer, IMEMonitorHandlerReceiver, IPipeConnection, IPriorityHost { diff --git a/tile/storage/TileChest.java b/tile/storage/TileChest.java index 7c13bec0..91324a9a 100644 --- a/tile/storage/TileChest.java +++ b/tile/storage/TileChest.java @@ -37,7 +37,7 @@ import appeng.api.storage.ICellHandler; import appeng.api.storage.IMEInventory; import appeng.api.storage.IMEInventoryHandler; import appeng.api.storage.IMEMonitor; -import appeng.api.storage.IMEMonitorHandlerReciever; +import appeng.api.storage.IMEMonitorHandlerReceiver; import appeng.api.storage.IStorageMonitorable; import appeng.api.storage.MEMonitorHandler; import appeng.api.storage.StorageChannel; @@ -259,7 +259,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan return fcell; } - class ChestNetNotifier> implements IMEMonitorHandlerReciever + class ChestNetNotifier> implements IMEMonitorHandlerReceiver { final StorageChannel chan; diff --git a/util/Platform.java b/util/Platform.java index 87d76b00..190973ec 100644 --- a/util/Platform.java +++ b/util/Platform.java @@ -63,7 +63,7 @@ import appeng.api.networking.security.BaseActionSource; import appeng.api.networking.security.ISecurityGrid; import appeng.api.networking.storage.IStorageGrid; import appeng.api.storage.IMEInventory; -import appeng.api.storage.IMEMonitorHandlerReciever; +import appeng.api.storage.IMEMonitorHandlerReceiver; import appeng.api.storage.StorageChannel; import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IAEItemStack; @@ -1325,7 +1325,7 @@ public class Platform } } - static public > void postListChanges(IItemList before, IItemList after, IMEMonitorHandlerReciever meMonitorPassthu, + static public > void postListChanges(IItemList before, IItemList after, IMEMonitorHandlerReceiver meMonitorPassthu, BaseActionSource source) { for (T is : before)