mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git
synced 2026-06-04 15:14:49 +00:00
Fixed #1769 - Do not mark getter+setter as colliding (#xxx suffix)
This commit is contained in:
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user