Fixed #1769 - Do not mark getter+setter as colliding (#xxx suffix)

This commit is contained in:
Jindra Petřík
2021-12-19 10:39:51 +01:00
parent 2219dfa01a
commit 012ae459c6
2 changed files with 13 additions and 2 deletions

View File

@@ -12,7 +12,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library.
* License along with this library.
*/
package com.jpexs.decompiler.flash.abc.usages;
import com.jpexs.decompiler.flash.abc.ABC;
@@ -39,6 +40,14 @@ public class MethodNameMultinameUsage extends MethodMultinameUsage implements De
TraitMultinameUsage otherTrait = (TraitMultinameUsage) other;
if (otherTrait.classIndex == classIndex && otherTrait.traitsType == traitsType && otherTrait.parentTraitIndex == parentTraitIndex) {
if (other.sameMultinameName(this)) {
if(other instanceof MethodNameMultinameUsage){
MethodNameMultinameUsage otherM = (MethodNameMultinameUsage)other;
//getter/setter/method must match
if(otherM.traits.traits.get(otherM.traitIndex).kindType != traits.traits.get(traitIndex).kindType){
return false;
}
}
return true;
}
}