From 204a10c64d90f24a9167f1797c769ced23d5ed2d Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 26 Jan 2016 13:47:35 +0000 Subject: [PATCH] Rename MethodData to more meaningful SrgMethod --- .../AnnotatedMixinElementHandler.java | 4 +- .../AnnotatedMixinInjectorHandler.java | 4 +- .../AnnotatedMixinOverwriteHandler.java | 6 +-- .../AnnotatedMixinShadowHandler.java | 6 +-- .../tools/obfuscation/ObfuscationManager.java | 38 ++++++++-------- .../TargetObfuscationEnvironment.java | 8 ++-- .../interfaces/IObfuscationManager.java | 12 ++--- .../mixin/injection/struct/MemberInfo.java | 44 +++++++++---------- .../asm/obfuscation/SrgContainer.java | 6 +-- .../{MethodData.java => SrgMethod.java} | 10 ++--- 10 files changed, 69 insertions(+), 69 deletions(-) rename src/main/java/org/spongepowered/asm/obfuscation/{MethodData.java => SrgMethod.java} (89%) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandler.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandler.java index 1423685c..5a784d57 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandler.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandler.java @@ -35,7 +35,7 @@ import javax.tools.Diagnostic.Kind; import org.spongepowered.asm.mixin.injection.struct.InvalidMemberDescriptorException; import org.spongepowered.asm.mixin.injection.struct.MemberInfo; -import org.spongepowered.asm.obfuscation.MethodData; +import org.spongepowered.asm.obfuscation.SrgMethod; import org.spongepowered.asm.util.ConstraintParser; import org.spongepowered.asm.util.ConstraintParser.Constraint; import org.spongepowered.asm.util.ConstraintViolationException; @@ -244,7 +244,7 @@ abstract class AnnotatedMixinElementHandler { } this.obf.addFieldMapping(this.classRef, target, targetMember, obfFieldData); } else { - ObfuscationData obfMethodData = this.obf.getObfMethodRecursive(targetMember); + ObfuscationData obfMethodData = this.obf.getObfMethodRecursive(targetMember); if (obfMethodData.isEmpty()) { if (targetMember.owner == null || !targetMember.owner.startsWith("java/lang/")) { this.ap.printMessage(Kind.WARNING, "Cannot find method mapping for @At(" + key + ") '" + target + "'", element, inject); diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinInjectorHandler.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinInjectorHandler.java index e18e2e1a..da687d8b 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinInjectorHandler.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinInjectorHandler.java @@ -36,7 +36,7 @@ import javax.tools.Diagnostic.Kind; import org.spongepowered.asm.mixin.injection.struct.InvalidMemberDescriptorException; import org.spongepowered.asm.mixin.injection.struct.MemberInfo; -import org.spongepowered.asm.obfuscation.MethodData; +import org.spongepowered.asm.obfuscation.SrgMethod; import org.spongepowered.asm.util.Constants; import org.spongepowered.tools.MirrorUtils; import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; @@ -93,7 +93,7 @@ class AnnotatedMixinInjectorHandler extends AnnotatedMixinElementHandler { return null; } - ObfuscationData obfData = this.obf.getObfMethod(new MethodData(this.mixin.getPrimaryTargetRef() + "/" + targetMember.name, desc)); + ObfuscationData obfData = this.obf.getObfMethod(new SrgMethod(this.mixin.getPrimaryTargetRef() + "/" + targetMember.name, desc)); if (obfData.isEmpty()) { Kind error = Constants.INIT.equals(targetMember.name) ? Kind.WARNING : Kind.ERROR; return new Message(error, "No obfuscation mapping for " + type + " target " + targetMember.name, method, inject); diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinOverwriteHandler.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinOverwriteHandler.java index c9a83c79..6165d6b2 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinOverwriteHandler.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinOverwriteHandler.java @@ -30,7 +30,7 @@ import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.ExecutableElement; import javax.tools.Diagnostic.Kind; -import org.spongepowered.asm.obfuscation.MethodData; +import org.spongepowered.asm.obfuscation.SrgMethod; import org.spongepowered.tools.MirrorUtils; import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; @@ -51,7 +51,7 @@ class AnnotatedMixinOverwriteHandler extends AnnotatedMixinElementHandler { String mcpName = method.getSimpleName().toString(); String mcpSignature = MirrorUtils.generateSignature(method); - ObfuscationData obfData = this.obf.getObfMethod(new MethodData(this.mixin.getPrimaryTargetRef() + "/" + mcpName, mcpSignature)); + ObfuscationData obfData = this.obf.getObfMethod(new SrgMethod(this.mixin.getPrimaryTargetRef() + "/" + mcpName, mcpSignature)); if (obfData.isEmpty()) { Kind error = Kind.ERROR; @@ -71,7 +71,7 @@ class AnnotatedMixinOverwriteHandler extends AnnotatedMixinElementHandler { } for (ObfuscationType type : obfData) { - MethodData obfMethod = obfData.get(type); + SrgMethod obfMethod = obfData.get(type); this.addMethodMapping(type, mcpName, obfMethod.getSimpleName(), mcpSignature, obfMethod.getDesc()); } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinShadowHandler.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinShadowHandler.java index 137ece5d..561181d9 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinShadowHandler.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinShadowHandler.java @@ -29,7 +29,7 @@ import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.VariableElement; import javax.tools.Diagnostic.Kind; -import org.spongepowered.asm.obfuscation.MethodData; +import org.spongepowered.asm.obfuscation.SrgMethod; import org.spongepowered.tools.MirrorUtils; import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; @@ -75,7 +75,7 @@ class AnnotatedMixinShadowHandler extends AnnotatedMixinElementHandler { } String mcpSignature = MirrorUtils.generateSignature(method); - ObfuscationData obfData = this.obf.getObfMethod(new MethodData(this.mixin.getPrimaryTargetRef() + "/" + name, mcpSignature)); + ObfuscationData obfData = this.obf.getObfMethod(new SrgMethod(this.mixin.getPrimaryTargetRef() + "/" + name, mcpSignature)); if (obfData.isEmpty()) { this.ap.printMessage(Kind.WARNING, "Unable to locate obfuscation mapping for @Shadow method", method, shadow); @@ -83,7 +83,7 @@ class AnnotatedMixinShadowHandler extends AnnotatedMixinElementHandler { } for (ObfuscationType type : obfData) { - MethodData obfMethod = obfData.get(type); + SrgMethod obfMethod = obfData.get(type); this.addMethodMapping(type, name.setObfuscatedName(obfMethod.getName()), mcpSignature, obfMethod.getDesc()); } } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java index 45e9313d..27962169 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/ObfuscationManager.java @@ -37,7 +37,7 @@ import javax.tools.StandardLocation; import org.spongepowered.asm.mixin.injection.struct.MemberInfo; import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; -import org.spongepowered.asm.obfuscation.MethodData; +import org.spongepowered.asm.obfuscation.SrgMethod; import org.spongepowered.asm.util.Constants; import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor; import org.spongepowered.tools.obfuscation.interfaces.IObfuscationManager; @@ -164,7 +164,7 @@ public class ObfuscationManager implements IObfuscationManager { if (currentTarget.isField()) { obfData.add(type, (T)MemberInfo.fromSrgField(obfMember.toString(), "").move(obfClass).toSrg()); } else { - obfData.add(type, (T)MemberInfo.fromSrgMethod((MethodData)obfMember).move(obfClass).asMethodData()); + obfData.add(type, (T)MemberInfo.fromSrgMethod((SrgMethod)obfMember).move(obfClass).asSrgMethod()); } } } @@ -186,7 +186,7 @@ public class ObfuscationManager implements IObfuscationManager { if (targetMember.isField()) { return (ObfuscationData)this.getObfField(targetMember.toSrg()); } - return (ObfuscationData)this.getObfMethod(targetMember.asMethodData()); + return (ObfuscationData)this.getObfMethod(targetMember.asSrgMethod()); } /* (non-Javadoc) @@ -195,8 +195,8 @@ public class ObfuscationManager implements IObfuscationManager { * org.spongepowered.asm.mixin.injection.struct.MemberInfo) */ @Override - public ObfuscationData getObfMethodRecursive(MemberInfo targetMember) { - return this.getObfEntryRecursive(targetMember); + public ObfuscationData getObfMethodRecursive(MemberInfo targetMember) { + return this.getObfEntryRecursive(targetMember); } /* (non-Javadoc) @@ -205,11 +205,11 @@ public class ObfuscationManager implements IObfuscationManager { * org.spongepowered.asm.mixin.injection.struct.MemberInfo) */ @Override - public ObfuscationData getObfMethod(MemberInfo method) { - ObfuscationData data = new ObfuscationData(); + public ObfuscationData getObfMethod(MemberInfo method) { + ObfuscationData data = new ObfuscationData(); for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { - MethodData obfMethod = targetEnv.getObfMethod(method); + SrgMethod obfMethod = targetEnv.getObfMethod(method); if (obfMethod != null) { data.add(targetEnv.getType(), obfMethod); } @@ -223,15 +223,15 @@ public class ObfuscationManager implements IObfuscationManager { } /* (non-Javadoc) - * @see org.spongepowered.tools.obfuscation.IObfuscationManager - * #getObfMethod(net.minecraftforge.srg2source.rangeapplier.MethodData) + * @see org.spongepowered.tools.obfuscation.interfaces.IObfuscationManager + * #getObfMethod(org.spongepowered.asm.obfuscation.SrgMethod) */ @Override - public ObfuscationData getObfMethod(MethodData method) { - ObfuscationData data = new ObfuscationData(); + public ObfuscationData getObfMethod(SrgMethod method) { + ObfuscationData data = new ObfuscationData(); for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { - MethodData obfMethod = targetEnv.getObfMethod(method); + SrgMethod obfMethod = targetEnv.getObfMethod(method); if (obfMethod != null) { data.add(targetEnv.getType(), obfMethod); } @@ -251,11 +251,11 @@ public class ObfuscationManager implements IObfuscationManager { * @param method Method to remap * @return data */ - public ObfuscationData remapDescriptor(ObfuscationData data, MemberInfo method) { + public ObfuscationData remapDescriptor(ObfuscationData data, MemberInfo method) { for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { MemberInfo obfMethod = targetEnv.remapDescriptor(method); if (obfMethod != null) { - data.add(targetEnv.getType(), obfMethod.asMethodData()); + data.add(targetEnv.getType(), obfMethod.asSrgMethod()); } } @@ -323,9 +323,9 @@ public class ObfuscationManager implements IObfuscationManager { * org.spongepowered.tools.obfuscation.ObfuscationData) */ @Override - public void addMethodMapping(String className, String reference, ObfuscationData obfMethodData) { + public void addMethodMapping(String className, String reference, ObfuscationData obfMethodData) { for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { - MethodData obfMethod = obfMethodData.get(targetEnv.getType()); + SrgMethod obfMethod = obfMethodData.get(targetEnv.getType()); if (obfMethod != null) { MemberInfo remappedReference = new MemberInfo(obfMethod); targetEnv.addMapping(className, reference, remappedReference.toString()); @@ -340,9 +340,9 @@ public class ObfuscationManager implements IObfuscationManager { * org.spongepowered.tools.obfuscation.ObfuscationData) */ @Override - public void addMethodMapping(String className, String reference, MemberInfo context, ObfuscationData obfMethodData) { + public void addMethodMapping(String className, String reference, MemberInfo context, ObfuscationData obfMethodData) { for (TargetObfuscationEnvironment targetEnv : this.targetEnvironments) { - MethodData obfMethod = obfMethodData.get(targetEnv.getType()); + SrgMethod obfMethod = obfMethodData.get(targetEnv.getType()); if (obfMethod != null) { MemberInfo remappedReference = context.remapUsing(obfMethod, true); targetEnv.addMapping(className, reference, remappedReference.toString()); diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java index 2dc73352..7434e65e 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/TargetObfuscationEnvironment.java @@ -43,7 +43,7 @@ import javax.tools.StandardLocation; import org.spongepowered.asm.mixin.injection.struct.MemberInfo; import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; -import org.spongepowered.asm.obfuscation.MethodData; +import org.spongepowered.asm.obfuscation.SrgMethod; import org.spongepowered.asm.obfuscation.SrgContainer; import org.spongepowered.asm.util.ObfuscationUtil; import org.spongepowered.asm.util.ObfuscationUtil.IClassRemapper; @@ -170,8 +170,8 @@ class TargetObfuscationEnvironment { /** * Get an obfuscation mapping for a method */ - public MethodData getObfMethod(MemberInfo method) { - MethodData obfd = this.getObfMethod(method.asMethodData()); + public SrgMethod getObfMethod(MemberInfo method) { + SrgMethod obfd = this.getObfMethod(method.asSrgMethod()); if (obfd != null || !method.isFullyQualified()) { return obfd; } @@ -196,7 +196,7 @@ class TargetObfuscationEnvironment { /** * Get an obfuscation mapping for a method */ - public MethodData getObfMethod(MethodData method) { + public SrgMethod getObfMethod(SrgMethod method) { if (this.initSrgs()) { return this.srgs.getMethodMapping(method); } diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IObfuscationManager.java b/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IObfuscationManager.java index ee154a5b..22441445 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IObfuscationManager.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/interfaces/IObfuscationManager.java @@ -26,7 +26,7 @@ package org.spongepowered.tools.obfuscation.interfaces; import org.spongepowered.asm.mixin.injection.struct.MemberInfo; import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper; -import org.spongepowered.asm.obfuscation.MethodData; +import org.spongepowered.asm.obfuscation.SrgMethod; import org.spongepowered.tools.obfuscation.ObfuscationData; import org.spongepowered.tools.obfuscation.TypeHandle; @@ -70,17 +70,17 @@ public interface IObfuscationManager { * @return ObfuscationData with remapped owner class corresponding to the * original owner class */ - public abstract ObfuscationData getObfMethodRecursive(MemberInfo method); + public abstract ObfuscationData getObfMethodRecursive(MemberInfo method); /** * Get an obfuscation mapping for a method */ - public abstract ObfuscationData getObfMethod(MemberInfo method); + public abstract ObfuscationData getObfMethod(MemberInfo method); /** * Get an obfuscation mapping for a method */ - public abstract ObfuscationData getObfMethod(MethodData method); + public abstract ObfuscationData getObfMethod(SrgMethod method); /** * Attempts to resolve an obfuscated field by recursively enumerating @@ -116,7 +116,7 @@ public interface IObfuscationManager { * @param reference Original reference, as it appears in the annotation * @param obfMethodData Method data to add for this mapping */ - public abstract void addMethodMapping(String className, String reference, ObfuscationData obfMethodData); + public abstract void addMethodMapping(String className, String reference, ObfuscationData obfMethodData); /** * Adds a method mapping to the internal refmap, generates refmap entries @@ -128,7 +128,7 @@ public interface IObfuscationManager { * supplied obfuscation data * @param obfMethodData Method data to add for this mapping */ - public abstract void addMethodMapping(String className, String reference, MemberInfo context, ObfuscationData obfMethodData); + public abstract void addMethodMapping(String className, String reference, MemberInfo context, ObfuscationData obfMethodData); /** * Adds a field mapping to the internal refmap, generates refmap entries diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java index e6be12c9..11ed80bc 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/struct/MemberInfo.java @@ -29,7 +29,7 @@ import org.spongepowered.asm.lib.tree.AbstractInsnNode; import org.spongepowered.asm.lib.tree.FieldInsnNode; import org.spongepowered.asm.lib.tree.MethodInsnNode; import org.spongepowered.asm.mixin.transformer.IReferenceMapperContext; -import org.spongepowered.asm.obfuscation.MethodData; +import org.spongepowered.asm.obfuscation.SrgMethod; import org.spongepowered.asm.util.SignaturePrinter; /** @@ -163,26 +163,26 @@ public class MemberInfo { } /** - * Initialise a MemberInfo using the supplied MethodData object + * Initialise a MemberInfo using the supplied SrgMethod object * - * @param methodData MethodData object to copy values from + * @param srgMethod SrgMethod object to copy values from */ - public MemberInfo(MethodData methodData) { - this.owner = methodData.getOwner(); - this.name = methodData.getSimpleName(); - this.desc = methodData.getDesc(); + public MemberInfo(SrgMethod srgMethod) { + this.owner = srgMethod.getOwner(); + this.name = srgMethod.getSimpleName(); + this.desc = srgMethod.getDesc(); this.matchAll = false; } /** - * Initialise a remapped MemberInfo using the supplied MethodData object + * Initialise a remapped MemberInfo using the supplied SrgMethod object * - * @param methodData MethodData object to copy values from + * @param srgMethod SrgMethod object to copy values from */ - private MemberInfo(MemberInfo remapped, MethodData methodData, boolean setOwner) { - this.owner = setOwner ? methodData.getOwner() : remapped.owner; - this.name = methodData.getSimpleName(); - this.desc = methodData.getDesc(); + private MemberInfo(MemberInfo remapped, SrgMethod srgMethod, boolean setOwner) { + this.owner = setOwner ? srgMethod.getOwner() : remapped.owner; + this.name = srgMethod.getSimpleName(); + this.desc = srgMethod.getDesc(); this.matchAll = remapped.matchAll; } @@ -237,16 +237,16 @@ public class MemberInfo { return new SignaturePrinter(this).setFullyQualified(true).toDescriptor(); } - public MethodData asMethodData() { + public SrgMethod asSrgMethod() { if (!this.isFullyQualified()) { - throw new RuntimeException("Cannot convert unqualified reference to MethodData"); + throw new RuntimeException("Cannot convert unqualified reference to SrgMethod"); } if (this.isField()) { - throw new RuntimeException("Cannot convert a non-method reference to MethodData"); + throw new RuntimeException("Cannot convert a non-method reference to SrgMethod"); } - return new MethodData(this.owner + "/" + this.name, this.desc); + return new SrgMethod(this.owner + "/" + this.name, this.desc); } /** @@ -410,12 +410,12 @@ public class MemberInfo { /** * Create a remapped version of this member using the supplied method data * - * @param methodData Method data to use + * @param srgMethod SRG method data to use * @param setOwner True to set the owner as well as the name * @return New MethodInfo with remapped values */ - public MemberInfo remapUsing(MethodData methodData, boolean setOwner) { - return new MemberInfo(this, methodData, setOwner); + public MemberInfo remapUsing(SrgMethod srgMethod, boolean setOwner) { + return new MemberInfo(this, srgMethod, setOwner); } /** @@ -517,7 +517,7 @@ public class MemberInfo { return new MemberInfo(name, owner, desc, false); } - public static MemberInfo fromSrgMethod(MethodData methodData) { - return new MemberInfo(methodData); + public static MemberInfo fromSrgMethod(SrgMethod srgMethod) { + return new MemberInfo(srgMethod); } } diff --git a/src/main/java/org/spongepowered/asm/obfuscation/SrgContainer.java b/src/main/java/org/spongepowered/asm/obfuscation/SrgContainer.java index 4611cce2..24dd72c2 100644 --- a/src/main/java/org/spongepowered/asm/obfuscation/SrgContainer.java +++ b/src/main/java/org/spongepowered/asm/obfuscation/SrgContainer.java @@ -44,7 +44,7 @@ public class SrgContainer { private final BiMap classMap = HashBiMap.create(); private final BiMap fieldMap = HashBiMap.create(); private final BiMap packageMap = HashBiMap.create(); - private final BiMap methodMap = HashBiMap.create(); + private final BiMap methodMap = HashBiMap.create(); public void readSrg(File srg) throws IOException { for (String line : Files.readLines(srg, Charset.defaultCharset())) { @@ -62,14 +62,14 @@ public class SrgContainer { } else if (type.equals("FD")) { this.fieldMap.forcePut(args[0], args[1]); } else if (type.equals("MD")) { - this.methodMap.forcePut(new MethodData(args[0], args[1]), new MethodData(args[2], args[3])); + this.methodMap.forcePut(new SrgMethod(args[0], args[1]), new SrgMethod(args[2], args[3])); } else { throw new RuntimeException("Invalid SRG file: " + srg); } } } - public MethodData getMethodMapping(MethodData methodName) { + public SrgMethod getMethodMapping(SrgMethod methodName) { return this.methodMap.get(methodName); } diff --git a/src/main/java/org/spongepowered/asm/obfuscation/MethodData.java b/src/main/java/org/spongepowered/asm/obfuscation/SrgMethod.java similarity index 89% rename from src/main/java/org/spongepowered/asm/obfuscation/MethodData.java rename to src/main/java/org/spongepowered/asm/obfuscation/SrgMethod.java index c9e13519..d57f28a6 100644 --- a/src/main/java/org/spongepowered/asm/obfuscation/MethodData.java +++ b/src/main/java/org/spongepowered/asm/obfuscation/SrgMethod.java @@ -26,14 +26,14 @@ package org.spongepowered.asm.obfuscation; import com.google.common.base.Objects; -public final class MethodData { +public final class SrgMethod { private final String name; private final String desc; - public MethodData(String name, String sig) { + public SrgMethod(String name, String desc) { this.name = name; - this.desc = sig; + this.desc = desc; } public String getName() { @@ -70,8 +70,8 @@ public final class MethodData { if (this == obj) { return true; } - if (obj instanceof MethodData) { - return Objects.equal(this.name, ((MethodData)obj).name) && Objects.equal(this.desc, ((MethodData)obj).desc); + if (obj instanceof SrgMethod) { + return Objects.equal(this.name, ((SrgMethod)obj).name) && Objects.equal(this.desc, ((SrgMethod)obj).desc); } return false; }