From ba7406f05a7b88e06bb1d4c52e9000c85e65387c Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Tue, 20 Jul 2010 11:00:38 +0200 Subject: Moved DeleteLombokAnnotations to the proper package and source dir. --- src/core/lombok/javac/DeleteLombokAnnotations.java | 35 ++++++++++++++++++++++ src/core/lombok/javac/JavacNode.java | 1 - .../lombok/delombok/CommentPreservingParser.java | 1 + .../lombok/delombok/DeleteLombokAnnotations.java | 35 ---------------------- 4 files changed, 36 insertions(+), 36 deletions(-) create mode 100644 src/core/lombok/javac/DeleteLombokAnnotations.java delete mode 100644 src/delombok/lombok/delombok/DeleteLombokAnnotations.java (limited to 'src') diff --git a/src/core/lombok/javac/DeleteLombokAnnotations.java b/src/core/lombok/javac/DeleteLombokAnnotations.java new file mode 100644 index 00000000..425c4365 --- /dev/null +++ b/src/core/lombok/javac/DeleteLombokAnnotations.java @@ -0,0 +1,35 @@ +/* + * Copyright © 2010 Reinier Zwitserloot and Roel Spilker. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package lombok.javac; + +/** Used as marker in javac's Context object when delombok is running to signal that all lombok annotations should be deleted as they are processed. */ +public class DeleteLombokAnnotations { + private final boolean deleteLombokAnnotations; + + public DeleteLombokAnnotations(boolean deleteLombokAnnotations) { + this.deleteLombokAnnotations = deleteLombokAnnotations; + } + + public boolean isDeleteLombokAnnotations() { + return deleteLombokAnnotations; + } +} diff --git a/src/core/lombok/javac/JavacNode.java b/src/core/lombok/javac/JavacNode.java index 3d7ce73f..4981a24e 100644 --- a/src/core/lombok/javac/JavacNode.java +++ b/src/core/lombok/javac/JavacNode.java @@ -26,7 +26,6 @@ import java.util.List; import javax.tools.Diagnostic; import lombok.core.AST.Kind; -import lombok.delombok.DeleteLombokAnnotations; import com.sun.tools.javac.code.Symtab; import com.sun.tools.javac.tree.JCTree; diff --git a/src/delombok/lombok/delombok/CommentPreservingParser.java b/src/delombok/lombok/delombok/CommentPreservingParser.java index 8536075d..d48c5bf0 100644 --- a/src/delombok/lombok/delombok/CommentPreservingParser.java +++ b/src/delombok/lombok/delombok/CommentPreservingParser.java @@ -33,6 +33,7 @@ import javax.lang.model.element.Element; import javax.tools.JavaFileObject; import javax.tools.Diagnostic.Kind; +import lombok.javac.DeleteLombokAnnotations; import lombok.javac.JavacTransformer; import com.sun.tools.javac.main.JavaCompiler; diff --git a/src/delombok/lombok/delombok/DeleteLombokAnnotations.java b/src/delombok/lombok/delombok/DeleteLombokAnnotations.java deleted file mode 100644 index 335cf6e9..00000000 --- a/src/delombok/lombok/delombok/DeleteLombokAnnotations.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright © 2010 Reinier Zwitserloot and Roel Spilker. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package lombok.delombok; - -/** Used as marker in javac's Context object when delombok is running to signal that all lombok annotations should be deleted as they are processed. */ -public class DeleteLombokAnnotations { - private final boolean deleteLombokAnnotations; - - public DeleteLombokAnnotations(boolean deleteLombokAnnotations) { - this.deleteLombokAnnotations = deleteLombokAnnotations; - } - - public boolean isDeleteLombokAnnotations() { - return deleteLombokAnnotations; - } -} -- cgit