moparisthebest/fernflower
1
0
Fork 0
mirror of https://github.com/moparisthebest/fernflower synced 2024-08-13 17:03:46 -04:00
Code Issues Releases Wiki Activity

cleanup after review - use option for decompiler banner text

Browse Source
This commit is contained in:
Egor.Ushakov 2014-10-08 12:34:51 +04:00
parent 1e3d5276a8
commit 37422ead1c
6 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/org/jetbrains/java/decompiler/main/Fernflower.java
View File

@ -80,11 +80,12 @@ public class Fernflower implements IDecompiledData {
} }
@Override @Override
public TextBuffer getClassContent(StructClass cl) { public String getClassContent(StructClass cl) {
try { try {
TextBuffer buffer = new TextBuffer(ClassesProcessor.AVERAGE_CLASS_SIZE); TextBuffer buffer = new TextBuffer(ClassesProcessor.AVERAGE_CLASS_SIZE);
buffer.append(DecompilerContext.getProperty(IFernflowerPreferences.BANNER).toString());
classesProcessor.writeClass(cl, buffer); classesProcessor.writeClass(cl, buffer);
return buffer; return buffer.toString();
} }
catch (Throwable ex) { catch (Throwable ex) {
DecompilerContext.getLogger().writeMessage("Class " + cl.qualifiedName + " couldn't be fully decompiled.", ex); DecompilerContext.getLogger().writeMessage("Class " + cl.qualifiedName + " couldn't be fully decompiled.", ex);

5
src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
View File

@ -17,7 +17,6 @@ package org.jetbrains.java.decompiler.main.decompiler;
import org.jetbrains.java.decompiler.main.DecompilerContext; import org.jetbrains.java.decompiler.main.DecompilerContext;
import org.jetbrains.java.decompiler.main.Fernflower; import org.jetbrains.java.decompiler.main.Fernflower;
import org.jetbrains.java.decompiler.main.TextBuffer;
import org.jetbrains.java.decompiler.main.extern.IBytecodeProvider; import org.jetbrains.java.decompiler.main.extern.IBytecodeProvider;
import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger; import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
import org.jetbrains.java.decompiler.main.extern.IResultSaver; import org.jetbrains.java.decompiler.main.extern.IResultSaver;
@ -182,12 +181,12 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
} }
@Override @Override
public void saveClassFile(String path, String qualifiedName, String entryName, TextBuffer content) { public void saveClassFile(String path, String qualifiedName, String entryName, String content) {
File file = new File(getAbsolutePath(path), entryName); File file = new File(getAbsolutePath(path), entryName);
try { try {
Writer out = new OutputStreamWriter(new FileOutputStream(file), "UTF8"); Writer out = new OutputStreamWriter(new FileOutputStream(file), "UTF8");
try { try {
out.write(content.toString()); out.write(content);
} }
finally { finally {
out.close(); out.close();

4
src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java vendored
View File

@ -54,6 +54,8 @@ public interface IFernflowerPreferences {
String NEW_LINE_SEPARATOR = "nls"; String NEW_LINE_SEPARATOR = "nls";
String INDENT_STRING = "ind"; String INDENT_STRING = "ind";
String BANNER = "ban";
String LINE_SEPARATOR_WIN = "\r\n"; String LINE_SEPARATOR_WIN = "\r\n";
String LINE_SEPARATOR_LIN = "\n"; String LINE_SEPARATOR_LIN = "\n";
@ -83,6 +85,8 @@ public interface IFernflowerPreferences {
put(BYTECODE_SOURCE_MAPPING, "0"); put(BYTECODE_SOURCE_MAPPING, "0");
put(USE_DEBUG_LINE_NUMBERS, "0"); put(USE_DEBUG_LINE_NUMBERS, "0");
put(BANNER, "");
put(LOG_LEVEL, IFernflowerLogger.Severity.INFO.name()); put(LOG_LEVEL, IFernflowerLogger.Severity.INFO.name());
put(MAX_PROCESSING_METHOD, "0"); put(MAX_PROCESSING_METHOD, "0");
put(RENAME_ENTITIES, "0"); put(RENAME_ENTITIES, "0");

4
src/org/jetbrains/java/decompiler/main/extern/IResultSaver.java vendored
View File

@ -15,8 +15,6 @@
*/ */
package org.jetbrains.java.decompiler.main.extern; package org.jetbrains.java.decompiler.main.extern;
import org.jetbrains.java.decompiler.main.TextBuffer;
import java.util.jar.Manifest; import java.util.jar.Manifest;
public interface IResultSaver { public interface IResultSaver {
@ -24,7 +22,7 @@ public interface IResultSaver {
void copyFile(String source, String path, String entryName); void copyFile(String source, String path, String entryName);
void saveClassFile(String path, String qualifiedName, String entryName, TextBuffer content); void saveClassFile(String path, String qualifiedName, String entryName, String content);
void createArchive(String path, String archiveName, Manifest manifest); void createArchive(String path, String archiveName, Manifest manifest);

7
src/org/jetbrains/java/decompiler/struct/ContextUnit.java
View File

@ -15,7 +15,6 @@
*/ */
package org.jetbrains.java.decompiler.struct; package org.jetbrains.java.decompiler.struct;
import org.jetbrains.java.decompiler.main.TextBuffer;
import org.jetbrains.java.decompiler.main.extern.IResultSaver; import org.jetbrains.java.decompiler.main.extern.IResultSaver;
import org.jetbrains.java.decompiler.struct.lazy.LazyLoader; import org.jetbrains.java.decompiler.struct.lazy.LazyLoader;
import org.jetbrains.java.decompiler.struct.lazy.LazyLoader.Link; import org.jetbrains.java.decompiler.struct.lazy.LazyLoader.Link;
@ -111,7 +110,7 @@ public class ContextUnit {
StructClass cl = classes.get(i); StructClass cl = classes.get(i);
String entryName = decompiledData.getClassEntryName(cl, classEntries.get(i)); String entryName = decompiledData.getClassEntryName(cl, classEntries.get(i));
if (entryName != null) { if (entryName != null) {
TextBuffer content = decompiledData.getClassContent(cl); String content = decompiledData.getClassContent(cl);
if (content != null) { if (content != null) {
resultSaver.saveClassFile(filename, cl.qualifiedName, entryName, content); resultSaver.saveClassFile(filename, cl.qualifiedName, entryName, content);
} }
@ -143,8 +142,8 @@ public class ContextUnit {
StructClass cl = classes.get(i); StructClass cl = classes.get(i);
String entryName = decompiledData.getClassEntryName(cl, classEntries.get(i)); String entryName = decompiledData.getClassEntryName(cl, classEntries.get(i));
if (entryName != null) { if (entryName != null) {
TextBuffer content = decompiledData.getClassContent(cl); String content = decompiledData.getClassContent(cl);
resultSaver.saveClassEntry(archivePath, filename, cl.qualifiedName, entryName, content.toString()); resultSaver.saveClassEntry(archivePath, filename, cl.qualifiedName, entryName, content);
} }
} }

4
src/org/jetbrains/java/decompiler/struct/IDecompiledData.java
View File

@ -15,11 +15,9 @@
*/ */
package org.jetbrains.java.decompiler.struct; package org.jetbrains.java.decompiler.struct;
import org.jetbrains.java.decompiler.main.TextBuffer;
public interface IDecompiledData { public interface IDecompiledData {
String getClassEntryName(StructClass cl, String entryname); String getClassEntryName(StructClass cl, String entryname);
TextBuffer getClassContent(StructClass cl); String getClassContent(StructClass cl);
} }