MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[JavaRearranger] arrangement parse info refactoring

Browse Source
This commit is contained in:
Yaroslav Lepenkin
2014-06-17 19:15:35 +04:00
parent c78145020b
commit cdf4c5c176
2 changed files with 76 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/codeStyle/arrangement/FieldDependenciesManager.java
+56
View File
@@ -0,0 +1,56 @@
/*
* Copyright 2000-2014 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 com.intellij.psi.codeStyle.arrangement;
import com.intellij.psi.PsiField;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import java.util.List;
import java.util.Map;
import java.util.Set;
public class FieldDependenciesManager {
private final Map<PsiField, Set<PsiField>> myFieldDependencies;
private final Map<PsiField, ArrangementEntryDependencyInfo> myFieldInfosMap = ContainerUtil.newHashMap();
public FieldDependenciesManager(@NotNull Map<PsiField, Set<PsiField>> fieldDependencies, @NotNull Map<PsiField, JavaElementArrangementEntry> fields) {
myFieldDependencies = fieldDependencies;
for (PsiField field : fields.keySet()) {
JavaElementArrangementEntry entry = fields.get(field);
myFieldInfosMap.put(field, new ArrangementEntryDependencyInfo(entry));
}
}
@NotNull
public List<ArrangementEntryDependencyInfo> getRoots() {
List<ArrangementEntryDependencyInfo> list = ContainerUtil.newArrayList();
for (Map.Entry<PsiField, Set<PsiField>> entry : myFieldDependencies.entrySet()) {
ArrangementEntryDependencyInfo currentInfo = myFieldInfosMap.get(entry.getKey());
for (PsiField usedInInitialization : entry.getValue()) {
ArrangementEntryDependencyInfo fieldInfo = myFieldInfosMap.get(usedInInitialization);
if (fieldInfo != null)
currentInfo.addDependentEntryInfo(fieldInfo);
}
list.add(currentInfo);
}
return list;
}
}
java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaArrangementParseInfo.java
+20 -62
View File
@@ -27,8 +27,6 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.*;
import java.util.HashMap;
import java.util.HashSet;
/**
* @author Denis Zhdanov
@@ -36,28 +34,22 @@ import java.util.HashSet;
*/
public class JavaArrangementParseInfo {
@NotNull private final List<JavaElementArrangementEntry> myEntries = new ArrayList<JavaElementArrangementEntry>();
private final List<JavaElementArrangementEntry> myEntries = new ArrayList<JavaElementArrangementEntry>();
@NotNull private final Map<Pair<String/* property name */, String/* class name */>, JavaArrangementPropertyInfo> myProperties
= new HashMap<Pair<String, String>, JavaArrangementPropertyInfo>();
private final Map<Pair<String/* property name */, String/* class name */>, JavaArrangementPropertyInfo> myProperties = new HashMap<Pair<String, String>, JavaArrangementPropertyInfo>();
@NotNull private final List<ArrangementEntryDependencyInfo> myMethodDependencyRoots
= new ArrayList<ArrangementEntryDependencyInfo>();
private final List<ArrangementEntryDependencyInfo> myMethodDependencyRoots = new ArrayList<ArrangementEntryDependencyInfo>();
private final Map<PsiMethod /* anchor */, Set<PsiMethod /* dependencies */>> myMethodDependencies = new HashMap<PsiMethod, Set<PsiMethod>>();
@NotNull private final Map<PsiMethod /* anchor */, Set<PsiMethod /* dependencies */>> myMethodDependencies
= new HashMap<PsiMethod, Set<PsiMethod>>();
private final Map<PsiMethod, JavaElementArrangementEntry> myMethodEntriesMap = new HashMap<PsiMethod, JavaElementArrangementEntry>();
private final Map<PsiClass, List<Pair<PsiMethod/*overridden*/, PsiMethod/*overriding*/>>> myOverriddenMethods = new LinkedHashMap<PsiClass, List<Pair<PsiMethod, PsiMethod>>>();
@NotNull private final Map<PsiMethod, JavaElementArrangementEntry> myMethodEntriesMap =
new HashMap<PsiMethod, JavaElementArrangementEntry>();
@NotNull private final Map<PsiClass, List<Pair<PsiMethod/*overridden*/, PsiMethod/*overriding*/>>> myOverriddenMethods
= new LinkedHashMap<PsiClass, List<Pair<PsiMethod, PsiMethod>>>();
@NotNull private final Set<PsiMethod> myTmpMethodDependencyRoots = new LinkedHashSet<PsiMethod>();
@NotNull private final Set<PsiMethod> myDependentMethods = new HashSet<PsiMethod>();
private final Set<PsiMethod> myTmpMethodDependencyRoots = new LinkedHashSet<PsiMethod>();
private final Set<PsiMethod> myDependentMethods = new HashSet<PsiMethod>();
private boolean myRebuildMethodDependencies;
@NotNull private FieldDependenciesManager myFieldDependenciesManager = new FieldDependenciesManager();
private final HashMap<PsiField, JavaElementArrangementEntry> myFields = ContainerUtil.newLinkedHashMap();
private final Map<PsiField, Set<PsiField>> myFieldDependencies = ContainerUtil.newHashMap();
@NotNull
public List<JavaElementArrangementEntry> getEntries() {
@@ -96,8 +88,7 @@ public class JavaArrangementParseInfo {
@Nullable
private ArrangementEntryDependencyInfo buildMethodDependencyInfo(@NotNull final PsiMethod method,
@NotNull Map<PsiMethod, ArrangementEntryDependencyInfo> cache)
{
@NotNull Map<PsiMethod, ArrangementEntryDependencyInfo> cache) {
JavaElementArrangementEntry entry = myMethodEntriesMap.get(method);
if (entry == null) {
return null;
@@ -158,7 +149,7 @@ public class JavaArrangementParseInfo {
}
public void onFieldEntryCreated(@NotNull PsiField field, @NotNull JavaElementArrangementEntry entry) {
myFieldDependenciesManager.registerFieldAndEntry(field, entry);
myFields.put(field, entry);
}
public void onOverriddenMethod(@NotNull PsiMethod baseMethod, @NotNull PsiMethod overridingMethod) {
@@ -201,7 +192,7 @@ public class JavaArrangementParseInfo {
result.add(info);
}
}
return result;
}
@@ -226,49 +217,16 @@ public class JavaArrangementParseInfo {
}
public void registerFieldInitializationDependency(@NotNull PsiField fieldToInitialize, @NotNull PsiField usedInInitialization) {
myFieldDependenciesManager.registerInitializationDependency(fieldToInitialize, usedInInitialization);
Set<PsiField> fields = myFieldDependencies.get(fieldToInitialize);
if (fields == null) {
fields = ContainerUtil.newHashSet();
myFieldDependencies.put(fieldToInitialize, fields);
}
fields.add(usedInInitialization);
}
@NotNull
public List<ArrangementEntryDependencyInfo> getFieldDependencyRoots() {
return myFieldDependenciesManager.getRoots();
}
private static class FieldDependenciesManager {
private final Map<PsiField, Set<PsiField>> myFieldDependencies = ContainerUtil.newHashMap();
private final Map<PsiField, ArrangementEntryDependencyInfo> myFieldInfosMap = ContainerUtil.newHashMap();
public void registerFieldAndEntry(@NotNull PsiField field, @NotNull JavaElementArrangementEntry entry) {
myFieldInfosMap.put(field, new ArrangementEntryDependencyInfo(entry));
}
public void registerInitializationDependency(@NotNull PsiField fieldToInitialize, @NotNull PsiField usedInInitialization) {
Set<PsiField> fields = myFieldDependencies.get(fieldToInitialize);
if (fields == null) {
fields = new HashSet<PsiField>();
myFieldDependencies.put(fieldToInitialize, fields);
}
fields.add(usedInInitialization);
}
@NotNull
public List<ArrangementEntryDependencyInfo> getRoots() {
List<ArrangementEntryDependencyInfo> list = ContainerUtil.newArrayList();
for (Map.Entry<PsiField, Set<PsiField>> entry : myFieldDependencies.entrySet()) {
ArrangementEntryDependencyInfo currentInfo = myFieldInfosMap.get(entry.getKey());
for (PsiField usedInInitialization : entry.getValue()) {
ArrangementEntryDependencyInfo fieldInfo = myFieldInfosMap.get(usedInInitialization);
if (fieldInfo != null)
currentInfo.addDependentEntryInfo(fieldInfo);
}
list.add(currentInfo);
}
return list;
}
return new FieldDependenciesManager(myFieldDependencies, myFields).getRoots();
}
}