From 76be350b3c54ea88cc1a95b5cf0d1db153f2edb3 Mon Sep 17 00:00:00 2001 From: jeff Date: Sun, 3 Aug 2014 11:16:33 -0400 Subject: fixed bugs with saving mappings got argument renaming to work --- src/cuchaz/enigma/mapping/EntryPair.java | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) (limited to 'src/cuchaz/enigma/mapping/EntryPair.java') diff --git a/src/cuchaz/enigma/mapping/EntryPair.java b/src/cuchaz/enigma/mapping/EntryPair.java index e40e999..e3325b3 100644 --- a/src/cuchaz/enigma/mapping/EntryPair.java +++ b/src/cuchaz/enigma/mapping/EntryPair.java @@ -10,37 +10,15 @@ ******************************************************************************/ package cuchaz.enigma.mapping; -import cuchaz.enigma.Util; -public class EntryPair +public class EntryPair { - public Entry obf; - public Entry deobf; + public T obf; + public T deobf; - public EntryPair( Entry obf, Entry deobf ) + public EntryPair( T obf, T deobf ) { this.obf = obf; this.deobf = deobf; } - - @Override - public int hashCode( ) - { - return Util.combineHashesOrdered( obf, deobf ); - } - - @Override - public boolean equals( Object other ) - { - if( other instanceof EntryPair ) - { - return equals( (EntryPair)other ); - } - return false; - } - - public boolean equals( EntryPair other ) - { - return obf.equals( other.obf ) && deobf.equals( other.deobf ); - } } -- cgit v1.2.3