projects
/
javainspect.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reduced method visibility
[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
old mode 100644
(file)
new mode 100755
(executable)
index
db5a112
..
19bb585
--- a/
src/main/java/eu/svjatoslav/inspector/java/structure/FieldDescriptor.java
+++ b/
src/main/java/eu/svjatoslav/inspector/java/structure/FieldDescriptor.java
@@
-1,10
+1,10
@@
/*
* JavaInspect - Utility to visualize java software
/*
* JavaInspect - Utility to visualize java software
- * Copyright (C) 2013, 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
* This program is free software; you can redistribute it and/or
- * modify it under the terms of version
2 of the GNU
General Public License
- * as published by the Free Software Foundation.
+ * modify it under the terms of version
3 of the GNU Lesser
General Public License
+ *
or later
as published by the Free Software Foundation.
*/
package eu.svjatoslav.inspector.java.structure;
*/
package eu.svjatoslav.inspector.java.structure;
@@
-23,26
+23,27
@@
public class FieldDescriptor implements GraphElement {
public String name;
private ClassDescriptor type;
public String name;
private ClassDescriptor type;
- private ClassDescriptor parentClass;
+ private
final
ClassDescriptor parentClass;
List<ClassDescriptor> typeArguments = new ArrayList<ClassDescriptor>();
List<ClassDescriptor> typeArguments = new ArrayList<ClassDescriptor>();
- public FieldDescriptor(final Field field, final ClassDescriptor parent,
- final ClassGraph dump) {
+ public boolean isInherited;
+ public FieldDescriptor(final ClassDescriptor parent) {
parentClass = parent;
parentClass = parent;
+ }
+
+ public void analyzeField(final Field field) {
if (!field.getDeclaringClass().getName()
if (!field.getDeclaringClass().getName()
- .equals(parent.fullyQualifiedName))
- // if field is inherited, do not index it
- return;
+ .equals(parentClass.getFullyQualifiedName()))
+ isInherited = true;
// if (field.getType().isArray())
// System.out.println("field name: " + field.getName());
// if (field.getType().isArray())
// System.out.println("field name: " + field.getName());
- parent.nameToFieldMap.put(field.getName(), this);
-
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
+52,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);
}
@@
-144,6
+145,9
@@
public class FieldDescriptor implements GraphElement {
@Override
public boolean isVisible() {
@Override
public boolean isVisible() {
+ if (isInherited)
+ return false;
+
if (name.contains("$"))
return false;
if (name.contains("$"))
return false;