From 1d1ea7a03e4d1d42419bfa0e633861abcc6ac3b4 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Mon, 29 Sep 2014 09:28:58 +0200 Subject: [PATCH] Replaces String == comparison with .equals() --- src/main/java/appeng/integration/modules/FMP.java | 2 +- src/main/java/appeng/items/tools/ToolMemoryCard.java | 2 +- .../java/appeng/items/tools/powered/ToolWirelessTerminal.java | 2 +- src/main/java/appeng/util/Platform.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/appeng/integration/modules/FMP.java b/src/main/java/appeng/integration/modules/FMP.java index 264cc904e..d9304e56c 100644 --- a/src/main/java/appeng/integration/modules/FMP.java +++ b/src/main/java/appeng/integration/modules/FMP.java @@ -39,7 +39,7 @@ public class FMP implements IIntegrationModule, IPartFactory, IPartConverter, IF { 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 index c8924f5a0..09c0ba821 100644 --- a/src/main/java/appeng/items/tools/ToolMemoryCard.java +++ b/src/main/java/appeng/items/tools/ToolMemoryCard.java @@ -75,7 +75,7 @@ public class ToolMemoryCard extends AEBaseItem implements IMemoryCard { 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 index a077519b4..157402690 100644 --- 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 class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless { 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 index fc5bc5028..493781107 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -446,7 +446,7 @@ public class Platform 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 )