From 959cb5fd4f9586ec3bd265b452fe25fe1db82e3f Mon Sep 17 00:00:00 2001 From: jeff Date: Tue, 13 Jan 2015 23:25:04 -0500 Subject: source format change don't hate me too much if you were planning a big merge. =P --- src/cuchaz/enigma/convert/ClassMatching.java | 152 +++++++++++---------------- 1 file changed, 61 insertions(+), 91 deletions(-) (limited to 'src/cuchaz/enigma/convert/ClassMatching.java') diff --git a/src/cuchaz/enigma/convert/ClassMatching.java b/src/cuchaz/enigma/convert/ClassMatching.java index e45c0e1..53b6f7f 100644 --- a/src/cuchaz/enigma/convert/ClassMatching.java +++ b/src/cuchaz/enigma/convert/ClassMatching.java @@ -24,180 +24,150 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; -public class ClassMatching -{ +public class ClassMatching { + private Multimap m_sourceClasses; private Multimap m_matchedDestClasses; private List m_unmatchedDestClasses; - public ClassMatching( ) - { + public ClassMatching() { m_sourceClasses = ArrayListMultimap.create(); m_matchedDestClasses = ArrayListMultimap.create(); m_unmatchedDestClasses = Lists.newArrayList(); } - - public void addSource( ClassIdentity c ) - { - m_sourceClasses.put( c, c ); + + public void addSource(ClassIdentity c) { + m_sourceClasses.put(c, c); } - public void matchDestClass( ClassIdentity destClass ) - { - Collection matchedSourceClasses = m_sourceClasses.get( destClass ); - if( matchedSourceClasses.isEmpty() ) - { + public void matchDestClass(ClassIdentity destClass) { + Collection matchedSourceClasses = m_sourceClasses.get(destClass); + if (matchedSourceClasses.isEmpty()) { // no match - m_unmatchedDestClasses.add( destClass ); - } - else - { + m_unmatchedDestClasses.add(destClass); + } else { // found a match - m_matchedDestClasses.put( destClass, destClass ); + m_matchedDestClasses.put(destClass, destClass); // DEBUG ClassIdentity sourceClass = matchedSourceClasses.iterator().next(); - assert( sourceClass.hashCode() == destClass.hashCode() ); - assert( sourceClass.equals( destClass ) ); + assert (sourceClass.hashCode() == destClass.hashCode()); + assert (sourceClass.equals(destClass)); } } - public void removeSource( ClassIdentity sourceClass ) - { - m_sourceClasses.remove( sourceClass, sourceClass ); + public void removeSource(ClassIdentity sourceClass) { + m_sourceClasses.remove(sourceClass, sourceClass); } - public void removeDest( ClassIdentity destClass ) - { - m_matchedDestClasses.remove( destClass, destClass ); - m_unmatchedDestClasses.remove( destClass ); + public void removeDest(ClassIdentity destClass) { + m_matchedDestClasses.remove(destClass, destClass); + m_unmatchedDestClasses.remove(destClass); } - public List getSourceClasses( ) - { - return new ArrayList( m_sourceClasses.values() ); + public List getSourceClasses() { + return new ArrayList(m_sourceClasses.values()); } - public List getDestClasses( ) - { + public List getDestClasses() { List classes = Lists.newArrayList(); - classes.addAll( m_matchedDestClasses.values() ); - classes.addAll( m_unmatchedDestClasses ); + classes.addAll(m_matchedDestClasses.values()); + classes.addAll(m_unmatchedDestClasses); return classes; } - public BiMap getUniqueMatches( ) - { + public BiMap getUniqueMatches() { BiMap uniqueMatches = HashBiMap.create(); - for( ClassIdentity sourceClass : m_sourceClasses.keySet() ) - { - Collection matchedSourceClasses = m_sourceClasses.get( sourceClass ); - Collection matchedDestClasses = m_matchedDestClasses.get( sourceClass ); - if( matchedSourceClasses.size() == 1 && matchedDestClasses.size() == 1 ) - { + for (ClassIdentity sourceClass : m_sourceClasses.keySet()) { + Collection matchedSourceClasses = m_sourceClasses.get(sourceClass); + Collection matchedDestClasses = m_matchedDestClasses.get(sourceClass); + if (matchedSourceClasses.size() == 1 && matchedDestClasses.size() == 1) { ClassIdentity matchedSourceClass = matchedSourceClasses.iterator().next(); ClassIdentity matchedDestClass = matchedDestClasses.iterator().next(); - uniqueMatches.put( matchedSourceClass, matchedDestClass ); + uniqueMatches.put(matchedSourceClass, matchedDestClass); } } return uniqueMatches; } - public BiMap,List> getAmbiguousMatches( ) - { + public BiMap,List> getAmbiguousMatches() { BiMap,List> ambiguousMatches = HashBiMap.create(); - for( ClassIdentity sourceClass : m_sourceClasses.keySet() ) - { - Collection matchedSourceClasses = m_sourceClasses.get( sourceClass ); - Collection matchedDestClasses = m_matchedDestClasses.get( sourceClass ); - if( matchedSourceClasses.size() > 1 && matchedDestClasses.size() > 1 ) - { + for (ClassIdentity sourceClass : m_sourceClasses.keySet()) { + Collection matchedSourceClasses = m_sourceClasses.get(sourceClass); + Collection matchedDestClasses = m_matchedDestClasses.get(sourceClass); + if (matchedSourceClasses.size() > 1 && matchedDestClasses.size() > 1) { ambiguousMatches.put( - new ArrayList( matchedSourceClasses ), - new ArrayList( matchedDestClasses ) + new ArrayList(matchedSourceClasses), + new ArrayList(matchedDestClasses) ); } } return ambiguousMatches; } - public int getNumAmbiguousSourceMatches( ) - { + public int getNumAmbiguousSourceMatches() { int num = 0; - for( Map.Entry,List> entry : getAmbiguousMatches().entrySet() ) - { + for (Map.Entry,List> entry : getAmbiguousMatches().entrySet()) { num += entry.getKey().size(); } return num; } - public int getNumAmbiguousDestMatches( ) - { + public int getNumAmbiguousDestMatches() { int num = 0; - for( Map.Entry,List> entry : getAmbiguousMatches().entrySet() ) - { + for (Map.Entry,List> entry : getAmbiguousMatches().entrySet()) { num += entry.getValue().size(); } return num; } - public List getUnmatchedSourceClasses( ) - { + public List getUnmatchedSourceClasses() { List classes = Lists.newArrayList(); - for( ClassIdentity sourceClass : getSourceClasses() ) - { - if( m_matchedDestClasses.get( sourceClass ).isEmpty() ) - { - classes.add( sourceClass ); + for (ClassIdentity sourceClass : getSourceClasses()) { + if (m_matchedDestClasses.get(sourceClass).isEmpty()) { + classes.add(sourceClass); } } return classes; } - public List getUnmatchedDestClasses( ) - { - return new ArrayList( m_unmatchedDestClasses ); + public List getUnmatchedDestClasses() { + return new ArrayList(m_unmatchedDestClasses); } - public Map>> getIndex( ) - { + public Map>> getIndex() { Map>> conversion = Maps.newHashMap(); - for( Map.Entry entry : getUniqueMatches().entrySet() ) - { + for (Map.Entry entry : getUniqueMatches().entrySet()) { conversion.put( entry.getKey().getClassEntry().getName(), - new AbstractMap.SimpleEntry>( entry.getKey(), Arrays.asList( entry.getValue() ) ) + new AbstractMap.SimpleEntry>(entry.getKey(), Arrays.asList(entry.getValue())) ); } - for( Map.Entry,List> entry : getAmbiguousMatches().entrySet() ) - { - for( ClassIdentity sourceClass : entry.getKey() ) - { + for (Map.Entry,List> entry : getAmbiguousMatches().entrySet()) { + for (ClassIdentity sourceClass : entry.getKey()) { conversion.put( sourceClass.getClassEntry().getName(), - new AbstractMap.SimpleEntry>( sourceClass, entry.getValue() ) + new AbstractMap.SimpleEntry>(sourceClass, entry.getValue()) ); } } - for( ClassIdentity sourceClass : getUnmatchedSourceClasses() ) - { + for (ClassIdentity sourceClass : getUnmatchedSourceClasses()) { conversion.put( sourceClass.getClassEntry().getName(), - new AbstractMap.SimpleEntry>( sourceClass, getUnmatchedDestClasses() ) + new AbstractMap.SimpleEntry>(sourceClass, getUnmatchedDestClasses()) ); } return conversion; } @Override - public String toString( ) - { + public String toString() { StringBuilder buf = new StringBuilder(); - buf.append( String.format( "%12s%8s%8s\n", "", "Source", "Dest" ) ); - buf.append( String.format( "%12s%8d%8d\n", "Classes", getSourceClasses().size(), getDestClasses().size() ) ); - buf.append( String.format( "%12s%8d%8d\n", "Unique", getUniqueMatches().size(), getUniqueMatches().size() ) ); - buf.append( String.format( "%12s%8d%8d\n", "Ambiguous", getNumAmbiguousSourceMatches(), getNumAmbiguousDestMatches() ) ); - buf.append( String.format( "%12s%8d%8d\n", "Unmatched", getUnmatchedSourceClasses().size(), getUnmatchedDestClasses().size() ) ); + buf.append(String.format("%12s%8s%8s\n", "", "Source", "Dest")); + buf.append(String.format("%12s%8d%8d\n", "Classes", getSourceClasses().size(), getDestClasses().size())); + buf.append(String.format("%12s%8d%8d\n", "Unique", getUniqueMatches().size(), getUniqueMatches().size())); + buf.append(String.format("%12s%8d%8d\n", "Ambiguous", getNumAmbiguousSourceMatches(), getNumAmbiguousDestMatches())); + buf.append(String.format("%12s%8d%8d\n", "Unmatched", getUnmatchedSourceClasses().size(), getUnmatchedDestClasses().size())); return buf.toString(); } } -- cgit v1.2.3