From 57f45b0409d5363782052183bb090175c469f89a Mon Sep 17 00:00:00 2001 From: jeff Date: Mon, 4 Aug 2014 00:26:48 -0400 Subject: added stable save order for mappings to hopefully help with merging added color-coding for source identifiers redesigned rename GUI customized editor pane, added popup menu finished name validation added last-chance save on window close --- src/cuchaz/enigma/mapping/ArgumentMapping.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/cuchaz/enigma/mapping/ArgumentMapping.java') diff --git a/src/cuchaz/enigma/mapping/ArgumentMapping.java b/src/cuchaz/enigma/mapping/ArgumentMapping.java index d5e020a..168306a 100644 --- a/src/cuchaz/enigma/mapping/ArgumentMapping.java +++ b/src/cuchaz/enigma/mapping/ArgumentMapping.java @@ -12,7 +12,7 @@ package cuchaz.enigma.mapping; import java.io.Serializable; -public class ArgumentMapping implements Serializable +public class ArgumentMapping implements Serializable, Comparable { private static final long serialVersionUID = 8610742471440861315L; @@ -23,7 +23,7 @@ public class ArgumentMapping implements Serializable public ArgumentMapping( int index, String name ) { m_index = index; - m_name = name; + m_name = NameValidator.validateArgumentName( name ); } public int getIndex( ) @@ -37,6 +37,12 @@ public class ArgumentMapping implements Serializable } public void setName( String val ) { - m_name = val; + m_name = NameValidator.validateArgumentName( val ); + } + + @Override + public int compareTo( ArgumentMapping other ) + { + return Integer.compare( m_index, other.m_index ); } } -- cgit v1.2.3