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/Main.java | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

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

diff --git a/src/main/java/cuchaz/enigma/Main.java b/src/main/java/cuchaz/enigma/Main.java
index 0f15193..ccfc51f 100644
--- a/src/main/java/cuchaz/enigma/Main.java
+++ b/src/main/java/cuchaz/enigma/Main.java
@@ -11,12 +11,12 @@
 
 package cuchaz.enigma;
 
-import cuchaz.enigma.config.Config;
-import cuchaz.enigma.config.Themes;
 import cuchaz.enigma.gui.Gui;
+import cuchaz.enigma.translation.mapping.serde.MappingFormat;
 
-import javax.swing.*;
 import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.jar.JarFile;
 
 public class Main {
@@ -29,7 +29,12 @@ public class Main {
 			gui.getController().openJar(new JarFile(getFile(args[0])));
 		}
 		if (args.length >= 2) {
-			gui.getController().openEnigmaMappings(getFile(args[1]));
+			Path mappingsFile = getFile(args[1]).toPath();
+			if (Files.isDirectory(mappingsFile)) {
+				gui.getController().openMappings(MappingFormat.ENIGMA_DIRECTORY, mappingsFile);
+			} else {
+				gui.getController().openMappings(MappingFormat.ENIGMA_FILE, mappingsFile);
+			}
 		}
 
 		// DEBUG
-- 
cgit v1.2.3