Cleanup (formatting; typos)

master
Roman Shevchenko 7 years ago
parent 149d7ee681
commit 93429bc8a5
  1. 12
      src/org/jetbrains/java/decompiler/main/ClassWriter.java
  2. 5
      src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java

@ -1,4 +1,6 @@
// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. /*
* Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/
package org.jetbrains.java.decompiler.main; package org.jetbrains.java.decompiler.main;
import org.jetbrains.java.decompiler.code.CodeConstants; import org.jetbrains.java.decompiler.code.CodeConstants;
@ -422,9 +424,9 @@ public class ClassWriter {
} }
if (initializer != null) { if (initializer != null) {
if (isEnum && initializer.type == Exprent.EXPRENT_NEW) { if (isEnum && initializer.type == Exprent.EXPRENT_NEW) {
NewExprent nexpr = (NewExprent)initializer; NewExprent expr = (NewExprent)initializer;
nexpr.setEnumConst(true); expr.setEnumConst(true);
buffer.append(nexpr.toJava(indent, tracer)); buffer.append(expr.toJava(indent, tracer));
} }
else { else {
buffer.append(" = "); buffer.append(" = ");
@ -433,7 +435,7 @@ public class ClassWriter {
((ConstExprent) initializer).adjustConstType(fieldType); ((ConstExprent) initializer).adjustConstType(fieldType);
} }
// FIXME: special case field initializer. Can map to more than one method (constructor) and bytecode intruction. // FIXME: special case field initializer. Can map to more than one method (constructor) and bytecode instruction
buffer.append(initializer.toJava(indent, tracer)); buffer.append(initializer.toJava(indent, tracer));
} }
} }

@ -1,4 +1,6 @@
// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. /*
* Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
*/
package org.jetbrains.java.decompiler.modules.decompiler; package org.jetbrains.java.decompiler.modules.decompiler;
import org.jetbrains.java.decompiler.code.CodeConstants; import org.jetbrains.java.decompiler.code.CodeConstants;
@ -675,7 +677,6 @@ public class ExprProcessor implements CodeConstants {
} }
public static String getTypeName(VarType type, boolean getShort) { public static String getTypeName(VarType type, boolean getShort) {
int tp = type.type; int tp = type.type;
if (tp <= CodeConstants.TYPE_BOOLEAN) { if (tp <= CodeConstants.TYPE_BOOLEAN) {
return typeNames[tp]; return typeNames[tp];

Loading…
Cancel
Save