From c4970cc4addedd4565cf8c3ed9ea92b6a4487e0c Mon Sep 17 00:00:00 2001
From: Thomas Guillemard
Date: Fri, 12 Aug 2016 19:23:54 +0200
Subject: Implement Enigma directory format (#1)

Others changes:
~ Rework File menu
~ Force UTF-8 for all I/O operations
~ Enigma now detect the original file format and use the correct one when you save a mapping---
 .../cuchaz/enigma/mapping/MappingsReaderOld.java   | 127 ---------------------
 1 file changed, 127 deletions(-)
 delete mode 100644 src/main/java/cuchaz/enigma/mapping/MappingsReaderOld.java

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

diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsReaderOld.java b/src/main/java/cuchaz/enigma/mapping/MappingsReaderOld.java
deleted file mode 100644
index 776d908..0000000
--- a/src/main/java/cuchaz/enigma/mapping/MappingsReaderOld.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package cuchaz.enigma.mapping;
-
-import com.google.common.collect.Queues;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.util.Deque;
-
-import cuchaz.enigma.throwables.MappingConflict;
-import cuchaz.enigma.throwables.MappingParseException;
-
-public class MappingsReaderOld {
-
-    public Mappings read(Reader in) throws IOException, MappingParseException {
-        return read(new BufferedReader(in));
-    }
-
-    public Mappings read(BufferedReader in) throws IOException, MappingParseException {
-        Mappings mappings = new Mappings();
-        Deque<Object> mappingStack = Queues.newArrayDeque();
-
-        int lineNumber = 0;
-        String line;
-        while ((line = in.readLine()) != null) {
-            lineNumber++;
-
-            // strip comments
-            int commentPos = line.indexOf('#');
-            if (commentPos >= 0) {
-                line = line.substring(0, commentPos);
-            }
-
-            // skip blank lines
-            if (line.trim().length() <= 0) {
-                continue;
-            }
-
-            // get the indent of this line
-            int indent = 0;
-            for (int i = 0; i < line.length(); i++) {
-                if (line.charAt(i) != '\t') {
-                    break;
-                }
-                indent++;
-            }
-
-            // handle stack pops
-            while (indent < mappingStack.size()) {
-                mappingStack.pop();
-            }
-
-            String[] parts = line.trim().split("\\s");
-            try {
-                // read the first token
-                String token = parts[0];
-
-                if (token.equalsIgnoreCase("CLASS")) {
-                    ClassMapping classMapping;
-                    if (indent <= 0) {
-                        // outer class
-                        classMapping = readClass(parts);
-                        mappings.addClassMapping(classMapping);
-                    } else {
-
-                        // inner class
-                        if (!(mappingStack.peek() instanceof ClassMapping)) {
-                            throw new MappingParseException(lineNumber, "Unexpected CLASS entry here!");
-                        }
-
-                        classMapping = readClass(parts);
-                        ((ClassMapping) mappingStack.peek()).addInnerClassMapping(classMapping);
-                    }
-                    mappingStack.push(classMapping);
-                } else if (token.equalsIgnoreCase("FIELD")) {
-                    if (mappingStack.isEmpty() || !(mappingStack.peek() instanceof ClassMapping)) {
-                        throw new MappingParseException(lineNumber, "Unexpected FIELD entry here!");
-                    }
-                    ((ClassMapping) mappingStack.peek()).addFieldMapping(readField(parts));
-                } else if (token.equalsIgnoreCase("METHOD")) {
-                    if (mappingStack.isEmpty() || !(mappingStack.peek() instanceof ClassMapping)) {
-                        throw new MappingParseException(lineNumber, "Unexpected METHOD entry here!");
-                    }
-                    MethodMapping methodMapping = readMethod(parts);
-                    ((ClassMapping) mappingStack.peek()).addMethodMapping(methodMapping);
-                    mappingStack.push(methodMapping);
-                } else if (token.equalsIgnoreCase("ARG")) {
-                    if (mappingStack.isEmpty() || !(mappingStack.peek() instanceof MethodMapping)) {
-                        throw new MappingParseException(lineNumber, "Unexpected ARG entry here!");
-                    }
-                    ((MethodMapping) mappingStack.peek()).addArgumentMapping(readArgument(parts));
-                }
-            } catch (ArrayIndexOutOfBoundsException | IllegalArgumentException ex) {
-                throw new MappingParseException(lineNumber, "Malformed line:\n" + line);
-            } catch (MappingConflict e) {
-                e.printStackTrace();
-            }
-        }
-
-        return mappings;
-    }
-
-    private ArgumentMapping readArgument(String[] parts) {
-        return new ArgumentMapping(Integer.parseInt(parts[1]), parts[2]);
-    }
-
-    private ClassMapping readClass(String[] parts) {
-        if (parts.length == 2) {
-            return new ClassMapping(parts[1]);
-        } else {
-            return new ClassMapping(parts[1], parts[2]);
-        }
-    }
-
-    /* TEMP */
-    protected FieldMapping readField(String[] parts) {
-        return new FieldMapping(parts[1], new Type(parts[3]), parts[2]);
-    }
-
-    private MethodMapping readMethod(String[] parts) {
-        if (parts.length == 3) {
-            return new MethodMapping(parts[1], new Signature(parts[2]));
-        } else {
-            return new MethodMapping(parts[1], new Signature(parts[3]), parts[2]);
-        }
-    }
-}
-- 
cgit v1.2.3