Get rid of deprecated method usages and some yellow code

java/openapi/src/com/intellij/util/xml/converters/AbstractMethodResolveConverter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-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.
@@ -143,10 +143,18 @@ public abstract class AbstractMethodResolveConverter<ParentType extends DomEleme
     return psiMethod.getContainingClass().isInterface() || (!psiMethod.hasModifierProperty(PsiModifier.FINAL) && !psiMethod.hasModifierProperty(PsiModifier.STATIC));
   }
 
-  public Set<String> getAdditionalVariants() {
+  @NotNull
+  @Override
+  public Set<String> getAdditionalVariants(@NotNull ConvertContext context) {
     return Collections.singleton(ALL_METHODS);
   }
 
+  @NotNull
+  @Override
+  public Set<String> getAdditionalVariants() {
+    return super.getAdditionalVariants();
+  }
+
   public PsiMethod fromString(final String methodName, final ConvertContext context) {
     final CommonProcessors.FindFirstProcessor<PsiMethod> processor = new CommonProcessors.FindFirstProcessor<PsiMethod>();
     processMethods(context, processor, new Function<PsiClass, PsiMethod[]>() {

xml/dom-tests/tests/com/intellij/util/xml/DomReferencesTest.java

@@ -221,7 +221,7 @@ public class DomReferencesTest extends DomHardCoreTestCase {
 
     @Override
     @NotNull
-    public Collection<? extends String> getVariants(final ConvertContext context) {
+    public Collection<String> getVariants(final ConvertContext context) {
       return Collections.emptyList();
     }
 
@@ -256,7 +256,7 @@ public class DomReferencesTest extends DomHardCoreTestCase {
 
     @NotNull
     @Override
-    public Set<String> getAdditionalVariants() {
+    public Set<String> getAdditionalVariants(@NotNull ConvertContext context) {
       return Collections.singleton("zzz");
     }
   }