From 1a4e48d11d50b1c9367568ed60f6a43a469d4ace Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sun, 31 Aug 2014 12:57:31 +0400 Subject: [PATCH] java-decompiler: post-import cleanup (obsolete copyright option dropped) --- .../java/decompiler/main/ClassesProcessor.java | 13 ------------- .../java/decompiler/main/DecompilerContext.java | 1 - .../main/extern/IFernflowerPreferences.java | 1 - 3 files changed, 15 deletions(-) diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java index 9230c68..f4993f0 100644 --- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java +++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java @@ -37,7 +37,6 @@ import org.jetbrains.java.decompiler.util.InterpreterUtil; import java.io.BufferedWriter; import java.io.IOException; import java.io.StringWriter; -import java.text.SimpleDateFormat; import java.util.*; import java.util.Map.Entry; @@ -268,18 +267,6 @@ public class ClassesProcessor { StringWriter strwriter = new StringWriter(); clwriter.classToJava(root, new BufferedWriter(strwriter), 0); - if (DecompilerContext.getOption(IFernflowerPreferences.OUTPUT_COPYRIGHT_COMMENT)) { - outwriter.write("// Decompiled by: Fernflower " + Fernflower.version); - outwriter.write(DecompilerContext.getNewLineSeparator()); - outwriter.write("// Date: " + new SimpleDateFormat("dd.MM.yyyy HH:mm:ss").format(new Date())); - outwriter.write(DecompilerContext.getNewLineSeparator()); - outwriter.write("// Copyright: 2008-2010, Stiver"); - outwriter.write(DecompilerContext.getNewLineSeparator()); - outwriter.write("// Home page: http://www.reversed-java.com"); - outwriter.write(DecompilerContext.getNewLineSeparator()); - outwriter.write(DecompilerContext.getNewLineSeparator()); - } - int index = cl.qualifiedName.lastIndexOf("/"); if (index >= 0) { String packageName = cl.qualifiedName.substring(0, index).replace('/', '.'); diff --git a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java index cb4bbc8..f9eb27f 100644 --- a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java +++ b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java @@ -72,7 +72,6 @@ public class DecompilerContext { mapDefault.put(IFernflowerPreferences.HIDE_EMPTY_SUPER, "1"); mapDefault.put(IFernflowerPreferences.HIDE_DEFAULT_CONSTRUCTOR, "1"); mapDefault.put(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES, "0"); - mapDefault.put(IFernflowerPreferences.OUTPUT_COPYRIGHT_COMMENT, "0"); mapDefault.put(IFernflowerPreferences.NO_EXCEPTIONS_RETURN, "1"); mapDefault.put(IFernflowerPreferences.DECOMPILE_ENUM, "1"); mapDefault.put(IFernflowerPreferences.FINALLY_DEINLINE, "1"); diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java index 867bff2..72283f7 100644 --- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java +++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java @@ -25,7 +25,6 @@ public interface IFernflowerPreferences { String HIDE_EMPTY_SUPER = "hes"; String HIDE_DEFAULT_CONSTRUCTOR = "hdc"; String DECOMPILE_GENERIC_SIGNATURES = "dgs"; - String OUTPUT_COPYRIGHT_COMMENT = "occ"; String NO_EXCEPTIONS_RETURN = "ner"; String DECOMPILE_ENUM = "den"; String REMOVE_GETCLASS_NEW = "rgn";