From fd7c1ff5f8105057e60591abd7fbeccaa9db54c1 Mon Sep 17 00:00:00 2001
From: yueh <yueh@orod.de>
Date: Mon, 29 Sep 2014 12:39:40 +0200
Subject: [PATCH] Added checks for null and equal class to .equals()

Also switched a check for null in OreHelper#sameOre to prevent null ==
null => true
---
 .../client/gui/widgets/GuiImgButton.java      |  8 ++++--
 .../java/appeng/helpers/PatternHelper.java    | 25 +++++++++++++------
 .../java/appeng/hooks/CompassManager.java     |  8 ++++--
 .../tools/powered/ToolEntropyManipulator.java |  7 +++++-
 .../java/appeng/me/GridStorageSearch.java     |  7 +++---
 src/main/java/appeng/util/item/AEItemDef.java |  8 ++++--
 src/main/java/appeng/util/item/OreHelper.java | 19 ++++++++------
 .../appeng/util/item/SharedSearchObject.java  |  8 +++---
 8 files changed, 63 insertions(+), 27 deletions(-)

diff --git a/src/main/java/appeng/client/gui/widgets/GuiImgButton.java b/src/main/java/appeng/client/gui/widgets/GuiImgButton.java
index 76640a3fe..dc1a3eb43 100644
--- a/src/main/java/appeng/client/gui/widgets/GuiImgButton.java
+++ b/src/main/java/appeng/client/gui/widgets/GuiImgButton.java
@@ -53,8 +53,12 @@ public class GuiImgButton extends GuiButton implements ITooltip
 		@Override
 		public boolean equals(Object obj)
 		{
-			EnumPair d = (EnumPair) obj;
-			return d.setting.equals( setting ) && d.value.equals( value );
+			if ( obj == null )
+				return false;
+			if ( getClass() != obj.getClass() )
+				return false;
+			EnumPair other = (EnumPair) obj;
+			return other.setting.equals( setting ) && other.value.equals( value );
 		}
 
 	}
diff --git a/src/main/java/appeng/helpers/PatternHelper.java b/src/main/java/appeng/helpers/PatternHelper.java
index a477d3edf..b68a5b4fc 100644
--- a/src/main/java/appeng/helpers/PatternHelper.java
+++ b/src/main/java/appeng/helpers/PatternHelper.java
@@ -48,11 +48,13 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
 		final int ref;
 		final int hash;
 
-		public TestLookup(int slot, ItemStack i) {
+		public TestLookup(int slot, ItemStack i)
+		{
 			this( slot, i.getItem(), i.getItemDamage() );
 		}
 
-		public TestLookup(int slot, Item item, int dmg) {
+		public TestLookup(int slot, Item item, int dmg)
+		{
 			this.slot = slot;
 			ref = (dmg << Platform.DEF_OFFSET) | (Item.getIdFromItem( item ) & 0xffff);
 			int offset = 3 * slot;
@@ -110,7 +112,8 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
 		return TestStatus.TEST;
 	}
 
-	public PatternHelper(ItemStack is, World w) {
+	public PatternHelper(ItemStack is, World w)
+	{
 		NBTTagCompound encodedValue = is.getTagCompound();
 
 		if ( encodedValue == null )
@@ -191,10 +194,10 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
 			else
 				g.add( io );
 		}
-		
+
 		if ( tmpOutputs.isEmpty() || tmpInputs.isEmpty() )
 			throw new RuntimeException( "No pattern here!" );
-		
+
 		int offset = 0;
 		condensedInputs = new IAEItemStack[tmpInputs.size()];
 		for (IAEItemStack io : tmpInputs.values())
@@ -338,7 +341,14 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
 	@Override
 	public boolean equals(Object obj)
 	{
-		return pattern.equals( ((PatternHelper) obj).pattern );
+		if ( obj == null )
+			return false;
+		if ( getClass() != obj.getClass() )
+			return false;
+		PatternHelper other = (PatternHelper) obj;
+		if ( pattern != null && other.pattern != null )
+			return pattern.equals( other.pattern );
+		return false;
 	}
 
 	@Override
@@ -348,7 +358,8 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
 	}
 
 	@Override
-	public int getPriority() {
+	public int getPriority()
+	{
 		return priority;
 	}
 }
diff --git a/src/main/java/appeng/hooks/CompassManager.java b/src/main/java/appeng/hooks/CompassManager.java
index 97e69cd0d..a4b0f5bb6 100644
--- a/src/main/java/appeng/hooks/CompassManager.java
+++ b/src/main/java/appeng/hooks/CompassManager.java
@@ -38,8 +38,12 @@ public class CompassManager
 		@Override
 		public boolean equals(Object obj)
 		{
-			CompassRequest b = (CompassRequest) obj;
-			return attunement == b.attunement && cx == b.cx && cdy == b.cdy && cz == b.cz;
+			if ( obj == null )
+				return false;
+			if ( getClass() != obj.getClass() )
+				return false;
+			CompassRequest other = (CompassRequest) obj;
+			return attunement == other.attunement && cx == other.cx && cdy == other.cdy && cz == other.cz;
 		}
 
 	}
diff --git a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java
index da7250568..3ca189413 100644
--- a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java
+++ b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java
@@ -54,7 +54,12 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
 		@Override
 		public boolean equals(Object obj)
 		{
-			return blk == ((Combo) obj).blk && meta == ((Combo) obj).meta;
+			if ( obj == null )
+				return false;
+			if ( getClass() != obj.getClass() )
+				return false;
+			Combo other = (Combo) obj;
+			return blk == other.blk && meta == other.meta;
 		}
 
 	}
diff --git a/src/main/java/appeng/me/GridStorageSearch.java b/src/main/java/appeng/me/GridStorageSearch.java
index 6f2770ea3..db8028cfa 100644
--- a/src/main/java/appeng/me/GridStorageSearch.java
+++ b/src/main/java/appeng/me/GridStorageSearch.java
@@ -22,10 +22,11 @@ public class GridStorageSearch
 	{
 		if ( obj == null )
 			return false;
+		if ( getClass() != obj.getClass() )
+			return false;
 
-		GridStorageSearch b = (GridStorageSearch) obj;
-
-		if ( id == b.id )
+		GridStorageSearch other = (GridStorageSearch) obj;
+		if ( id == other.id )
 			return true;
 
 		return false;
diff --git a/src/main/java/appeng/util/item/AEItemDef.java b/src/main/java/appeng/util/item/AEItemDef.java
index 5bd1a9559..d9031c903 100644
--- a/src/main/java/appeng/util/item/AEItemDef.java
+++ b/src/main/java/appeng/util/item/AEItemDef.java
@@ -60,8 +60,12 @@ public class AEItemDef
 	@Override
 	public boolean equals(Object obj)
 	{
-		AEItemDef def = (AEItemDef) obj;
-		return def.damageValue == damageValue && def.item == item && tagCompound == def.tagCompound;
+		if ( obj == null )
+			return false;
+		if ( getClass() != obj.getClass() )
+			return false;
+		AEItemDef other = (AEItemDef) obj;
+		return other.damageValue == damageValue && other.item == item && tagCompound == other.tagCompound;
 	}
 
 	public int getDamageValueHack(ItemStack is)
diff --git a/src/main/java/appeng/util/item/OreHelper.java b/src/main/java/appeng/util/item/OreHelper.java
index afefc2a2c..b8d0ce2de 100644
--- a/src/main/java/appeng/util/item/OreHelper.java
+++ b/src/main/java/appeng/util/item/OreHelper.java
@@ -16,7 +16,8 @@ public class OreHelper
 	class ItemRef
 	{
 
-		ItemRef(ItemStack stack) {
+		ItemRef(ItemStack stack)
+		{
 			ref = stack.getItem();
 
 			if ( stack.getItem().isDamageable() )
@@ -32,10 +33,14 @@ public class OreHelper
 		int hash;
 
 		@Override
-		public boolean equals(Object o)
+		public boolean equals(Object obj)
 		{
-			ItemRef obj = (ItemRef) o;
-			return damage == obj.damage && ref == obj.ref;
+			if ( obj == null )
+				return false;
+			if ( getClass() != obj.getClass() )
+				return false;
+			ItemRef other = (ItemRef) obj;
+			return damage == other.damage && ref == other.ref;
 		}
 
 		@Override
@@ -103,12 +108,12 @@ public class OreHelper
 		OreReference a = aeItemStack.def.isOre;
 		OreReference b = aeItemStack.def.isOre;
 
-		if ( a == b )
-			return true;
-
 		if ( a == null || b == null )
 			return false;
 
+		if ( a == b )
+			return true;
+
 		Collection<Integer> bOres = b.getOres();
 		for (Integer ore : a.getOres())
 		{
diff --git a/src/main/java/appeng/util/item/SharedSearchObject.java b/src/main/java/appeng/util/item/SharedSearchObject.java
index 82caca1ab..59b7acffa 100644
--- a/src/main/java/appeng/util/item/SharedSearchObject.java
+++ b/src/main/java/appeng/util/item/SharedSearchObject.java
@@ -23,10 +23,12 @@ public class SharedSearchObject
 	{
 		if ( obj == null )
 			return false;
-		SharedSearchObject b = (SharedSearchObject) obj;
-		if ( def == b.def && hash == b.hash )
+		if ( getClass() != obj.getClass() )
+			return false;
+		SharedSearchObject other = (SharedSearchObject) obj;
+		if ( def == other.def && hash == other.hash )
 		{
-			return Platform.NBTEqualityTest( compound, b.compound );
+			return Platform.NBTEqualityTest( compound, other.compound );
 		}
 		return false;
 	}