Merge pull request #183 from thatsIch/Equals

Replaces String == comparison with .equals()
AppliedEnergistics · Sep 29, 2014 · 1404a2f · 1404a2f
2 parents 7b3bde7 + 1d1ea7a
commit 1404a2f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/appeng/integration/modules/FMP.java b/src/main/java/appeng/integration/modules/FMP.java
@@ -39,7 +39,7 @@ public TMultiPart createPart(String name, boolean client)
 	{
 		for (PartRegistry pr : PartRegistry.values())
 		{
-			if ( pr.getName() == name )
+			if ( pr.getName().equals( name ) )
 				return pr.construct( 0 );
 		}
 

diff --git a/src/main/java/appeng/items/tools/ToolMemoryCard.java b/src/main/java/appeng/items/tools/ToolMemoryCard.java
@@ -75,7 +75,7 @@ public String getSettingsName(ItemStack is)
 	{
 		NBTTagCompound c = Platform.openNbtData( is );
 		String name = c.getString( "Config" );
-		return name == null || name == "" ? GuiText.Blank.getUnlocalized() : name;
+		return name == null || name.equals( "" ) ? GuiText.Blank.getUnlocalized() : name;
 	}
 
 	@Override

diff --git a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java b/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java
@@ -59,7 +59,7 @@ public void addInformation(ItemStack i, EntityPlayer p, List l, boolean b)
 			{
 				String encKey = tag.getString( "encryptionKey" );
 
-				if ( encKey == null || encKey == "" )
+				if ( encKey == null || encKey.equals( "" ) )
 					l.add( GuiText.Unlinked.getLocal() );
 				else
 					l.add( GuiText.Linked.getLocal() );

diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java
@@ -447,7 +447,7 @@ public static boolean NBTEqualityTest(NBTBase A, NBTBase B)
 				return ((NBTTagLong) A).func_150291_c() == ((NBTTagLong) B).func_150291_c();
 
 			case 8: // else if ( A instanceof NBTTagString )
-				return ((NBTTagString) A).func_150285_a_() == ((NBTTagString) B).func_150285_a_()
+				return ((NBTTagString) A).func_150285_a_().equals( ((NBTTagString) B).func_150285_a_() )
 						|| ((NBTTagString) A).func_150285_a_().equals( ((NBTTagString) B).func_150285_a_() );
 
 			case 6: // else if ( A instanceof NBTTagDouble )