diff options
author | Roman Shevchenko <roman.shevchenko@jetbrains.com> | 2014-09-05 13:12:40 +0400 |
---|---|---|
committer | Roman Shevchenko <roman.shevchenko@jetbrains.com> | 2014-09-07 14:35:39 +0400 |
commit | ff382a6fdfec77d9b9cb3165eb7eb2989abb604f (patch) | |
tree | ce347d64ee9dd061d7bb3cd7a530650ccb6448d3 /src/org/jetbrains/java/decompiler/struct/lazy | |
parent | 4e79d160ca382125d76bab3f1d18414d6308d614 (diff) | |
download | fernflower-ff382a6fdfec77d9b9cb3165eb7eb2989abb604f.tar fernflower-ff382a6fdfec77d9b9cb3165eb7eb2989abb604f.tar.gz fernflower-ff382a6fdfec77d9b9cb3165eb7eb2989abb604f.tar.lz fernflower-ff382a6fdfec77d9b9cb3165eb7eb2989abb604f.tar.xz fernflower-ff382a6fdfec77d9b9cb3165eb7eb2989abb604f.zip |
java-decompiler: fixes and cleanups
- console decompiler: resource closing, lookup instead of scan, error reporting
- logger interface reworked
- saver interface renamed
- bytecode provider returns byte array (to reduce stream leakage)
- extra level of context unit avoided
- unneeded exceptions, dead code, formatting
Diffstat (limited to 'src/org/jetbrains/java/decompiler/struct/lazy')
-rw-r--r-- | src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java b/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java index f610900..70254d8 100644 --- a/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java +++ b/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java @@ -22,14 +22,13 @@ import org.jetbrains.java.decompiler.struct.consts.ConstantPool; import org.jetbrains.java.decompiler.util.DataInputFullStream; import java.io.IOException; -import java.io.InputStream; import java.util.HashMap; import java.util.Map; public class LazyLoader { - private Map<String, Link> mapClassLinks = new HashMap<String, Link>(); - private IBytecodeProvider provider; + private final Map<String, Link> mapClassLinks = new HashMap<String, Link>(); + private final IBytecodeProvider provider; public LazyLoader(IBytecodeProvider provider) { this.provider = provider; @@ -138,10 +137,9 @@ public class LazyLoader { } } - @SuppressWarnings("IOResourceOpenedButNotSafelyClosed") public DataInputFullStream getClassStream(String externalPath, String internalPath) throws IOException { - InputStream stream = provider.getBytecodeStream(externalPath, internalPath); - return stream == null ? null : new DataInputFullStream(stream); + byte[] bytes = provider.getBytecode(externalPath, internalPath); + return new DataInputFullStream(bytes); } public DataInputFullStream getClassStream(String qualifiedClassName) throws IOException { |