From 5e3743a0aca3529eacf9be400c8b8d7547f66e7f Mon Sep 17 00:00:00 2001
From: jeff
Date: Mon, 16 Mar 2015 19:22:22 -0400
Subject: started adding minimal support for generics fixed
 mark-as-deobfuscated issue

---
 src/cuchaz/enigma/analysis/SourceIndexClassVisitor.java | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/cuchaz/enigma/analysis/SourceIndexClassVisitor.java')

diff --git a/src/cuchaz/enigma/analysis/SourceIndexClassVisitor.java b/src/cuchaz/enigma/analysis/SourceIndexClassVisitor.java
index f4f4956..f4202b5 100644
--- a/src/cuchaz/enigma/analysis/SourceIndexClassVisitor.java
+++ b/src/cuchaz/enigma/analysis/SourceIndexClassVisitor.java
@@ -30,7 +30,6 @@ import cuchaz.enigma.mapping.ClassEntry;
 import cuchaz.enigma.mapping.ConstructorEntry;
 import cuchaz.enigma.mapping.EntryFactory;
 import cuchaz.enigma.mapping.FieldEntry;
-import cuchaz.enigma.mapping.Type;
 
 public class SourceIndexClassVisitor extends SourceIndexVisitor {
 	
@@ -93,8 +92,7 @@ public class SourceIndexClassVisitor extends SourceIndexVisitor {
 	@Override
 	public Void visitFieldDeclaration(FieldDeclaration node, SourceIndex index) {
 		FieldDefinition def = node.getUserData(Keys.FIELD_DEFINITION);
-		ClassEntry classEntry = new ClassEntry(def.getDeclaringType().getInternalName());
-		FieldEntry fieldEntry = new FieldEntry(classEntry, def.getName(), new Type(def.getErasedSignature()));
+		FieldEntry fieldEntry = EntryFactory.getFieldEntry(def);
 		assert (node.getVariables().size() == 1);
 		VariableInitializer variable = node.getVariables().firstOrNullObject();
 		index.addDeclaration(variable.getNameToken(), fieldEntry);
@@ -106,8 +104,7 @@ public class SourceIndexClassVisitor extends SourceIndexVisitor {
 	public Void visitEnumValueDeclaration(EnumValueDeclaration node, SourceIndex index) {
 		// treat enum declarations as field declarations
 		FieldDefinition def = node.getUserData(Keys.FIELD_DEFINITION);
-		ClassEntry classEntry = new ClassEntry(def.getDeclaringType().getInternalName());
-		FieldEntry fieldEntry = new FieldEntry(classEntry, def.getName(), new Type(def.getErasedSignature()));
+		FieldEntry fieldEntry = EntryFactory.getFieldEntry(def);
 		index.addDeclaration(node.getNameToken(), fieldEntry);
 		
 		return recurse(node, index);
-- 
cgit v1.2.3