diff options
author | Reinier Zwitserloot <reinier@zwitserloot.com> | 2011-07-25 20:06:20 +0200 |
---|---|---|
committer | Reinier Zwitserloot <reinier@zwitserloot.com> | 2011-07-25 20:06:20 +0200 |
commit | 403f515aa28b94f223903c9d400bee3d4fa9b12e (patch) | |
tree | 41dfaf9fe9cfedef0e0c89331f000afedb5c8716 | |
parent | b325214e82e7d65dde32e197ab932ba5cd0b43c6 (diff) | |
download | lombok-403f515aa28b94f223903c9d400bee3d4fa9b12e.tar.gz lombok-403f515aa28b94f223903c9d400bee3d4fa9b12e.tar.bz2 lombok-403f515aa28b94f223903c9d400bee3d4fa9b12e.zip |
Delombok with a relative path and in 'output to directory' mode would NPE. Fixes issue #241.
-rw-r--r-- | src/delombok/lombok/delombok/Delombok.java | 4 | ||||
-rw-r--r-- | test/core/src/lombok/RunTestsViaDelombok.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/delombok/lombok/delombok/Delombok.java b/src/delombok/lombok/delombok/Delombok.java index 91b7c93e..e125d622 100644 --- a/src/delombok/lombok/delombok/Delombok.java +++ b/src/delombok/lombok/delombok/Delombok.java @@ -175,7 +175,7 @@ public class Delombok { try { for (String in : args.input) { - File f = new File(in); + File f = new File(in).getAbsoluteFile(); if (f.isFile()) { delombok.addFile(f.getParentFile(), f.getName()); } else if (f.isDirectory()) { @@ -332,7 +332,7 @@ public class Delombok { in.close(); } } - + public void addFile(File base, String fileName) throws IOException { if (output != null && canonical(base).equals(canonical(output))) throw new IOException( "DELOMBOK: Output file and input file refer to the same filesystem location. Specify a separate path for output."); diff --git a/test/core/src/lombok/RunTestsViaDelombok.java b/test/core/src/lombok/RunTestsViaDelombok.java index bcaa66a2..9d9c4f23 100644 --- a/test/core/src/lombok/RunTestsViaDelombok.java +++ b/test/core/src/lombok/RunTestsViaDelombok.java @@ -53,8 +53,8 @@ public class RunTestsViaDelombok extends AbstractRunTests { } }); - delombok.addFile(file.getParentFile(), file.getName()); - delombok.setSourcepath(file.getParentFile().getAbsolutePath()); + delombok.addFile(file.getAbsoluteFile().getParentFile(), file.getName()); + delombok.setSourcepath(file.getAbsoluteFile().getParent()); delombok.setWriter(result); delombok.delombok(); } |