projects
/
javainspect.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactoring. API simplifications. Documentation updates.
[javainspect.git]
/
src
/
main
/
java
/
eu
/
svjatoslav
/
inspector
/
java
/
structure
/
FieldDescriptor.java
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
..
7128c4e
100755
(executable)
--- 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
/*
* JavaInspect - Utility to visualize java software
- * Copyright (C) 2013-201
4
, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
- *
+ * Copyright (C) 2013-201
5
, 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.
* 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;
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 {
- p
ublic
String name;
+ p
rivate
String name;
private ClassDescriptor type;
private ClassDescriptor type;
- private ClassDescriptor parentClass;
- List<ClassDescriptor> typeArguments = new ArrayList<ClassDescriptor>();
-
- public FieldDescriptor(final Field field, final ClassDescriptor parent,
- final ClassGraph dump) {
+ private final ClassDescriptor parentClass;
+ private final List<ClassDescriptor> typeArguments = new ArrayList<ClassDescriptor>();
+ private boolean isInherited;
+ public FieldDescriptor(final ClassDescriptor parent) {
parentClass = parent;
parentClass = parent;
+ }
- if (!field.getDeclaringClass().getName()
- .equals(parent.fullyQualifiedName))
- // 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();
name = field.getName();
- type = dump.addClass(field.getType());
+ type = parentClass.getClassGraph().getOrCreateClassDescriptor(
+ field.getType());
type.registerReference();
final Type genericType = field.getGenericType();
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;
for (final Type t : pt.getActualTypeArguments())
if (t instanceof Class) {
final Class cl = (Class) t;
- final ClassDescriptor genericTypeDescriptor =
dump
- .
addClass
(cl);
+ final ClassDescriptor genericTypeDescriptor =
parentClass
+ .
getClassGraph().getOrCreateClassDescriptor
(cl);
genericTypeDescriptor.registerReference();
typeArguments.add(genericTypeDescriptor);
}
genericTypeDescriptor.registerReference();
typeArguments.add(genericTypeDescriptor);
}
@@
-126,7
+123,7
@@
public class FieldDescriptor implements GraphElement {
return parentClass.getGraphId() + ":" + name;
}
return parentClass.getGraphId() + ":" + name;
}
- p
ublic
int getOutsideVisibleReferencesCount() {
+ p
rotected
int getOutsideVisibleReferencesCount() {
if (!isVisible())
return 0;
if (!isVisible())
return 0;
@@
-138,12
+135,15
@@
public class FieldDescriptor implements GraphElement {
return 0;
}
return 0;
}
- p
ublic
ClassDescriptor getType() {
+ p
rotected
ClassDescriptor getType() {
return type;
}
@Override
public boolean isVisible() {
return type;
}
@Override
public boolean isVisible() {
+ if (isInherited)
+ return false;
+
if (name.contains("$"))
return false;
if (name.contains("$"))
return false;