Cleanup (formatting)

src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java

@@ -849,26 +849,24 @@ public class ExprProcessor implements CodeConstants {
     return buf;
   }
 
-  public static ConstExprent getDefaultArrayValue(VarType arrtype) {
+  public static ConstExprent getDefaultArrayValue(VarType arrType) {
-
+    ConstExprent defaultVal;
-    ConstExprent defaultval;
+    if (arrType.type == CodeConstants.TYPE_OBJECT || arrType.arrayDim > 0) {
-    if (arrtype.type == CodeConstants.TYPE_OBJECT || arrtype.arrayDim > 0) {
+      defaultVal = new ConstExprent(VarType.VARTYPE_NULL, null, null);
-      defaultval = new ConstExprent(VarType.VARTYPE_NULL, null, null);
     }
-    else if (arrtype.type == CodeConstants.TYPE_FLOAT) {
+    else if (arrType.type == CodeConstants.TYPE_FLOAT) {
-      defaultval = new ConstExprent(VarType.VARTYPE_FLOAT, new Float(0), null);
+      defaultVal = new ConstExprent(VarType.VARTYPE_FLOAT, new Float(0), null);
     }
-    else if (arrtype.type == CodeConstants.TYPE_LONG) {
+    else if (arrType.type == CodeConstants.TYPE_LONG) {
-      defaultval = new ConstExprent(VarType.VARTYPE_LONG, new Long(0), null);
+      defaultVal = new ConstExprent(VarType.VARTYPE_LONG, new Long(0), null);
     }
-    else if (arrtype.type == CodeConstants.TYPE_DOUBLE) {
+    else if (arrType.type == CodeConstants.TYPE_DOUBLE) {
-      defaultval = new ConstExprent(VarType.VARTYPE_DOUBLE, new Double(0), null);
+      defaultVal = new ConstExprent(VarType.VARTYPE_DOUBLE, new Double(0), null);
     }
     else { // integer types
-      defaultval = new ConstExprent(0, true, null);
+      defaultVal = new ConstExprent(0, true, null);
     }
-
+    return defaultVal;
-    return defaultval;
   }
 
   public static boolean getCastedExprent(Exprent exprent,
@@ -887,35 +885,30 @@ public class ExprProcessor implements CodeConstants {
                                          boolean castNull,
                                          boolean castAlways,
                                          BytecodeMappingTracer tracer) {
-
     VarType rightType = exprent.getExprType();
 
-    TextBuffer res = exprent.toJava(indent, tracer);
-
     boolean cast =
       castAlways ||
       (!leftType.isSuperset(rightType) && (rightType.equals(VarType.VARTYPE_OBJECT) || leftType.type != CodeConstants.TYPE_OBJECT)) ||
       (castNull && rightType.type == CodeConstants.TYPE_NULL && !UNDEFINED_TYPE_STRING.equals(getTypeName(leftType))) ||
       (isIntConstant(exprent) && VarType.VARTYPE_INT.isStrictSuperset(leftType));
 
-    if (cast) {
+    boolean quote = cast && exprent.getPrecedence() >= FunctionExprent.getPrecedence(FunctionExprent.FUNCTION_CAST);
-      if (exprent.getPrecedence() >= FunctionExprent.getPrecedence(FunctionExprent.FUNCTION_CAST)) {
-        res.enclose("(", ")");
-      }
 
-      res.prepend("(" + getCastTypeName(leftType) + ")");
+    if (cast) buffer.append('(').append(getCastTypeName(leftType)).append(')');
-    }
+
+    if (quote) buffer.append('(');
 
-    buffer.append(res);
+    buffer.append(exprent.toJava(indent, tracer));
+
+    if (quote) buffer.append(')');
 
     return cast;
   }
 
   private static boolean isIntConstant(Exprent exprent) {
-
     if (exprent.type == Exprent.EXPRENT_CONST) {
-      ConstExprent cexpr = (ConstExprent)exprent;
+      switch (((ConstExprent)exprent).getConstType().type) {
-      switch (cexpr.getConstType().type) {
         case CodeConstants.TYPE_BYTE:
         case CodeConstants.TYPE_BYTECHAR:
         case CodeConstants.TYPE_SHORT:

src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@ import java.util.List;
 import java.util.Set;
 
 public class ArrayExprent extends Exprent {
-
   private Exprent array;
   private Exprent index;
   private final VarType hardType;
@@ -91,7 +90,7 @@ public class ArrayExprent extends Exprent {
 
     tracer.addMapping(bytecode);
 
-    return res.append("[").append(index.toJava(indent, tracer)).append("]");
+    return res.append('[').append(index.toJava(indent, tracer)).append(']');
   }
 
   @Override