X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Finspector%2Fjava%2Fstructure%2FFieldDescriptor.java;h=902d4152f9b5750a4d386c1316cf33b648be278e;hb=9d9b65fb1909e12606e76ed0625706e446f588fb;hp=216267469b10c2469c081f2fd3a2b77dd2a6517a;hpb=31e8e0b97c9f60f8820d708fa86c11d65f5445f3;p=javainspect.git diff --git a/src/main/java/eu/svjatoslav/inspector/java/structure/FieldDescriptor.java b/src/main/java/eu/svjatoslav/inspector/java/structure/FieldDescriptor.java index 2162674..902d415 100755 --- a/src/main/java/eu/svjatoslav/inspector/java/structure/FieldDescriptor.java +++ b/src/main/java/eu/svjatoslav/inspector/java/structure/FieldDescriptor.java @@ -1,6 +1,6 @@ /* * JavaInspect - Utility to visualize java software - * Copyright (C) 2013-2014, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu + * Copyright (C) 2013-2015, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu * * This program is free software; you can redistribute it and/or * modify it under the terms of version 3 of the GNU Lesser General Public License @@ -27,12 +27,12 @@ public class FieldDescriptor implements GraphElement { List typeArguments = new ArrayList(); public FieldDescriptor(final Field field, final ClassDescriptor parent, - final ClassGraph dump) { + final ClassGraph classGraph) { parentClass = parent; if (!field.getDeclaringClass().getName() - .equals(parent.fullyQualifiedName)) + .equals(parent.classFullyQualifiedName)) // if field is inherited, do not index it return; @@ -42,7 +42,7 @@ public class FieldDescriptor implements GraphElement { parent.nameToFieldMap.put(field.getName(), this); name = field.getName(); - type = dump.addClass(field.getType()); + type = classGraph.addClass(field.getType()); type.registerReference(); final Type genericType = field.getGenericType(); @@ -51,7 +51,7 @@ public class FieldDescriptor implements GraphElement { for (final Type t : pt.getActualTypeArguments()) if (t instanceof Class) { final Class cl = (Class) t; - final ClassDescriptor genericTypeDescriptor = dump + final ClassDescriptor genericTypeDescriptor = classGraph .addClass(cl); genericTypeDescriptor.registerReference(); typeArguments.add(genericTypeDescriptor);