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

Fixed 'IDEA-135314: Inner classes constructors calls decompiled incorrectly'

Browse Source
This commit is contained in:
Stiver
2015-03-01 12:13:04 +01:00
parent c082dfba98
commit c3b4a23fdb
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
View File

@@ -89,9 +89,13 @@ public class ImportCollector {
StructContext context = DecompilerContext.getStructContext(); StructContext context = DecompilerContext.getStructContext();
// check for another class which could 'shadow' this one. Two cases:
// 1) class with the same short name in the current package
// 2) class with the same short name in the default package
boolean existsDefaultClass = (context.getClass(currentPackageSlash + nshort) != null boolean existsDefaultClass = (context.getClass(currentPackageSlash + nshort) != null
&& !npackage.equals(currentPackagePoint)) // current package && !npackage.equals(currentPackagePoint)) // current package
|| (context.getClass(nshort) != null); // default package || (context.getClass(nshort) != null
&& !currentPackagePoint.isEmpty()); // default package
if (existsDefaultClass || if (existsDefaultClass ||
(mapSimpleNames.containsKey(nshort) && !npackage.equals(mapSimpleNames.get(nshort)))) { (mapSimpleNames.containsKey(nshort) && !npackage.equals(mapSimpleNames.get(nshort)))) {