Introduce ValueDescriptor as a common super-interface

of ParameterDescriptor and VariableDescriptor.

core/descriptors/src/org/jetbrains/kotlin/descriptors/ParameterDescriptor.java

@@ -19,14 +19,7 @@ package org.jetbrains.kotlin.descriptors;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.types.KotlinType;
 
-public interface ParameterDescriptor extends CallableDescriptor {
+public interface ParameterDescriptor extends ValueDescriptor {
-    @NotNull
-    KotlinType getType();
-
-    @Override
-    @NotNull
-    DeclarationDescriptor getContainingDeclaration();
-
     @NotNull
     @Override
     ParameterDescriptor getOriginal();

core/descriptors/src/org/jetbrains/kotlin/descriptors/ValueDescriptor.java

@@ -0,0 +1,29 @@
+/*
+ * 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.
+ * 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;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.kotlin.types.KotlinType;
+
+public interface ValueDescriptor extends CallableDescriptor {
+    @NotNull
+    KotlinType getType();
+
+    @Override
+    @NotNull
+    DeclarationDescriptor getContainingDeclaration();
+}

core/descriptors/src/org/jetbrains/kotlin/descriptors/VariableDescriptor.java

@@ -22,14 +22,7 @@ import org.jetbrains.kotlin.resolve.constants.ConstantValue;
 import org.jetbrains.kotlin.types.KotlinType;
 import org.jetbrains.kotlin.types.TypeSubstitutor;
 
-public interface VariableDescriptor extends CallableDescriptor {
+public interface VariableDescriptor extends ValueDescriptor {
-    @NotNull
-    KotlinType getType();
-
-    @Override
-    @NotNull
-    DeclarationDescriptor getContainingDeclaration();
-
     @Override
     VariableDescriptor substitute(@NotNull TypeSubstitutor substitutor);