diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/de/fernflower/main/ClassWriter.java | 58 | ||||
| -rw-r--r-- | src/de/fernflower/main/extern/IFernflowerPreferences.java | 1 |
2 files changed, 14 insertions, 45 deletions
diff --git a/src/de/fernflower/main/ClassWriter.java b/src/de/fernflower/main/ClassWriter.java index 54a490e..a500fa4 100644 --- a/src/de/fernflower/main/ClassWriter.java +++ b/src/de/fernflower/main/ClassWriter.java @@ -344,25 +344,15 @@ public class ClassWriter { writer.newLine(); } } - - // class annotations - boolean hasDeprecatedAnno = false; - List<AnnotationExprent> lstAnn = getAllAnnotations(cl.getAttributes()); - for(AnnotationExprent annexpr : lstAnn) { - if("java/lang/Deprecated".equals(annexpr.getClassname())) { - hasDeprecatedAnno = true; - } - } - if ((isDeprecated || hasDeprecatedAnno) && DecompilerContext.getOption(IFernflowerPreferences.DEPRECATED_COMMENT)) { + + if(isDeprecated) { writer.write(indstr); writer.write("/** @deprecated */"); writer.newLine(); } - if(isDeprecated && !hasDeprecatedAnno) { - writer.write(indstr); - writer.write("@Deprecated"); - writer.newLine(); - } + + // class annotations + List<AnnotationExprent> lstAnn = getAllAnnotations(cl.getAttributes()); for(AnnotationExprent annexpr : lstAnn) { writer.write(annexpr.toJava(indent)); writer.newLine(); @@ -490,25 +480,15 @@ public class ClassWriter { } boolean isDeprecated = fd.getAttributes().containsKey("Deprecated"); - - // field annotations - boolean hasDeprecatedAnno = false; - List<AnnotationExprent> lstAnn = getAllAnnotations(fd.getAttributes()); - for(AnnotationExprent annexpr : lstAnn) { - if("java/lang/Deprecated".equals(annexpr.getClassname())) { - hasDeprecatedAnno = true; - } - } - if ((isDeprecated || hasDeprecatedAnno) && DecompilerContext.getOption(IFernflowerPreferences.DEPRECATED_COMMENT)) { + + if(isDeprecated) { writer.write(indstr); writer.write("/** @deprecated */"); writer.newLine(); } - if(isDeprecated && !hasDeprecatedAnno) { - writer.write(indstr); - writer.write("@Deprecated"); - writer.newLine(); - } + + // field annotations + List<AnnotationExprent> lstAnn = getAllAnnotations(fd.getAttributes()); for(AnnotationExprent annexpr : lstAnn) { writer.write(annexpr.toJava(indent)); writer.newLine(); @@ -729,24 +709,14 @@ public class ClassWriter { } } - // method annotations - boolean hasDeprecatedAnno = false; - List<AnnotationExprent> lstAnn = getAllAnnotations(mt.getAttributes()); - for(AnnotationExprent annexpr : lstAnn) { - if("java/lang/Deprecated".equals(annexpr.getClassname())) { - hasDeprecatedAnno = true; - } - } - if ((isDeprecated || hasDeprecatedAnno) && DecompilerContext.getOption(IFernflowerPreferences.DEPRECATED_COMMENT)) { + if(isDeprecated) { writer.write(indstr); writer.write("/** @deprecated */"); writer.newLine(); } - if(isDeprecated && !hasDeprecatedAnno) { - bufstrwriter.write(indstr); - bufstrwriter.write("@Deprecated"); - bufstrwriter.newLine(); - } + + // method annotations + List<AnnotationExprent> lstAnn = getAllAnnotations(mt.getAttributes()); for(AnnotationExprent annexpr : lstAnn) { bufstrwriter.write(annexpr.toJava(indent)); bufstrwriter.newLine(); diff --git a/src/de/fernflower/main/extern/IFernflowerPreferences.java b/src/de/fernflower/main/extern/IFernflowerPreferences.java index 0d3ea52..35b17de 100644 --- a/src/de/fernflower/main/extern/IFernflowerPreferences.java +++ b/src/de/fernflower/main/extern/IFernflowerPreferences.java @@ -46,7 +46,6 @@ public interface IFernflowerPreferences { public static final String LOG_LEVEL = "log"; - public static final String DEPRECATED_COMMENT = "dpc"; public static final String NEW_LINE_SEPARATOR = "nls"; public static final String IDEA_NOT_NULL_ANNOTATION = "inn"; public static final String LAMBDA_TO_ANONYMOUS_CLASS = "lac"; |