ra/fernflower
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

decompiler: cleanup - marked const fields final

Browse Source
This commit is contained in:
Egor.Ushakov
2015-03-26 15:26:52 +03:00
parent 9ec79b5701
commit ca7e2dfa1c
58 changed files with 220 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/jetbrains/java/decompiler/struct/attr/StructBootstrapMethodsAttribute.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2015 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.
@@ -26,8 +26,8 @@ import java.util.List;
public class StructBootstrapMethodsAttribute extends StructGeneralAttribute {
private List<LinkConstant> methodRefs = new ArrayList<LinkConstant>();
private List<List<PooledConstant>> methodArguments = new ArrayList<List<PooledConstant>>();
private final List<LinkConstant> methodRefs = new ArrayList<LinkConstant>();
private final List<List<PooledConstant>> methodArguments = new ArrayList<List<PooledConstant>>();
@Override
public void initContent(ConstantPool pool) throws IOException {

4
src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2015 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.
@@ -35,7 +35,7 @@ public class ConstantPool implements NewClassNameBuilder {
public static final int METHOD = 2;
private List<PooledConstant> pool = new ArrayList<PooledConstant>();
private PoolInterceptor interceptor;
private final PoolInterceptor interceptor;
public ConstantPool(DataInputStream in) throws IOException {

33
src/org/jetbrains/java/decompiler/struct/match/MatchEngine.java
View File

@@ -1,3 +1,18 @@
/*
* Copyright 2000-2015 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.java.decompiler.struct.match;
import java.util.ArrayList;
@@ -21,16 +36,16 @@ public class MatchEngine {
private MatchNode rootNode = null;
private Map<String, Object> variables = new HashMap<String, Object>();
private final Map<String, Object> variables = new HashMap<String, Object>();
private static Map<String, MatchProperties> stat_properties = new HashMap<String, MatchProperties>();
private static Map<String, MatchProperties> expr_properties = new HashMap<String, MatchProperties>();
private static Map<String, Integer> stat_type = new HashMap<String, Integer>();
private static Map<String, Integer> expr_type = new HashMap<String, Integer>();
private static Map<String, Integer> expr_func_type = new HashMap<String, Integer>();
private static Map<String, Integer> expr_exit_type = new HashMap<String, Integer>();
private static Map<String, Integer> stat_if_type = new HashMap<String, Integer>();
private static Map<String, VarType> expr_const_type = new HashMap<String, VarType>();
private static final Map<String, MatchProperties> stat_properties = new HashMap<String, MatchProperties>();
private static final Map<String, MatchProperties> expr_properties = new HashMap<String, MatchProperties>();
private static final Map<String, Integer> stat_type = new HashMap<String, Integer>();
private static final Map<String, Integer> expr_type = new HashMap<String, Integer>();
private static final Map<String, Integer> expr_func_type = new HashMap<String, Integer>();
private static final Map<String, Integer> expr_exit_type = new HashMap<String, Integer>();
private static final Map<String, Integer> stat_if_type = new HashMap<String, Integer>();
private static final Map<String, VarType> expr_const_type = new HashMap<String, VarType>();
static {
stat_properties.put("type", MatchProperties.STATEMENT_TYPE);

21
src/org/jetbrains/java/decompiler/struct/match/MatchNode.java
View File

@@ -1,3 +1,18 @@
/*
* Copyright 2000-2015 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.java.decompiler.struct.match;
import java.util.ArrayList;
@@ -31,11 +46,11 @@ public class MatchNode {
public static final int MATCHNODE_STATEMENT = 0;
public static final int MATCHNODE_EXPRENT = 1;
private int type;
private final int type;
private Map<MatchProperties, RuleValue> rules = new HashMap<MatchProperties, RuleValue>();
private final Map<MatchProperties, RuleValue> rules = new HashMap<MatchProperties, RuleValue>();
private List<MatchNode> children = new ArrayList<MatchNode>();
private final List<MatchNode> children = new ArrayList<MatchNode>();
public MatchNode(int type) {