cleanup: remove redundant casts
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
// 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-2018 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.rels;
|
package org.jetbrains.java.decompiler.main.rels;
|
||||||
|
|
||||||
import org.jetbrains.java.decompiler.code.CodeConstants;
|
import org.jetbrains.java.decompiler.code.CodeConstants;
|
||||||
@@ -38,7 +38,7 @@ public class LambdaProcessor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
StructBootstrapMethodsAttribute bootstrap =
|
StructBootstrapMethodsAttribute bootstrap =
|
||||||
(StructBootstrapMethodsAttribute)cl.getAttribute(StructGeneralAttribute.ATTRIBUTE_BOOTSTRAP_METHODS);
|
cl.getAttribute(StructGeneralAttribute.ATTRIBUTE_BOOTSTRAP_METHODS);
|
||||||
if (bootstrap == null || bootstrap.getMethodsNumber() == 0) {
|
if (bootstrap == null || bootstrap.getMethodsNumber() == 0) {
|
||||||
return; // no bootstrap constants in pool
|
return; // no bootstrap constants in pool
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -269,8 +269,7 @@ public class ExprProcessor implements CodeConstants {
|
|||||||
public void processBlock(BasicBlockStatement stat, PrimitiveExprsList data, StructClass cl) {
|
public void processBlock(BasicBlockStatement stat, PrimitiveExprsList data, StructClass cl) {
|
||||||
|
|
||||||
ConstantPool pool = cl.getPool();
|
ConstantPool pool = cl.getPool();
|
||||||
StructBootstrapMethodsAttribute bootstrap =
|
StructBootstrapMethodsAttribute bootstrap = cl.getAttribute(StructGeneralAttribute.ATTRIBUTE_BOOTSTRAP_METHODS);
|
||||||
(StructBootstrapMethodsAttribute)cl.getAttribute(StructGeneralAttribute.ATTRIBUTE_BOOTSTRAP_METHODS);
|
|
||||||
|
|
||||||
BasicBlock block = stat.getBlock();
|
BasicBlock block = stat.getBlock();
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
// 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-2018 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;
|
||||||
@@ -73,7 +73,7 @@ public class IdeaNotNullHelper {
|
|||||||
|
|
||||||
// parameter annotations
|
// parameter annotations
|
||||||
StructAnnotationParameterAttribute param_annotations =
|
StructAnnotationParameterAttribute param_annotations =
|
||||||
(StructAnnotationParameterAttribute)mt.getAttribute(StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS);
|
mt.getAttribute(StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS);
|
||||||
if (param_annotations != null) {
|
if (param_annotations != null) {
|
||||||
|
|
||||||
List<List<AnnotationExprent>> param_annotations_lists = param_annotations.getParamAnnotations();
|
List<List<AnnotationExprent>> param_annotations_lists = param_annotations.getParamAnnotations();
|
||||||
@@ -155,8 +155,7 @@ public class IdeaNotNullHelper {
|
|||||||
boolean is_notnull_check = false;
|
boolean is_notnull_check = false;
|
||||||
|
|
||||||
// method annotation, refers to the return value
|
// method annotation, refers to the return value
|
||||||
StructAnnotationAttribute attr =
|
StructAnnotationAttribute attr = mt.getAttribute(StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_ANNOTATIONS);
|
||||||
(StructAnnotationAttribute)mt.getAttribute(StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_ANNOTATIONS);
|
|
||||||
if (attr != null) {
|
if (attr != null) {
|
||||||
List<AnnotationExprent> annotations = attr.getAnnotations();
|
List<AnnotationExprent> annotations = attr.getAnnotations();
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,4 @@
|
|||||||
/*
|
// Copyright 2000-2018 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.exps;
|
package org.jetbrains.java.decompiler.modules.decompiler.exps;
|
||||||
|
|
||||||
import org.jetbrains.java.decompiler.code.CodeConstants;
|
import org.jetbrains.java.decompiler.code.CodeConstants;
|
||||||
@@ -143,8 +141,8 @@ public class VarExprent extends Exprent {
|
|||||||
if (originalIndex != null) {
|
if (originalIndex != null) {
|
||||||
// first try from signature
|
// first try from signature
|
||||||
if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
|
if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
|
||||||
StructLocalVariableTypeTableAttribute attr = (StructLocalVariableTypeTableAttribute)method.methodStruct
|
StructLocalVariableTypeTableAttribute attr =
|
||||||
.getAttribute(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE);
|
method.methodStruct.getAttribute(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE);
|
||||||
if (attr != null) {
|
if (attr != null) {
|
||||||
String signature = attr.getSignature(originalIndex, visibleOffset);
|
String signature = attr.getSignature(originalIndex, visibleOffset);
|
||||||
if (signature != null) {
|
if (signature != null) {
|
||||||
|
|||||||
@@ -380,7 +380,7 @@ public class StructMethod extends StructMember {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public StructLocalVariableTableAttribute getLocalVariableAttr() {
|
public StructLocalVariableTableAttribute getLocalVariableAttr() {
|
||||||
return (StructLocalVariableTableAttribute)getAttribute(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE);
|
return getAttribute(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user