4 files changed, 30 insertions, 41 deletions
diff --git a/src/org/jetbrains/java/decompiler/main/extern/IBytecodeProvider.java b/src/org/jetbrains/java/decompiler/main/extern/IBytecodeProvider.java
index 8fe0b31..adf3270 100644
--- a/src/org/jetbrains/java/decompiler/main/extern/IBytecodeProvider.java
+++ b/src/org/jetbrains/java/decompiler/main/extern/IBytecodeProvider.java
@@ -15,9 +15,8 @@
  */
 package org.jetbrains.java.decompiler.main.extern;
 
-import java.io.InputStream;
+import java.io.IOException;
 
 public interface IBytecodeProvider {
-
-  InputStream getBytecodeStream(String externPath, String internPath);
+  byte[] getBytecode(String externalPath, String internalPath) throws IOException;
 }
diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerLogger.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerLogger.java
index d9c8f74..65b2c6d 100644
--- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerLogger.java
+++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerLogger.java
@@ -15,43 +15,35 @@
  */
 package org.jetbrains.java.decompiler.main.extern;
 
-import java.util.HashMap;
+public abstract class IFernflowerLogger {
 
-public interface IFernflowerLogger {
+  public enum Severity {
+    TRACE, INFO, WARN, ERROR
+  }
 
-  int TRACE = 1;
-  int INFO = 2;
-  int WARNING = 3;
-  int ERROR = 4;
-  int IMMEDIATE = 5;
+  private Severity severity = Severity.INFO;
 
-  HashMap<String, Integer> mapLogLevel = new HashMap<String, Integer>() {{
-    put("TRACE", 1);
-    put("INFO", 2);
-    put("WARN", 3);
-    put("ERROR", 4);
-    put("IMME", 5);
-  }};
+  public boolean accepts(Severity severity) {
+    return severity.ordinal() >= this.severity.ordinal();
+  }
 
-  String[] names = new String[]{""/*DUMMY ENTRY*/, "TRACE", "INFO", "WARNING", "ERROR", ""/*IMMEDIATE*/};
+  public void setSeverity(Severity severity) {
+    this.severity = severity;
+  }
 
-  void writeMessage(String message, int severity);
+  public abstract void writeMessage(String message, Severity severity);
 
-  void writeMessage(String message, Throwable t);
+  public abstract void writeMessage(String message, Throwable t);
 
-  void startClass(String classname);
+  public void startClass(String className) { }
 
-  void endClass();
+  public void endClass() { }
 
-  void startWriteClass(String classname);
+  public void startWriteClass(String className) { }
 
-  void endWriteClass();
+  public void endWriteClass() { }
 
-  void startMethod(String method);
+  public void startMethod(String methodName) { }
 
-  void endMethod();
-
-  int getSeverity();
-
-  void setSeverity(int severity);
+  public void endMethod() { }
 }
diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
index c942bad..69dd218 100644
--- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
+++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
@@ -77,6 +77,7 @@ public interface IFernflowerPreferences {
     put(IDEA_NOT_NULL_ANNOTATION, "1");
     put(LAMBDA_TO_ANONYMOUS_CLASS, "0");
 
+    put(LOG_LEVEL, IFernflowerLogger.Severity.INFO.name());
     put(MAX_PROCESSING_METHOD, "0");
     put(RENAME_ENTITIES, "0");
     put(NEW_LINE_SEPARATOR, (InterpreterUtil.IS_WINDOWS ? "0" : "1"));
diff --git a/src/org/jetbrains/java/decompiler/main/extern/IDecompilatSaver.java b/src/org/jetbrains/java/decompiler/main/extern/IResultSaver.java
index 9cbac0c..1e6a7d4 100644
--- a/src/org/jetbrains/java/decompiler/main/extern/IDecompilatSaver.java
+++ b/src/org/jetbrains/java/decompiler/main/extern/IResultSaver.java
@@ -17,23 +17,20 @@ package org.jetbrains.java.decompiler.main.extern;
 
 import java.util.jar.Manifest;
 
-public interface IDecompilatSaver {
-
-  void copyFile(String source, String destpath, String destfilename);
-
+public interface IResultSaver {
   void saveFolder(String path);
 
-  void saveClassFile(String path, String qualifiedName, String entryName, String content);
+  void copyFile(String source, String path, String entryName);
 
-  void saveFile(String path, String filename, String 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);
 
-  void saveClassEntry(String path, String archivename, String qualifiedName, String entryName, String content);
+  void saveDirEntry(String path, String archiveName, String entryName);
 
-  void saveEntry(String path, String archivename, String entryName, String content);
+  void copyEntry(String source, String path, String archiveName, String entry);
 
-  void copyEntry(String source, String destpath, String archivename, String entry);
+  void saveClassEntry(String path, String archiveName, String qualifiedName, String entryName, String content);
 
-  void closeArchive(String path, String archivename);
+  void closeArchive(String path, String archiveName);
 }