From 3bd41784b21b48d7d4cdb3d530d955e52be504fd Mon Sep 17 00:00:00 2001
From: Daniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Date: Mon, 20 Nov 2017 17:58:39 +0300
Subject: [PATCH] [jvm-lang] java: inherit PsiPackage from JvmPackage

---
 .../src/com/intellij/psi/PsiPackage.java      | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/java/java-psi-api/src/com/intellij/psi/PsiPackage.java b/java/java-psi-api/src/com/intellij/psi/PsiPackage.java
index 76982b89fbe4..b445c524aaa3 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiPackage.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiPackage.java
@@ -1,20 +1,7 @@
-/*
- * Copyright 2000-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.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.psi;
 
+import com.intellij.lang.jvm.JvmPackage;
 import com.intellij.navigation.NavigationItem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.search.GlobalSearchScope;
@@ -24,7 +11,9 @@ import org.jetbrains.annotations.Nullable;
 /**
  * Represents a Java package.
  */
-public interface PsiPackage extends PsiCheckedRenameElement, NavigationItem, PsiModifierListOwner, PsiDirectoryContainer, PsiQualifiedNamedElement {
+public interface PsiPackage extends PsiCheckedRenameElement, NavigationItem, PsiModifierListOwner,
+                                    PsiDirectoryContainer, PsiQualifiedNamedElement, JvmPackage {
+
   String PACKAGE_INFO_CLASS = "package-info";
   String PACKAGE_INFO_FILE = PACKAGE_INFO_CLASS + ".java";
   String PACKAGE_INFO_CLS_FILE = PACKAGE_INFO_CLASS + ".class";
@@ -45,6 +34,7 @@ public interface PsiPackage extends PsiCheckedRenameElement, NavigationItem, Psi
    *
    * @return the parent package, or null for the default package.
    */
+  @Override
   @Nullable
   PsiPackage getParentPackage();