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
---
 .../cuchaz/enigma/mapping/MappingsChecker.java     | 101 ---------------------
 1 file changed, 101 deletions(-)
 delete mode 100644 src/main/java/cuchaz/enigma/mapping/MappingsChecker.java

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

diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsChecker.java b/src/main/java/cuchaz/enigma/mapping/MappingsChecker.java
deleted file mode 100644
index a42f255..0000000
--- a/src/main/java/cuchaz/enigma/mapping/MappingsChecker.java
+++ /dev/null
@@ -1,101 +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 com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import cuchaz.enigma.analysis.JarIndex;
-import cuchaz.enigma.mapping.entry.ClassEntry;
-import cuchaz.enigma.mapping.entry.EntryFactory;
-import cuchaz.enigma.mapping.entry.FieldEntry;
-import cuchaz.enigma.mapping.entry.MethodEntry;
-
-import java.util.Map;
-
-public class MappingsChecker {
-
-	private JarIndex index;
-	private Map<ClassEntry, ClassMapping> droppedClassMappings;
-	private Map<ClassEntry, ClassMapping> droppedInnerClassMappings;
-	private Map<FieldEntry, FieldMapping> droppedFieldMappings;
-	private Map<MethodEntry, MethodMapping> droppedMethodMappings;
-
-	public MappingsChecker(JarIndex index) {
-		this.index = index;
-		this.droppedClassMappings = Maps.newHashMap();
-		this.droppedInnerClassMappings = Maps.newHashMap();
-		this.droppedFieldMappings = Maps.newHashMap();
-		this.droppedMethodMappings = Maps.newHashMap();
-	}
-
-	public Map<ClassEntry, ClassMapping> getDroppedClassMappings() {
-		return this.droppedClassMappings;
-	}
-
-	public Map<ClassEntry, ClassMapping> getDroppedInnerClassMappings() {
-		return this.droppedInnerClassMappings;
-	}
-
-	public Map<FieldEntry, FieldMapping> getDroppedFieldMappings() {
-		return this.droppedFieldMappings;
-	}
-
-	public Map<MethodEntry, MethodMapping> getDroppedMethodMappings() {
-		return this.droppedMethodMappings;
-	}
-
-	public void dropBrokenMappings(Mappings mappings) {
-		for (ClassMapping classMapping : Lists.newArrayList(mappings.classes())) {
-			if (!checkClassMapping(classMapping)) {
-				mappings.removeClassMapping(classMapping);
-				this.droppedClassMappings.put(EntryFactory.getObfClassEntry(this.index, classMapping), classMapping);
-			}
-		}
-	}
-
-	private boolean checkClassMapping(ClassMapping classMapping) {
-
-		// check the class
-		ClassEntry classEntry = EntryFactory.getObfClassEntry(this.index, classMapping);
-		if (!this.index.getObfClassEntries().contains(classEntry)) {
-			return false;
-		}
-
-		// check the fields
-		for (FieldMapping fieldMapping : Lists.newArrayList(classMapping.fields())) {
-			FieldEntry obfFieldEntry = EntryFactory.getObfFieldEntry(classMapping, fieldMapping);
-			if (!this.index.containsObfField(obfFieldEntry)) {
-				classMapping.removeFieldMapping(fieldMapping);
-				this.droppedFieldMappings.put(obfFieldEntry, fieldMapping);
-			}
-		}
-
-		// check methods
-		for (MethodMapping methodMapping : Lists.newArrayList(classMapping.methods())) {
-			MethodEntry obfMethodEntry = EntryFactory.getObfMethodEntry(classEntry, methodMapping);
-			if (!this.index.containsObfMethod(obfMethodEntry)) {
-				classMapping.removeMethodMapping(methodMapping);
-				this.droppedMethodMappings.put(obfMethodEntry, methodMapping);
-			}
-		}
-
-		// check inner classes
-		for (ClassMapping innerClassMapping : Lists.newArrayList(classMapping.innerClasses())) {
-			if (!checkClassMapping(innerClassMapping)) {
-				classMapping.removeInnerClassMapping(innerClassMapping);
-				this.droppedInnerClassMappings.put(EntryFactory.getObfClassEntry(this.index, innerClassMapping), innerClassMapping);
-			}
-		}
-
-		return true;
-	}
-}
-- 
cgit v1.2.3