projects
/
javainspect.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Code cleanup.
[javainspect.git]
/
src
/
main
/
java
/
eu
/
svjatoslav
/
inspector
/
java
/
structure
/
ClassDescriptor.java
diff --git
a/src/main/java/eu/svjatoslav/inspector/java/structure/ClassDescriptor.java
b/src/main/java/eu/svjatoslav/inspector/java/structure/ClassDescriptor.java
index
5bfeb25
..
b38794d
100755
(executable)
--- a/
src/main/java/eu/svjatoslav/inspector/java/structure/ClassDescriptor.java
+++ b/
src/main/java/eu/svjatoslav/inspector/java/structure/ClassDescriptor.java
@@
-19,13
+19,13
@@
import java.util.*;
public class ClassDescriptor implements GraphElement, Comparable<ClassDescriptor> {
private static final int MAX_REFERECNES_COUNT = 10;
public class ClassDescriptor implements GraphElement, Comparable<ClassDescriptor> {
private static final int MAX_REFERECNES_COUNT = 10;
+ final List<ClassDescriptor> interfaces = new ArrayList<>();
private final Map<String, FieldDescriptor> nameToFieldMap = new TreeMap<>();
private final Map<String, FieldDescriptor> nameToFieldMap = new TreeMap<>();
- private final SortedSet<MethodDescriptor> methods = new TreeSet<
MethodDescriptor
>();
+ private final SortedSet<MethodDescriptor> methods = new TreeSet<>();
private final ClassGraph classGraph;
boolean isEnum;
boolean isInterface;
boolean isArray;
private final ClassGraph classGraph;
boolean isEnum;
boolean isInterface;
boolean isArray;
- List<ClassDescriptor> interfaces = new ArrayList<ClassDescriptor>();
ClassDescriptor superClass;
private String fullyQualifiedName;
/**
ClassDescriptor superClass;
private String fullyQualifiedName;
/**
@@
-52,7
+52,7
@@
public class ClassDescriptor implements GraphElement, Comparable<ClassDescriptor
this.classGraph = classGraph;
}
this.classGraph = classGraph;
}
- protected void analyzeClass(final Class<?
extends Object
> clazz) {
+ protected void analyzeClass(final Class<?> clazz) {
fullyQualifiedName = clazz.getName();
fullyQualifiedName = clazz.getName();
@@
-76,7
+76,7
@@
public class ClassDescriptor implements GraphElement, Comparable<ClassDescriptor
try {
indexFields(clazz.getDeclaredFields());
indexFields(clazz.getFields());
try {
indexFields(clazz.getDeclaredFields());
indexFields(clazz.getFields());
- } catch (NoClassDefFoundError error){
+ } catch (NoClassDefFoundError error)
{
// TODO: better logging of this error
System.out.println(error.toString());
}
// TODO: better logging of this error
System.out.println(error.toString());
}
@@
-320,7
+320,8
@@
public class ClassDescriptor implements GraphElement, Comparable<ClassDescriptor
@Override
public String getGraphId() {
@Override
public String getGraphId() {
- final String result = "class_"
+
+ return "class_"
+ fullyQualifiedName
.replace('.', '_')
.replace(";", "")
+ fullyQualifiedName
.replace('.', '_')
.replace(";", "")
@@
-329,8
+330,6
@@
public class ClassDescriptor implements GraphElement, Comparable<ClassDescriptor
.replace("[[L", "") // array of arrays
.replace("[[[L", "") // array of arrays of arrays
.replace('$', '_');
.replace("[[L", "") // array of arrays
.replace("[[[L", "") // array of arrays of arrays
.replace('$', '_');
-
- return result;
}
private String getInterfaceColor() {
}
private String getInterfaceColor() {
@@
-439,7
+438,6
@@
public class ClassDescriptor implements GraphElement, Comparable<ClassDescriptor
return;
}
return;
}
- return;
}
private void indexFields(final Field[] fields) {
}
private void indexFields(final Field[] fields) {
@@
-447,7
+445,7
@@
public class ClassDescriptor implements GraphElement, Comparable<ClassDescriptor
getOrCreateFieldDescriptor(field);
}
getOrCreateFieldDescriptor(field);
}
- private void indexMethods(final Class<?
extends Object
> clazz) {
+ private void indexMethods(final Class<?> clazz) {
for (final Method method : clazz.getMethods()) {
final MethodDescriptor methodDescriptor = new MethodDescriptor(
this, method.getName());
for (final Method method : clazz.getMethods()) {
final MethodDescriptor methodDescriptor = new MethodDescriptor(
this, method.getName());