[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

1 files changed, 0 insertions, 100 deletions

diff --git a/src/main/java/cuchaz/enigma/mapping/FieldMapping.java b/src/main/java/cuchaz/enigma/mapping/FieldMapping.java
deleted file mode 100644
index 8fbe095..0000000
--- a/src/main/java/cuchaz/enigma/mapping/FieldMapping.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 Jeff Martin.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser General Public
- * License v3.0 which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl.html
- * <p>
- * Contributors:
- * Jeff Martin - initial API and implementation
- ******************************************************************************/
-
-package cuchaz.enigma.mapping;
-
-import cuchaz.enigma.mapping.entry.ClassEntry;
-import cuchaz.enigma.mapping.entry.FieldEntry;
-import cuchaz.enigma.throwables.IllegalNameException;
-
-public class FieldMapping implements Comparable<FieldMapping>, MemberMapping<FieldEntry> {
-
-        private String obfName;
-        private String deobfName;
-        private TypeDescriptor obfDesc;
-        private Mappings.EntryModifier modifier;
-
-        public FieldMapping(String obfName, TypeDescriptor obfDesc, String deobfName, Mappings.EntryModifier modifier) {
-                this.obfName = obfName;
-                this.deobfName = NameValidator.validateFieldName(deobfName);
-                this.obfDesc = obfDesc;
-                this.modifier = modifier;
-        }
-
-        @Override
-        public FieldEntry getObfEntry(ClassEntry classEntry) {
-                return new FieldEntry(classEntry, this.obfName, this.obfDesc);
-        }
-
-        @Override
-        public String getObfName() {
-                return this.obfName;
-        }
-
-        public void setObfName(String name) {
-                try {
-                        NameValidator.validateMethodName(name);
-                } catch (IllegalNameException ex) {
-                        // Invalid name, damn obfuscation! Map to a deob name with another name to avoid issues
-                        if (this.deobfName == null) {
-                                System.err.println("WARNING: " + name + " is conflicting, auto deobfuscate to " + (name + "_auto_deob"));
-                                setDeobfName(name + "_auto_deob");
-                        }
-                }
-                this.obfName = name;
-        }
-
-        public String getDeobfName() {
-                return this.deobfName;
-        }
-
-        public void setDeobfName(String val) {
-                this.deobfName = NameValidator.validateFieldName(val);
-        }
-
-        public TypeDescriptor getObfDesc() {
-                return this.obfDesc;
-        }
-
-        public void setObfDesc(TypeDescriptor val) {
-                this.obfDesc = val;
-        }
-
-        public Mappings.EntryModifier getModifier() {
-                return modifier;
-        }
-
-        public void setModifier(Mappings.EntryModifier modifier) {
-                this.modifier = modifier;
-        }
-
-        @Override
-        public int compareTo(FieldMapping other) {
-                return (this.obfName + this.obfDesc).compareTo(other.obfName + other.obfDesc);
-        }
-
-        public boolean renameObfClass(final String oldObfClassName, final String newObfClassName) {
-                // rename obf classes in the desc
-                TypeDescriptor newDesc = this.obfDesc.remap(className -> {
-                        if (className.equals(oldObfClassName)) {
-                                return newObfClassName;
-                        }
-                        return className;
-                });
-
-                if (!newDesc.equals(this.obfDesc)) {
-                        this.obfDesc = newDesc;
-                        return true;
-                }
-                return false;
-        }
-
-}