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

less parseMembers() invocations

Browse Source
This commit is contained in:
Eugene Zhuravlev
2011-04-15 15:23:27 +02:00
parent 171a496759
commit 5a1edc83df
2 changed files with 21 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/classParsing/ClassFileReader.java
+20 -36
View File
@@ -28,7 +28,6 @@ import com.intellij.util.ArrayUtil;
import com.intellij.util.cls.BytePointer;
import com.intellij.util.cls.ClsFormatException;
import com.intellij.util.cls.ClsUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -54,7 +53,8 @@ public class ClassFileReader {
private final SymbolTable mySymbolTable;
private AnnotationConstantValue[] myRuntimeVisibleAnnotations;
private AnnotationConstantValue[] myRuntimeInvisibleAnnotations;
@NonNls private static final String CONSTRUCTOR_NAME = "<init>";
private static final String CONSTRUCTOR_NAME = "<init>";
private boolean myParsingDone;
public ClassFileReader(@NotNull File file, SymbolTable symbolTable, @Nullable final byte[] fileContent) {
mySymbolTable = symbolTable;
@@ -72,20 +72,19 @@ public class ClassFileReader {
}
public MethodInfo[] getMethods() throws ClsFormatException{
if (myMethods == null) {
parseMembers();
}
parseMembers();
return myMethods.toArray(new MethodInfo[myMethods.size()]);
}
public FieldInfo[] getFields() throws ClsFormatException{
if (myFields == null) {
parseMembers();
}
parseMembers();
return myFields.toArray(new FieldInfo[myFields.size()]);
}
private void parseMembers() throws ClsFormatException {
if (myParsingDone) {
return;
}
initConstantPool();
myMethods = new ArrayList<MethodInfo>();
myFields = new ArrayList<FieldInfo>();
@@ -121,6 +120,7 @@ public class ClassFileReader {
myGenericSignature = attributeTable.genericSignature;
myRuntimeVisibleAnnotations = attributeTable.runtimeVisibleAnnotations;
myRuntimeInvisibleAnnotations = attributeTable.runtimeInvisibleAnnotations;
myParsingDone = true;
}
private String getSymbol(final int id) throws ClsFormatException {
@@ -253,43 +253,27 @@ public class ClassFileReader {
public String getSourceFileName() throws ClsFormatException {
if (mySourceFileName == null) {
parseMembers();
if (mySourceFileName == null) {
mySourceFileName = "";
}
}
return mySourceFileName;
parseMembers();
final String fName = mySourceFileName;
return fName != null? fName : "";
}
public String getGenericSignature() throws ClsFormatException {
if (myGenericSignature == null) {
parseMembers();
if (myGenericSignature == null) {
myGenericSignature = "";
}
}
return myGenericSignature.length() == 0 ? null : myGenericSignature;
parseMembers();
final String genericSignature = myGenericSignature;
return genericSignature != null && !genericSignature.isEmpty() ? genericSignature : null;
}
public AnnotationConstantValue[] getRuntimeVisibleAnnotations() throws ClsFormatException {
if (myRuntimeVisibleAnnotations == null) {
parseMembers();
if (myRuntimeVisibleAnnotations == null) {
myRuntimeVisibleAnnotations = AnnotationConstantValue.EMPTY_ARRAY;
}
}
return myRuntimeVisibleAnnotations;
parseMembers();
final AnnotationConstantValue[] annotations = myRuntimeVisibleAnnotations;
return annotations != null? annotations : AnnotationConstantValue.EMPTY_ARRAY;
}
public AnnotationConstantValue[] getRuntimeInvisibleAnnotations() throws ClsFormatException {
if (myRuntimeInvisibleAnnotations == null) {
parseMembers();
if (myRuntimeInvisibleAnnotations == null) {
myRuntimeInvisibleAnnotations = AnnotationConstantValue.EMPTY_ARRAY;
}
}
return myRuntimeInvisibleAnnotations;
parseMembers();
final AnnotationConstantValue[] annotations = myRuntimeInvisibleAnnotations;
return annotations != null? annotations : AnnotationConstantValue.EMPTY_ARRAY;
}
private boolean isInterface(){
java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
+1 -1
View File
@@ -190,7 +190,7 @@ public class CompileDriver {
}
scope = addAdditionalRoots(scope, ALL_EXCEPT_SOURCE_PROCESSING);
final CompilerTask task = new CompilerTask(myProject, true, "", true);
final CompilerTask task = new CompilerTask(myProject, true, "Classes up-to-date check", true);
final CompileContextImpl compileContext = new CompileContextImpl(myProject, task, scope, createDependencyCache(), true, false);
checkCachesVersion(compileContext, ((PersistentFS)ManagingFS.getInstance()).getCreationTimestamp());