X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Finspector%2Fjava%2Fstructure%2FFieldDescriptor.java;h=7128c4e3ec40b6282cff86699f1539f0b5feb959;hb=c508bf97e017675b49df989b7f5a64cbd31d9aa3;hp=84d1ab1b79188ca6953a5b6e3de40de0926ae42b;hpb=cd718904f053ee6901e9b21d76a024ef646bb01c;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 84d1ab1..7128c4e 100755
--- a/src/main/java/eu/svjatoslav/inspector/java/structure/FieldDescriptor.java
+++ b/src/main/java/eu/svjatoslav/inspector/java/structure/FieldDescriptor.java
@@ -1,7 +1,7 @@
 /*
  * 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
  * or later as published by the Free Software Foundation.
@@ -15,34 +15,31 @@ import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 
-public class FieldDescriptor implements GraphElement {
+/**
+ * This class corresponds to single field within a java class.
+ */
 
-	/**
-	 * This class corresponds to single field within a java class.
-	 */
+public class FieldDescriptor implements GraphElement {
 
-	public String name;
+	private String name;
 	private ClassDescriptor type;
-	private ClassDescriptor parentClass;
-	List<ClassDescriptor> typeArguments = new ArrayList<ClassDescriptor>();
-
-	public FieldDescriptor(final Field field, final ClassDescriptor parent,
-			final ClassGraph classGraph) {
+	private final ClassDescriptor parentClass;
+	private final List<ClassDescriptor> typeArguments = new ArrayList<ClassDescriptor>();
+	private boolean isInherited;
 
+	public FieldDescriptor(final ClassDescriptor parent) {
 		parentClass = parent;
+	}
 
-		if (!field.getDeclaringClass().getName()
-				.equals(parent.classFullyQualifiedName))
-			// if field is inherited, do not index it
-			return;
-
-		// if (field.getType().isArray())
-		// System.out.println("field name: " + field.getName());
+	public void analyzeField(final Field field) {
 
-		parent.nameToFieldMap.put(field.getName(), this);
+		if (!field.getDeclaringClass().getName()
+				.equals(parentClass.getFullyQualifiedName()))
+			isInherited = true;
 
 		name = field.getName();
-		type = classGraph.addClass(field.getType());
+		type = parentClass.getClassGraph().getOrCreateClassDescriptor(
+				field.getType());
 		type.registerReference();
 
 		final Type genericType = field.getGenericType();
@@ -51,8 +48,8 @@ public class FieldDescriptor implements GraphElement {
 			for (final Type t : pt.getActualTypeArguments())
 				if (t instanceof Class) {
 					final Class cl = (Class) t;
-					final ClassDescriptor genericTypeDescriptor = classGraph
-							.addClass(cl);
+					final ClassDescriptor genericTypeDescriptor = parentClass
+							.getClassGraph().getOrCreateClassDescriptor(cl);
 					genericTypeDescriptor.registerReference();
 					typeArguments.add(genericTypeDescriptor);
 				}
@@ -126,7 +123,7 @@ public class FieldDescriptor implements GraphElement {
 		return parentClass.getGraphId() + ":" + name;
 	}
 
-	public int getOutsideVisibleReferencesCount() {
+	protected int getOutsideVisibleReferencesCount() {
 
 		if (!isVisible())
 			return 0;
@@ -138,12 +135,15 @@ public class FieldDescriptor implements GraphElement {
 		return 0;
 	}
 
-	public ClassDescriptor getType() {
+	protected ClassDescriptor getType() {
 		return type;
 	}
 
 	@Override
 	public boolean isVisible() {
+		if (isInherited)
+			return false;
+
 		if (name.contains("$"))
 			return false;