From 430df87ba5d855ca29bc53a5765a2862d2209098 Mon Sep 17 00:00:00 2001
From: jeff
Date: Tue, 10 Mar 2015 00:55:03 -0400
Subject: tweaks and improvements to field matching gui

---
 src/cuchaz/enigma/convert/MatchesReader.java | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'src/cuchaz/enigma/convert/MatchesReader.java')

diff --git a/src/cuchaz/enigma/convert/MatchesReader.java b/src/cuchaz/enigma/convert/MatchesReader.java
index 1dd042d..921ab1d 100644
--- a/src/cuchaz/enigma/convert/MatchesReader.java
+++ b/src/cuchaz/enigma/convert/MatchesReader.java
@@ -58,15 +58,19 @@ public class MatchesReader {
 	}
 
 	private static void readFieldMatch(FieldMatches matches, String line) {
-		String[] parts = line.split(":", 2);
-		FieldEntry source = readField(parts[0]);
-		FieldEntry dest = readField(parts[1]);
-		if (source != null && dest != null) {
-			matches.addMatch(source, dest);
-		} else if (source != null) {
-			matches.addUnmatchedSourceField(source);
-		} else if (dest != null) {
-			matches.addUnmatchedDestField(dest);
+		if (line.startsWith("!")) {
+			matches.addUnmatchableSourceField(readField(line.substring(1)));
+		} else {
+			String[] parts = line.split(":", 2);
+			FieldEntry source = readField(parts[0]);
+			FieldEntry dest = readField(parts[1]);
+			if (source != null && dest != null) {
+				matches.addMatch(source, dest);
+			} else if (source != null) {
+				matches.addUnmatchedSourceField(source);
+			} else if (dest != null) {
+				matches.addUnmatchedDestField(dest);
+			}
 		}
 	}
 
-- 
cgit v1.2.3