projects
/
javainspect.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Possibility to visualize multiple JAR files.
[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
3bd1049
..
5bfeb25
100755
(executable)
--- a/
src/main/java/eu/svjatoslav/inspector/java/structure/ClassDescriptor.java
+++ b/
src/main/java/eu/svjatoslav/inspector/java/structure/ClassDescriptor.java
@@
-1,6
+1,6
@@
/*
* JavaInspect - Utility to visualize java software
/*
* JavaInspect - Utility to visualize java software
- * Copyright (C) 2013-201
5
, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ * Copyright (C) 2013-201
7
, 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
*
* 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
@@
-19,7
+19,7
@@
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;
- private final Map<String, FieldDescriptor> nameToFieldMap = new TreeMap<
String, FieldDescriptor
>();
+ private final Map<String, FieldDescriptor> nameToFieldMap = new TreeMap<>();
private final SortedSet<MethodDescriptor> methods = new TreeSet<MethodDescriptor>();
private final ClassGraph classGraph;
boolean isEnum;
private final SortedSet<MethodDescriptor> methods = new TreeSet<MethodDescriptor>();
private final ClassGraph classGraph;
boolean isEnum;
@@
-73,8
+73,13
@@
public class ClassDescriptor implements GraphElement, Comparable<ClassDescriptor
if (!isVisible())
return;
if (!isVisible())
return;
- indexFields(clazz.getDeclaredFields());
- indexFields(clazz.getFields());
+ try {
+ indexFields(clazz.getDeclaredFields());
+ indexFields(clazz.getFields());
+ } catch (NoClassDefFoundError error){
+ // TODO: better logging of this error
+ System.out.println(error.toString());
+ }
indexMethods(clazz);
indexMethods(clazz);
@@
-102,9
+107,7
@@
public class ClassDescriptor implements GraphElement, Comparable<ClassDescriptor
result.append("\n");
result.append(" // field references to other classes\n");
result.append("\n");
result.append(" // field references to other classes\n");
- for (final Map.Entry<String, FieldDescriptor> entry : nameToFieldMap
- .entrySet())
- result.append(entry.getValue().getDot());
+ nameToFieldMap.forEach((fieldName, field) -> result.append(field.getDot()));
}
private void enlistFields(final StringBuffer result) {
}
private void enlistFields(final StringBuffer result) {
@@
-321,9
+324,12
@@
public class ClassDescriptor implements GraphElement, Comparable<ClassDescriptor
+ fullyQualifiedName
.replace('.', '_')
.replace(";", "")
+ fullyQualifiedName
.replace('.', '_')
.replace(";", "")
- .replace("[L", "")
.replace("[[", "")
.replace("[[", "")
+ .replace("[L", "")
+ .replace("[[L", "") // array of arrays
+ .replace("[[[L", "") // array of arrays of arrays
.replace('$', '_');
.replace('$', '_');
+
return result;
}
return result;
}