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

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

diff --git a/src/main/java/cuchaz/enigma/mapping/LocalVariableMapping.java b/src/main/java/cuchaz/enigma/mapping/LocalVariableMapping.java
deleted file mode 100644
index bfe66b2..0000000
--- a/src/main/java/cuchaz/enigma/mapping/LocalVariableMapping.java
+++ /dev/null
@@ -1,58 +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.LocalVariableEntry;
-import cuchaz.enigma.mapping.entry.MethodEntry;
-
-public class LocalVariableMapping implements Comparable<LocalVariableMapping> {
-
-	private int index;
-	private String name;
-
-	// NOTE: this argument order is important for the MethodReader/MethodWriter
-	public LocalVariableMapping(int index, String name) {
-		this.index = index;
-		this.name = NameValidator.validateArgumentName(name);
-	}
-
-	public LocalVariableMapping(LocalVariableMapping other) {
-		this.index = other.index;
-		this.name = other.name;
-	}
-
-	public int getIndex() {
-		return this.index;
-	}
-
-	public String getName() {
-		return this.name;
-	}
-
-	public void setName(String val) {
-		this.name = NameValidator.validateArgumentName(val);
-	}
-
-	@Deprecated
-	public LocalVariableEntry getObfEntry(MethodEntry methodEntry) {
-		return new LocalVariableEntry(methodEntry, index, name);
-	}
-
-	public LocalVariableEntry getObfEntry(MethodEntry methodEntry, boolean parameter) {
-		return new LocalVariableEntry(methodEntry, index, name, parameter);
-	}
-
-	@Override
-	public int compareTo(LocalVariableMapping other) {
-		return Integer.compare(this.index, other.index);
-	}
-}
-- 
cgit v1.2.3