From b19f9e0fd1a5c50dd1ed13dbcb057839c8296f77 Mon Sep 17 00:00:00 2001
From: Thog
Date: Mon, 15 May 2017 00:02:18 +0200
Subject: Add offset for Enum constructor arguments (Fix #58)

---
 src/main/java/cuchaz/enigma/gui/ClassMatchingGui.java |  1 -
 src/main/java/cuchaz/enigma/gui/ClassSelector.java    | 10 +++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/main/java/cuchaz/enigma/gui')

diff --git a/src/main/java/cuchaz/enigma/gui/ClassMatchingGui.java b/src/main/java/cuchaz/enigma/gui/ClassMatchingGui.java
index ce1c1ce..833a534 100644
--- a/src/main/java/cuchaz/enigma/gui/ClassMatchingGui.java
+++ b/src/main/java/cuchaz/enigma/gui/ClassMatchingGui.java
@@ -192,7 +192,6 @@ public class ClassMatchingGui {
 		} catch (MappingConflict ex) {
 			System.out.println(ex.getMessage());
 			ex.printStackTrace();
-			return;
 		}
 	}
 
diff --git a/src/main/java/cuchaz/enigma/gui/ClassSelector.java b/src/main/java/cuchaz/enigma/gui/ClassSelector.java
index 8df2194..ed84ef2 100644
--- a/src/main/java/cuchaz/enigma/gui/ClassSelector.java
+++ b/src/main/java/cuchaz/enigma/gui/ClassSelector.java
@@ -316,8 +316,11 @@ public class ClassSelector extends JTree {
 	}
 
 	public ClassEntry getFirstClass() {
-		for (ClassSelectorPackageNode packageNode : packageNodes()) {
-			for (ClassSelectorClassNode classNode : classNodes(packageNode)) {
+		ClassSelectorPackageNode packageNode = packageNodes().get(0);
+		if (packageNode != null)
+		{
+			ClassSelectorClassNode classNode = classNodes(packageNode).get(0);
+			if (classNode != null) {
 				return classNode.getClassEntry();
 			}
 		}
@@ -360,7 +363,8 @@ public class ClassSelector extends JTree {
 				}
 			} else {
 				// return the next class
-				for (ClassSelectorClassNode classNode : classNodes(packageNode)) {
+				ClassSelectorClassNode classNode = classNodes(packageNode).get(0);
+				if (classNode != null) {
 					return classNode.getClassEntry();
 				}
 			}
-- 
cgit v1.2.3