$ More FindBugs, PMD & CheckStyle clean up.

6 files changed, 13 insertions, 11 deletions

diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
index bab4bfeded..eb5694f1a9 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
@@ -79,8 +79,9 @@ public class BaseItemComponent extends Item{
 	@Override
 	public String getItemStackDisplayName(ItemStack p_77653_1_) {
 
-		if (componentMaterial != null)
+		if (componentMaterial != null) {
 			return (componentMaterial.getLocalizedName()+componentType.DISPLAY_NAME);
+		}
 		return materialName+" Cell";
 	}
 
@@ -132,8 +133,9 @@ public class BaseItemComponent extends Item{
 				//list.add(EnumChatFormatting.GRAY+"A " + materialName + " Ring.");
 			}			
 			if (componentMaterial != null){
-				if (!componentMaterial.vChemicalFormula.equals("??"))
+				if (!componentMaterial.vChemicalFormula.equals("??")) {
 					list.add(componentMaterial.vChemicalFormula);
+				}
 
 				if (componentMaterial.isRadioactive){
 					list.add(CORE.GT_Tooltip_Radioactive);
diff --git a/src/Java/gtPlusPlus/core/item/base/CoreItem.java b/src/Java/gtPlusPlus/core/item/base/CoreItem.java
index 6c3fb531dd..9c7b14f648 100644
--- a/src/Java/gtPlusPlus/core/item/base/CoreItem.java
+++ b/src/Java/gtPlusPlus/core/item/base/CoreItem.java
@@ -177,7 +177,7 @@ public class CoreItem extends Item
 
 	@Override
 	public String getItemStackDisplayName(ItemStack tItem) {
-		if (itemName == null || itemName.equals("") || itemName == "")
+		if (itemName == null || itemName.equals(""))
 		return super.getItemStackDisplayName(tItem);
 		return itemName;
 	}
diff --git a/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java b/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java
index 2c3ee38048..b9345f6f57 100644
--- a/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java
+++ b/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java
@@ -38,7 +38,7 @@ public class BaseItemCell extends BaseItemComponent{
 
 	private int fluidBright = 0;
 	private int tickValue;
-	private short fluidColour[];
+	private short[] fluidColour;
 	boolean upwards = true;
 
 	@Override
diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
index 4e4192262a..696f497afc 100644
--- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
+++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
@@ -65,7 +65,7 @@ public class BaseItemDust extends Item{
 			temp = temp.replace("itemD", "d");
 			Utils.LOG_WARNING("Generating OreDict Name: "+temp);
 		}		
-		if (temp != null && temp != ""){
+		if (temp != null && !temp.equals("")){
 			oredictName = temp;
 			GT_OreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this));
 		}
@@ -175,7 +175,7 @@ public class BaseItemDust extends Item{
 		tempIngot = tempIngot.replace("itemDust", "ingot");
 		Utils.LOG_WARNING("Generating OreDict Name: "+tempIngot);
 		ItemStack[] outputStacks = {dustInfo.getDust(1)};
-		if (tempIngot != null && tempIngot != ""){
+		if (tempIngot != null && !tempIngot.equals("")){
 			tempInputStack = ItemUtils.getItemStackOfAmountFromOreDict(tempIngot, 1);
 			tempOutputStack = ItemUtils.getItemStackOfAmountFromOreDict(tempDust, 1);
 			ItemStack tempStackOutput2 = null;
@@ -216,7 +216,7 @@ public class BaseItemDust extends Item{
 			return;
 		}
 		temp = temp.replace("itemDust", "ingot");		
-		if (temp != null && temp != ""){
+		if (temp != null && !temp.equals("")){
 
 			if (dustInfo.requiresBlastFurnace()){
 				Utils.LOG_WARNING("Adding recipe for Hot "+materialName+" Ingots in a Blast furnace.");
@@ -230,7 +230,7 @@ public class BaseItemDust extends Item{
 			}
 			Utils.LOG_WARNING("Adding recipe for "+materialName+" Ingots in a furnace.");
 			ItemStack tempOutputStack = ItemUtils.getItemStackOfAmountFromOreDict(temp, 1);
-			Utils.LOG_WARNING("This will produce an ingot of "+tempOutputStack.getDisplayName() + " Debug: "+temp);
+			//Utils.LOG_WARNING("This will produce an ingot of "+tempOutputStack.getDisplayName() + " Debug: "+temp);
 			if (null != tempOutputStack){
 				if (mTier < 5 || !dustInfo.requiresBlastFurnace()){					
 					if (CORE.GT_Recipe.addSmeltingAndAlloySmeltingRecipe(ItemUtils.getSimpleStack(this), tempOutputStack)){
diff --git a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java
index a2b5bff7f4..3f6ff6e358 100644
--- a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java
+++ b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java
@@ -35,7 +35,7 @@ public class BaseItemIngot extends BaseItemComponent{
 			}
 			temp = temp.replace("itemIngot", "block");
 			Utils.LOG_WARNING("Generating OreDict Name: "+temp);
-			if (temp != null && temp != ""){
+			if (temp != null && !temp.equals("")){
 				tempOutput = ItemUtils.getItemStackOfAmountFromOreDict(temp, 1);
 				if (tempOutput != null){
 					GT_ModHandler.addCompressionRecipe(tempStack, tempOutput);
diff --git a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotOLD.java b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotOLD.java
index 20e72f2a64..15b1e48200 100644
--- a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotOLD.java
+++ b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotOLD.java
@@ -39,7 +39,7 @@ public class BaseItemIngotOLD extends Item{
 		else if (unlocalName.contains("itemHotIngot")){
 			temp = unlocalName.replace("itemHotIngot", "ingotHot");
 		}
-		if (temp != null && temp != ""){
+		if (temp != null && !temp.equals("")){
 			GT_OreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this));
 		}		
 		generateCompressorRecipe();
@@ -76,7 +76,7 @@ public class BaseItemIngotOLD extends Item{
 			}
 			temp = temp.replace("itemIngot", "block");
 			Utils.LOG_WARNING("Generating OreDict Name: "+temp);
-			if (temp != null && temp != ""){
+			if (temp != null && !temp.equals("")){
 				tempOutput = ItemUtils.getItemStackOfAmountFromOreDict(temp, 1);
 				if (tempOutput != null){
 					GT_ModHandler.addCompressionRecipe(tempStack, tempOutput);