From 00fcd0550fcdda621c2e4662f6ddd55ce673b931 Mon Sep 17 00:00:00 2001
From: Gegy
Date: Thu, 24 Jan 2019 14:48:32 +0200
Subject: [WIP] Mapping rework (#91)

* Move packages

* Mapping & entry refactor: first pass

* Fix deobf -> obf tree remapping

* Resolve various issues

* Give all entries the potential for parents and treat inner classes as children

* Deobf UI tree elements

* Tests pass

* Sort mapping output

* Fix delta tracking

* Index separation and first pass for #97

* Keep track of remapped jar index

* Fix child entries not being remapped

* Drop non-root entries

* Track dropped mappings

* Fix enigma mapping ordering

* EntryTreeNode interface

* Small tweaks

* Naive full index remap on rename

* Entries can resolve to more than one root entry

* Support alternative resolution strategies

* Bridge method resolution

* Tests pass

* Fix mappings being used where there are none

* Fix methods with different descriptors being considered unique. closes #89
---
 src/main/java/cuchaz/enigma/mapping/Signature.java | 82 ----------------------
 1 file changed, 82 deletions(-)
 delete mode 100644 src/main/java/cuchaz/enigma/mapping/Signature.java

(limited to 'src/main/java/cuchaz/enigma/mapping/Signature.java')

diff --git a/src/main/java/cuchaz/enigma/mapping/Signature.java b/src/main/java/cuchaz/enigma/mapping/Signature.java
deleted file mode 100644
index 071e4af..0000000
--- a/src/main/java/cuchaz/enigma/mapping/Signature.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package cuchaz.enigma.mapping;
-
-import cuchaz.enigma.bytecode.translators.TranslationSignatureVisitor;
-import org.objectweb.asm.signature.SignatureReader;
-import org.objectweb.asm.signature.SignatureVisitor;
-import org.objectweb.asm.signature.SignatureWriter;
-
-import java.util.function.Function;
-import java.util.regex.Pattern;
-
-public class Signature {
-	private static final Pattern OBJECT_PATTERN = Pattern.compile(".*:Ljava/lang/Object;:.*");
-
-	private final String signature;
-	private final boolean isType;
-
-	private Signature(String signature, boolean isType) {
-		if (signature != null && OBJECT_PATTERN.matcher(signature).matches()) {
-			signature = signature.replaceAll(":Ljava/lang/Object;:", "::");
-		}
-
-		this.signature = signature;
-		this.isType = isType;
-	}
-
-	public static Signature createTypedSignature(String signature) {
-		if (signature != null && !signature.isEmpty()) {
-			return new Signature(signature, true);
-		}
-		return new Signature(null, true);
-	}
-
-	public static Signature createSignature(String signature) {
-		if (signature != null && !signature.isEmpty()) {
-			return new Signature(signature, false);
-		}
-		return new Signature(null, false);
-	}
-
-	public String getSignature() {
-		return signature;
-	}
-
-	public boolean isType() {
-		return isType;
-	}
-
-	public Signature remap(Function<String, String> remapper) {
-		if (signature == null) {
-			return this;
-		}
-		SignatureWriter writer = new SignatureWriter();
-		SignatureVisitor visitor = new TranslationSignatureVisitor(remapper, writer);
-		if (isType) {
-			new SignatureReader(signature).acceptType(visitor);
-		} else {
-			new SignatureReader(signature).accept(visitor);
-		}
-		return new Signature(writer.toString(), isType);
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (obj instanceof Signature) {
-			Signature other = (Signature) obj;
-			return (other.signature == null && signature == null || other.signature != null
-					&& signature != null && other.signature.equals(signature))
-					&& other.isType == this.isType;
-		}
-		return false;
-	}
-
-	@Override
-	public int hashCode() {
-		return signature.hashCode() | (isType ? 1 : 0) << 16;
-	}
-
-	@Override
-	public String toString() {
-		return signature;
-	}
-}
-- 
cgit v1.2.3