Anna Kozlova da48448b83 pull up: ignore conflicts coming from access object when it is also moved (IDEA-117671)

2013-12-06 17:26:22 +01:00

..

inaccessible

…

reuseSuperMethod

…

reuseSuperSuperMethod

…

AsDefault_after.java

…

AsDefault.java

…

EscalateVisibility_after.java

…

EscalateVisibility.java

…

ExtensionMethod_after.java

…

ExtensionMethod.java

…

GenericsInAbstractMethod_after.java

…

GenericsInAbstractMethod.java

…

GenericsInImplements_after.java

…

GenericsInImplements.java

…

IfFieldInitializationWithNonMovedField_after.java

…

IfFieldInitializationWithNonMovedField.java

…

IfFieldMovedInitialization_after.java

…

IfFieldMovedInitialization.java

…

MergeInterfaces_after.java

…

MergeInterfaces.java

…

MultipleConstructorsFieldInitialization_after.java

…

MultipleConstructorsFieldInitialization.java

…

MultipleConstructorsFieldInitializationNoGood_after.java

…

MultipleConstructorsFieldInitializationNoGood.java

…

PreserveOverride_after.java

…

PreserveOverride.java

…

PreserveOverrideInPulledMethod_after.java

…

PreserveOverrideInPulledMethod.java

…

PublicMethodFromPrivateClassConflict_after.java

…

PublicMethodFromPrivateClassConflict.java

…

PullUpAndMakeAbstract_after.java

…

PullUpAndMakeAbstract.java

…

PullUpInheritedStaticClasses_after.java

…

PullUpInheritedStaticClasses.java

…

PullUpPrivateInnerClassWithPrivateConstructor_after.java

…

PullUpPrivateInnerClassWithPrivateConstructor.java

…

QualifiedReference_after.java

…

QualifiedReference.java

…

QualifiedSuper_after.java

…

QualifiedSuper.java

…

QualifiedThis_after.java

…

QualifiedThis.java

…

RemoveOverride_after.java

…

RemoveOverride.java

…

RemoveOverrideFromPulledMethod_after.java

…

RemoveOverrideFromPulledMethod.java

…

ReplaceDuplicatesInInheritors_after.java

…

ReplaceDuplicatesInInheritors.java

…

TryCatchFieldInitializer_after.java

…

TryCatchFieldInitializer.java

…

TypeArgument_after.java

…

TypeArgument.java

…

TypeParamErasure_after.java

…

TypeParamErasure.java

…

TypeParamsConflictingNames_after.java

…

TypeParamsConflictingNames.java

…

TypeParamSubst_after.java

…

TypeParamSubst.java

…

UpdateStaticRefs_after.java

…

UpdateStaticRefs.java

…