Pull common method up

core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqName.java

@@ -109,6 +109,7 @@ public final class FqName extends FqNameBase {
         return fqName.shortName();
     }
 
+    @Override
     @NotNull
     public Name shortNameOrSpecial() {
         return fqName.shortNameOrSpecial();

core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqNameBase.java

@@ -52,6 +52,9 @@ public abstract class FqNameBase {
         return toFqNameUnsafe().equals(that);
     }
 
+    @NotNull
+    public abstract Name shortNameOrSpecial();
+
     @NotNull
     public abstract List<Name> pathSegments();
 }

core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqNameUnsafe.java

@@ -153,6 +153,7 @@ public final class FqNameUnsafe extends FqNameBase {
         return shortName;
     }
 
+    @Override
     @NotNull
     public Name shortNameOrSpecial() {
         if (isRoot()) {