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

(limited to 'src/main/java/cuchaz/enigma/bytecode/AccessFlags.java')

diff --git a/src/main/java/cuchaz/enigma/bytecode/AccessFlags.java b/src/main/java/cuchaz/enigma/bytecode/AccessFlags.java
deleted file mode 100644
index 31c8691..0000000
--- a/src/main/java/cuchaz/enigma/bytecode/AccessFlags.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package cuchaz.enigma.bytecode;
-
-import cuchaz.enigma.analysis.Access;
-import org.objectweb.asm.Opcodes;
-
-import java.lang.reflect.Modifier;
-
-public class AccessFlags {
-	private int flags;
-
-	public AccessFlags(int flags) {
-		this.flags = flags;
-	}
-
-	public boolean isPrivate() {
-		return Modifier.isPrivate(this.flags);
-	}
-
-	public boolean isProtected() {
-		return Modifier.isProtected(this.flags);
-	}
-
-	public boolean isPublic() {
-		return Modifier.isPublic(this.flags);
-	}
-
-	public boolean isSynthetic() {
-		return (this.flags & Opcodes.ACC_SYNTHETIC) != 0;
-	}
-
-	public boolean isStatic() {
-		return Modifier.isStatic(this.flags);
-	}
-
-	public boolean isEnum() {
-		return (flags & Opcodes.ACC_ENUM) != 0;
-	}
-
-	public boolean isBridge() {
-		return (flags & Opcodes.ACC_BRIDGE) != 0;
-	}
-
-	public AccessFlags setPrivate() {
-		this.setVisibility(Opcodes.ACC_PRIVATE);
-		return this;
-	}
-
-	public AccessFlags setProtected() {
-		this.setVisibility(Opcodes.ACC_PROTECTED);
-		return this;
-	}
-
-	public AccessFlags setPublic() {
-		this.setVisibility(Opcodes.ACC_PUBLIC);
-		return this;
-	}
-
-	public AccessFlags setBridge() {
-		flags |= Opcodes.ACC_BRIDGE;
-		return this;
-	}
-
-	@Deprecated
-	public AccessFlags setBridged() {
-		return setBridge();
-	}
-
-	public void setVisibility(int visibility) {
-		this.resetVisibility();
-		this.flags |= visibility;
-	}
-
-	private void resetVisibility() {
-		this.flags &= ~(Opcodes.ACC_PRIVATE | Opcodes.ACC_PROTECTED | Opcodes.ACC_PUBLIC);
-	}
-
-	public int getFlags() {
-		return this.flags;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		return obj instanceof AccessFlags && ((AccessFlags) obj).flags == flags;
-	}
-
-	@Override
-	public int hashCode() {
-		return flags;
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder builder = new StringBuilder(Access.get(this).toString().toLowerCase());
-		if (isStatic()) {
-			builder.append(" static");
-		}
-		if (isSynthetic()) {
-			builder.append(" synthetic");
-		}
-		if (isBridge()) {
-			builder.append(" bridge");
-		}
-		return builder.toString();
-	}
-}
-- 
cgit v1.2.3