Merge pull request #369 from ThrawnCA/github-367-fix-build

fix build
mebigfatguy · Sep 7, 2019 · 72bd492 · 72bd492
2 parents 62cb975 + d2706b0
commit 72bd492
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/com/mebigfatguy/fbcontrib/detect/ImmatureClass.java b/src/main/java/com/mebigfatguy/fbcontrib/detect/ImmatureClass.java
@@ -143,10 +143,10 @@ public void visitClassContext(ClassContext classContext) {
 											&& !fieldSig.startsWith("Ljava/util/")) {
 										heStatus = HEStatus.NOT_NEEDED;
 									} else {
-										heStatus = (fieldSig.equals("Ljava/lang/Double;") || fieldSig.equals("Ljava/lang/Float;")) ? HEStatus.NOT_NEEDED : HEStatus.NEEDED;
+										heStatus = ("Ljava/lang/Double;".equals(fieldSig) || "Ljava/lang/Float;".equals(fieldSig)) ? HEStatus.NOT_NEEDED : HEStatus.NEEDED;
 									}
 								} else if (!fieldSig.startsWith(Values.SIG_ARRAY_PREFIX)) {
-									heStatus = fieldSig.equals("D") || fieldSig.equals("F") ? HEStatus.NOT_NEEDED : HEStatus.NEEDED;
+									heStatus = SignatureUtils.classToSignature("double").equals(fieldSig) || SignatureUtils.classToSignature("float").equals(fieldSig) ? HEStatus.NOT_NEEDED : HEStatus.NEEDED;
 								}
 							}
 						} else {
@@ -177,12 +177,12 @@ public void visitClassContext(ClassContext classContext) {
 
 	@Override
 	public void visitField(Field f) {
-		
+
 		if ("var".equals(f.getName())) {
 			bugReporter.reportBug(new BugInstance(this, BugType.IMC_IMMATURE_CLASS_VAR_NAME.name(), NORMAL_PRIORITY)
 					.addClass(this).addField(this));
 		}
-		
+
 		if (!f.isSynthetic() && (f.getName().indexOf(Values.SYNTHETIC_MEMBER_CHAR) < 0)) {
 			switch (fieldStatus) {
 			case NONE:

diff --git a/src/main/java/com/mebigfatguy/fbcontrib/detect/OverlyConcreteParameter.java b/src/main/java/com/mebigfatguy/fbcontrib/detect/OverlyConcreteParameter.java
@@ -248,7 +248,7 @@ public void sawOpcode(final int seen) {
         	} else if (getPC() == ternaryTarget && stack.getStackDepth() > 0) {
         		ternary2Value = stack.getStackItem(0);
         	}
-        	
+
             stack.precomputation(this);
 
             if (OpcodeUtils.isInvoke(seen)) {
@@ -329,7 +329,7 @@ public void sawOpcode(final int seen) {
                 } else {
                     parameterDefiners.clear();
                 }
-            } else if (((seen == GOTO) || (seen == GOTO_W)) && getBranchOffset() > 0) {
+            } else if (((seen == Const.GOTO) || (seen == Const.GOTO_W)) && getBranchOffset() > 0) {
             	if (stack.getStackDepth() > 0) {
             		ternary1Value = stack.getStackItem(0);
             		ternaryTarget = getBranchTarget();
@@ -352,7 +352,7 @@ private void removeParmDefiner(OpcodeStack.Item itm) {
     	if (itm == null) {
     		return;
     	}
-    	
+
     	int reg = itm.getRegisterNumber();
         int parm = reg;
         if (!methodIsStatic) {
@@ -363,7 +363,7 @@ private void removeParmDefiner(OpcodeStack.Item itm) {
             parameterDefiners.remove(Integer.valueOf(reg));
         }
     }
-    
+
     /**
      * determines whether the method is a baked in special method of the jdk
      *