From 777ef32d65dabba4bc44606711ce0834ff081673 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 14 Mar 2016 19:57:03 +0300 Subject: [PATCH] Move AnnotationsImpl to frontend, delete unused DefaultAnnotationArgumentVisitor --- .../annotations/AnnotationsImpl.kt | 5 +- .../DefaultAnnotationArgumentVisitor.java | 95 ------------------- 2 files changed, 3 insertions(+), 97 deletions(-) rename {core/descriptors => compiler/frontend}/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationsImpl.kt (94%) delete mode 100644 core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/DefaultAnnotationArgumentVisitor.java diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationsImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationsImpl.kt similarity index 94% rename from core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationsImpl.kt rename to compiler/frontend/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationsImpl.kt index 09ef10d5831..3aa70facff2 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationsImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationsImpl.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -60,7 +60,8 @@ class AnnotationsImpl : Annotations { override fun toString() = annotations.toString() companion object { - @JvmStatic fun create(annotationsWithTargets: List): AnnotationsImpl { + @JvmStatic + fun create(annotationsWithTargets: List): AnnotationsImpl { return AnnotationsImpl(annotationsWithTargets, 0) } } diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/DefaultAnnotationArgumentVisitor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/DefaultAnnotationArgumentVisitor.java deleted file mode 100644 index b9322932867..00000000000 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/DefaultAnnotationArgumentVisitor.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.descriptors.annotations; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.resolve.constants.*; -import org.jetbrains.kotlin.resolve.constants.StringValue; - -public abstract class DefaultAnnotationArgumentVisitor implements AnnotationArgumentVisitor { - public abstract R visitValue(@NotNull ConstantValue value, D data); - - @Override - public R visitLongValue(@NotNull LongValue value, D data) { - return visitValue(value, data); - } - - @Override - public R visitIntValue(IntValue value, D data) { - return visitValue(value, data); - } - - @Override - public R visitShortValue(ShortValue value, D data) { - return visitValue(value, data); - } - - @Override - public R visitByteValue(ByteValue value, D data) { - return visitValue(value, data); - } - - @Override - public R visitDoubleValue(DoubleValue value, D data) { - return visitValue(value, data); - } - - @Override - public R visitFloatValue(FloatValue value, D data) { - return visitValue(value, data); - } - - @Override - public R visitBooleanValue(BooleanValue value, D data) { - return visitValue(value, data); - } - - @Override - public R visitCharValue(CharValue value, D data) { - return visitValue(value, data); - } - - @Override - public R visitStringValue(StringValue value, D data) { - return visitValue(value, data); - } - - @Override - public R visitNullValue(NullValue value, D data) { - return visitValue(value, data); - } - - @Override - public R visitErrorValue(ErrorValue value, D data) { - return visitValue(value, data); - } - - @Override - public R visitEnumValue(EnumValue value, D data) { - return visitValue(value, data); - } - - @Override - public R visitArrayValue(ArrayValue value, D data) { - return visitValue(value, data); - } - - @Override - public R visitAnnotationValue(AnnotationValue value, D data) { - return visitValue(value, data); - } -}