summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>2014-09-01 16:19:31 +0400
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>2014-09-01 16:19:31 +0400
commitd5fe121d1d320085d3d80e4267f0bbcfd320a333 (patch)
tree4f5f95acd19074af3e7e21f0e5342a9bc8b5bc26
parent984af2e7d0e7b8fd420800f87251d8ccd2df8681 (diff)
downloadfernflower-d5fe121d1d320085d3d80e4267f0bbcfd320a333.tar
fernflower-d5fe121d1d320085d3d80e4267f0bbcfd320a333.tar.gz
fernflower-d5fe121d1d320085d3d80e4267f0bbcfd320a333.tar.lz
fernflower-d5fe121d1d320085d3d80e4267f0bbcfd320a333.tar.xz
fernflower-d5fe121d1d320085d3d80e4267f0bbcfd320a333.zip
java-decompiler: post-import cleanup (OS-dependent line separator)
-rw-r--r--readme.txt2
-rw-r--r--src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/readme.txt b/readme.txt
index 8947fde..b0ea273 100644
--- a/readme.txt
+++ b/readme.txt
@@ -64,7 +64,7 @@ urc : full name of user-supplied class implementing IIdentifierRenamer. It is
should be renamed and provides new identifier names. For more information see section 5
inn (1): check for IntelliJ IDEA-specific @NotNull annotation and remove inserted code if found
lac (0): decompile lambda expressions to anonymous classes
-nls (0): define new line character to be used for output. 0 - '\r\n' (Windows), 1 - '\n' (Linux)
+nls (0): define new line character to be used for output. 0 - '\r\n' (Windows), 1 - '\n' (Linux), default is OS-dependent
ind : indentation string (default is " " (3 spaces))
The default logging level is INFO. This value can be overwritten by setting the option 'log' as follows:
diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
index 2052a99..4ef8ba9 100644
--- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
+++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
@@ -75,9 +75,10 @@ public interface IFernflowerPreferences {
put(IDEA_NOT_NULL_ANNOTATION, "1");
put(LAMBDA_TO_ANONYMOUS_CLASS, "0");
+ boolean win = System.getProperty("os.name", "").startsWith("Windows");
put(MAX_PROCESSING_METHOD, "0");
put(RENAME_ENTITIES, "0");
- put(NEW_LINE_SEPARATOR, "0");
+ put(NEW_LINE_SEPARATOR, (win ? "0" : "1"));
put(INDENT_STRING, " ");
}});
}