projects
/
javainspect.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
94b2a81
)
reduced fields and methods visibility
author
Svjatoslav Agejenko
<svjatoslav@svjatoslav.eu>
Tue, 3 Mar 2015 17:59:26 +0000
(19:59 +0200)
committer
Svjatoslav Agejenko
<svjatoslav@svjatoslav.eu>
Tue, 3 Mar 2015 17:59:26 +0000
(19:59 +0200)
src/main/java/eu/svjatoslav/inspector/java/structure/ClassDescriptor.java
patch
|
blob
|
history
src/main/java/eu/svjatoslav/inspector/java/structure/FieldDescriptor.java
patch
|
blob
|
history
src/main/java/eu/svjatoslav/inspector/java/structure/GraphElement.java
patch
|
blob
|
history
src/main/java/eu/svjatoslav/inspector/java/structure/MethodDescriptor.java
patch
|
blob
|
history
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
2b775cb
..
e43fe8d
100755
(executable)
--- a/
src/main/java/eu/svjatoslav/inspector/java/structure/ClassDescriptor.java
+++ b/
src/main/java/eu/svjatoslav/inspector/java/structure/ClassDescriptor.java
@@
-25,7
+25,7
@@
public class ClassDescriptor implements GraphElement {
private static final int MAX_REFERECNES_COUNT = 10;
private static final int MAX_REFERECNES_COUNT = 10;
- p
ublic String classF
ullyQualifiedName;
+ p
rivate String f
ullyQualifiedName;
private final Map<String, FieldDescriptor> nameToFieldMap = new TreeMap<String, FieldDescriptor>();
private final Map<String, FieldDescriptor> nameToFieldMap = new TreeMap<String, FieldDescriptor>();
@@
-71,9
+71,9
@@
public class ClassDescriptor implements GraphElement {
this.classGraph = classGraph;
}
this.classGraph = classGraph;
}
- p
ublic
void analyzeClass(final Class<? extends Object> clazz) {
+ p
rotected
void analyzeClass(final Class<? extends Object> clazz) {
-
classF
ullyQualifiedName = clazz.getName();
+
f
ullyQualifiedName = clazz.getName();
isArray = clazz.isArray();
isArray = clazz.isArray();
@@
-111,11
+111,11
@@
public class ClassDescriptor implements GraphElement {
};
};
- p
ublic
boolean areReferencesShown() {
+ p
rotected
boolean areReferencesShown() {
return referencesCount <= MAX_REFERECNES_COUNT;
}
return referencesCount <= MAX_REFERECNES_COUNT;
}
- p
ublic
void enlistFieldReferences(final StringBuffer result) {
+ p
rivate
void enlistFieldReferences(final StringBuffer result) {
if (nameToFieldMap.isEmpty())
return;
if (nameToFieldMap.isEmpty())
return;
@@
-126,7
+126,7
@@
public class ClassDescriptor implements GraphElement {
result.append(entry.getValue().getDot());
}
result.append(entry.getValue().getDot());
}
- p
ublic
void enlistFields(final StringBuffer result) {
+ p
rivate
void enlistFields(final StringBuffer result) {
if (nameToFieldMap.isEmpty())
return;
if (nameToFieldMap.isEmpty())
return;
@@
-139,13
+139,13
@@
public class ClassDescriptor implements GraphElement {
result.append(entry.getValue().getEmbeddedDot());
}
result.append(entry.getValue().getEmbeddedDot());
}
- p
ublic
void enlistImplementedInterfaces(final StringBuffer result) {
+ p
rivate
void enlistImplementedInterfaces(final StringBuffer result) {
if (interfaces.isEmpty())
return;
result.append("\n");
result.append(" // interfaces implemented by class: "
if (interfaces.isEmpty())
return;
result.append("\n");
result.append(" // interfaces implemented by class: "
- +
classF
ullyQualifiedName + "\n");
+ +
f
ullyQualifiedName + "\n");
for (final ClassDescriptor interfaceDescriptor : interfaces) {
if (!interfaceDescriptor.isVisible())
for (final ClassDescriptor interfaceDescriptor : interfaces) {
if (!interfaceDescriptor.isVisible())
@@
-161,7
+161,7
@@
public class ClassDescriptor implements GraphElement {
}
}
}
}
- p
ublic
void enlistMethodReferences(final StringBuffer result) {
+ p
rivate
void enlistMethodReferences(final StringBuffer result) {
if (methods.isEmpty())
return;
if (methods.isEmpty())
return;
@@
-171,7
+171,7
@@
public class ClassDescriptor implements GraphElement {
result.append(methodDescriptor.getDot());
}
result.append(methodDescriptor.getDot());
}
- p
ublic
void enlistMethods(final StringBuffer result) {
+ p
rivate
void enlistMethods(final StringBuffer result) {
if (methods.isEmpty())
return;
if (methods.isEmpty())
return;
@@
-183,7
+183,7
@@
public class ClassDescriptor implements GraphElement {
result.append(methodDescriptor.getEmbeddedDot());
}
result.append(methodDescriptor.getEmbeddedDot());
}
- p
ublic
void enlistSuperClass(final StringBuffer result) {
+ p
rivate
void enlistSuperClass(final StringBuffer result) {
if (superClass == null)
return;
if (superClass == null)
return;
@@
-194,17
+194,16
@@
public class ClassDescriptor implements GraphElement {
return;
result.append("\n");
return;
result.append("\n");
- result.append(" // super class for: " + classFullyQualifiedName
- + "\n");
+ result.append(" // super class for: " + fullyQualifiedName + "\n");
result.append(" " + superClass.getGraphId() + " -> " + getGraphId()
+ "[ color=\"" + superClass.getSuperClassColor()
+ "\", penwidth=10, dir=\"forward\"];\n");
}
result.append(" " + superClass.getGraphId() + " -> " + getGraphId()
+ "[ color=\"" + superClass.getSuperClassColor()
+ "\", penwidth=10, dir=\"forward\"];\n");
}
- p
ublic
void generateDotHeader(final StringBuffer result) {
+ p
rivate
void generateDotHeader(final StringBuffer result) {
result.append("\n");
result.append("\n");
- result.append("// Class: " +
classF
ullyQualifiedName + "\n");
+ result.append("// Class: " +
f
ullyQualifiedName + "\n");
result.append(" " + getGraphId() + "[label=<<TABLE "
+ getBackgroundColor() + " BORDER=\"" + getBorderWidth()
result.append(" " + getGraphId() + "[label=<<TABLE "
+ getBackgroundColor() + " BORDER=\"" + getBorderWidth()
@@
-225,17
+224,7
@@
public class ClassDescriptor implements GraphElement {
+ "</B></FONT>" + "</TD></TR>\n");
}
+ "</B></FONT>" + "</TD></TR>\n");
}
- public List<FieldDescriptor> getAllFields() {
- final List<FieldDescriptor> result = new ArrayList<FieldDescriptor>();
-
- for (final Map.Entry<String, FieldDescriptor> entry : nameToFieldMap
- .entrySet())
- result.add(entry.getValue());
-
- return result;
- }
-
- public String getBackgroundColor() {
+ private String getBackgroundColor() {
String bgColor = "";
if (isEnum)
String bgColor = "";
if (isEnum)
@@
-247,26
+236,25
@@
public class ClassDescriptor implements GraphElement {
return bgColor;
}
return bgColor;
}
- p
ublic
String getBorderWidth() {
+ p
rivate
String getBorderWidth() {
if (!areReferencesShown())
return "4";
return "1";
}
if (!areReferencesShown())
return "4";
return "1";
}
- p
ublic
ClassGraph getClassGraph() {
+ p
rotected
ClassGraph getClassGraph() {
return classGraph;
}
return classGraph;
}
- p
ublic
String getClassName(final boolean differentiateArray) {
+ p
rotected
String getClassName(final boolean differentiateArray) {
// this is needed for nested classes
// this is needed for nested classes
- final String actualClassName = classFullyQualifiedName
- .replace('$', '.');
+ final String actualClassName = fullyQualifiedName.replace('$', '.');
String result;
if (isArray) {
// for arrays use array component instead of array class name
String result;
if (isArray) {
// for arrays use array component instead of array class name
- result = arrayComponent.
classF
ullyQualifiedName;
+ result = arrayComponent.
f
ullyQualifiedName;
if (result.contains(".")) {
final int i = result.lastIndexOf('.');
result = result.substring(i + 1);
if (result.contains(".")) {
final int i = result.lastIndexOf('.');
result = result.substring(i + 1);
@@
-285,14
+273,10
@@
public class ClassDescriptor implements GraphElement {
return result;
}
return result;
}
- p
ublic
String getColor() {
- if (
getDistinctiveColor()
== null)
-
setDistinctiveColor(Utils.getNextDarkColor()
);
+ p
rotected
String getColor() {
+ if (
distinctiveReferenceColor
== null)
+
distinctiveReferenceColor = Utils.getNextDarkColor(
);
- return getDistinctiveColor();
- }
-
- public String getDistinctiveColor() {
return distinctiveReferenceColor;
}
return distinctiveReferenceColor;
}
@@
-334,7
+318,7
@@
public class ClassDescriptor implements GraphElement {
* Returns field with given name (case is ignored). Or <code>null</code> if
* field is not found.
*/
* Returns field with given name (case is ignored). Or <code>null</code> if
* field is not found.
*/
- p
ublic
FieldDescriptor getFieldIgnoreCase(final String fieldToSearch) {
+ p
rotected
FieldDescriptor getFieldIgnoreCase(final String fieldToSearch) {
for (final String fieldName : nameToFieldMap.keySet())
if (fieldToSearch.equalsIgnoreCase(fieldName))
for (final String fieldName : nameToFieldMap.keySet())
if (fieldToSearch.equalsIgnoreCase(fieldName))
@@
-343,35
+327,25
@@
public class ClassDescriptor implements GraphElement {
return null;
}
return null;
}
+ protected String getFullyQualifiedName() {
+ return fullyQualifiedName;
+ }
+
@Override
public String getGraphId() {
final String result = "class_"
@Override
public String getGraphId() {
final String result = "class_"
- +
classF
ullyQualifiedName.replace('.', '_').replace(";", "")
-
.replace("[L", "").replace('$', '_');
+ +
f
ullyQualifiedName.replace('.', '_').replace(";", "")
+ .replace("[L", "").replace('$', '_');
return result;
}
return result;
}
- p
ublic
String getInterfaceColor() {
+ p
rivate
String getInterfaceColor() {
if (interfaceColor == null)
interfaceColor = Utils.getNextDarkColor();
return interfaceColor;
}
if (interfaceColor == null)
interfaceColor = Utils.getNextDarkColor();
return interfaceColor;
}
- // public String getReadableName() {
- //
- // // do not print full class name for well known system classes
- // final String packageName = getPackageName();
- //
- // if (packageName.equals("java.util"))
- // return getClassName();
- //
- // if (packageName.equals("java.lang"))
- // return getClassName();
- //
- // return fullyQualifiedName;
- // }
-
private FieldDescriptor getOrCreateFieldDescriptor(final Field field) {
final String fieldName = field.getName();
private FieldDescriptor getOrCreateFieldDescriptor(final Field field) {
final String fieldName = field.getName();
@@
-411,19
+385,19
@@
public class ClassDescriptor implements GraphElement {
return result;
}
return result;
}
- p
ublic
String getPackageName() {
+ p
rivate
String getPackageName() {
- final int i =
classF
ullyQualifiedName.lastIndexOf('.');
+ final int i =
f
ullyQualifiedName.lastIndexOf('.');
if (i == -1)
return "";
if (i == -1)
return "";
- return
classF
ullyQualifiedName.substring(0, i).replace("[L", "");
+ return
f
ullyQualifiedName.substring(0, i).replace("[L", "");
}
}
- p
ublic
String getParentClassesName() {
- int i =
classF
ullyQualifiedName.lastIndexOf('.');
- final String fullClassName =
classF
ullyQualifiedName.substring(i + 1);
+ p
rivate
String getParentClassesName() {
+ int i =
f
ullyQualifiedName.lastIndexOf('.');
+ final String fullClassName =
f
ullyQualifiedName.substring(i + 1);
i = fullClassName.lastIndexOf('$');
if (i == -1)
i = fullClassName.lastIndexOf('$');
if (i == -1)
@@
-432,7
+406,7
@@
public class ClassDescriptor implements GraphElement {
return parentClassesName.replace('$', '.');
}
return parentClassesName.replace('$', '.');
}
- p
ublic
String getSuperClassColor() {
+ p
rivate
String getSuperClassColor() {
if (superClassColor == null)
superClassColor = Utils.getNextLightColor();
if (superClassColor == null)
superClassColor = Utils.getNextLightColor();
@@
-443,7
+417,7
@@
public class ClassDescriptor implements GraphElement {
* Checks if class has field with given name (case is ignored). Returns
* <code>true</code> if such field is found.
*/
* Checks if class has field with given name (case is ignored). Returns
* <code>true</code> if such field is found.
*/
- p
ublic
boolean hasFieldIgnoreCase(final String fieldToSearch) {
+ p
rotected
boolean hasFieldIgnoreCase(final String fieldToSearch) {
for (final String fieldName : nameToFieldMap.keySet())
if (fieldToSearch.equalsIgnoreCase(fieldName))
for (final String fieldName : nameToFieldMap.keySet())
if (fieldToSearch.equalsIgnoreCase(fieldName))
@@
-452,11
+426,11
@@
public class ClassDescriptor implements GraphElement {
return false;
}
return false;
}
- p
ublic
void hide() {
+ p
rivate
void hide() {
isShown = false;
}
isShown = false;
}
- p
ublic
void hideClassIfNoReferences() {
+ p
rotected
void hideClassIfNoReferences() {
if (!isVisible())
return;
if (!isVisible())
return;
@@
-471,7
+445,7
@@
public class ClassDescriptor implements GraphElement {
return;
}
return;
}
- p
ublic
void indexFields(final Field[] fields) {
+ p
rivate
void indexFields(final Field[] fields) {
for (final Field field : fields)
getOrCreateFieldDescriptor(field);
}
for (final Field field : fields)
getOrCreateFieldDescriptor(field);
}
@@
-491,19
+465,18
@@
public class ClassDescriptor implements GraphElement {
@Override
public boolean isVisible() {
@Override
public boolean isVisible() {
- if (Utils.isSystemDataType(
classF
ullyQualifiedName))
+ if (Utils.isSystemDataType(
f
ullyQualifiedName))
return false;
return false;
- if (Utils.isSystemPackage(
classF
ullyQualifiedName))
+ if (Utils.isSystemPackage(
f
ullyQualifiedName))
return false;
return false;
- if (!getClassGraph().getFilter().isClassShown(
classF
ullyQualifiedName))
+ if (!getClassGraph().getFilter().isClassShown(
f
ullyQualifiedName))
return false;
if (isArray)
if (arrayComponent != null)
return false;
if (isArray)
if (arrayComponent != null)
- if (Utils
- .isSystemDataType(arrayComponent.classFullyQualifiedName))
+ if (Utils.isSystemDataType(arrayComponent.fullyQualifiedName))
// Do not show references to primitive data types in arrays.
// That is: there is no point to show reference to byte when
// we have class with byte array field.
// Do not show references to primitive data types in arrays.
// That is: there is no point to show reference to byte when
// we have class with byte array field.
@@
-515,19
+488,16
@@
public class ClassDescriptor implements GraphElement {
/**
* Register event when another class is extending this one.
*/
/**
* Register event when another class is extending this one.
*/
- p
ublic
void registerExtension() {
+ p
rotected
void registerExtension() {
extensionsCount++;
}
extensionsCount++;
}
- p
ublic
void registerImplementation() {
+ p
rotected
void registerImplementation() {
implementationsCount++;
}
implementationsCount++;
}
- p
ublic
void registerReference() {
+ p
rotected
void registerReference() {
referencesCount++;
}
referencesCount++;
}
- public void setDistinctiveColor(final String distinctiveColor) {
- distinctiveReferenceColor = distinctiveColor;
- }
}
}
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
d0a607b
..
19bb585
100755
(executable)
--- a/
src/main/java/eu/svjatoslav/inspector/java/structure/FieldDescriptor.java
+++ b/
src/main/java/eu/svjatoslav/inspector/java/structure/FieldDescriptor.java
@@
-35,7
+35,7
@@
public class FieldDescriptor implements GraphElement {
public void analyzeField(final Field field) {
if (!field.getDeclaringClass().getName()
public void analyzeField(final Field field) {
if (!field.getDeclaringClass().getName()
- .equals(parentClass.
classFullyQualifiedName
))
+ .equals(parentClass.
getFullyQualifiedName()
))
isInherited = true;
// if (field.getType().isArray())
isInherited = true;
// if (field.getType().isArray())
diff --git
a/src/main/java/eu/svjatoslav/inspector/java/structure/GraphElement.java
b/src/main/java/eu/svjatoslav/inspector/java/structure/GraphElement.java
index
85237d9
..
98212d2
100755
(executable)
--- a/
src/main/java/eu/svjatoslav/inspector/java/structure/GraphElement.java
+++ b/
src/main/java/eu/svjatoslav/inspector/java/structure/GraphElement.java
@@
-1,7
+1,7
@@
/*
* JavaInspect - Utility to visualize java software
* Copyright (C) 2013-2015, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
/*
* JavaInspect - Utility to visualize java software
* 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.
* 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.
diff --git
a/src/main/java/eu/svjatoslav/inspector/java/structure/MethodDescriptor.java
b/src/main/java/eu/svjatoslav/inspector/java/structure/MethodDescriptor.java
index
8eca361
..
c31c9f6
100755
(executable)
--- a/
src/main/java/eu/svjatoslav/inspector/java/structure/MethodDescriptor.java
+++ b/
src/main/java/eu/svjatoslav/inspector/java/structure/MethodDescriptor.java
@@
-39,7
+39,7
@@
public class MethodDescriptor implements GraphElement,
public void analyze(final Method method) {
if (!method.getDeclaringClass().getName()
public void analyze(final Method method) {
if (!method.getDeclaringClass().getName()
- .equals(parentClass.
classFullyQualifiedName
))
+ .equals(parentClass.
getFullyQualifiedName()
))
isInherited = true;
returnType = parentClass.getClassGraph().getOrCreateClassDescriptor(
isInherited = true;
returnType = parentClass.getClassGraph().getOrCreateClassDescriptor(
@@
-167,7
+167,7
@@
public class MethodDescriptor implements GraphElement,
final FieldDescriptor field = parentClass
.getFieldIgnoreCase(methodName.substring(2));
if (field != null)
final FieldDescriptor field = parentClass
.getFieldIgnoreCase(methodName.substring(2));
if (field != null)
- if ("boolean".equals(field.getType().
classFullyQualifiedName
))
+ if ("boolean".equals(field.getType().
getFullyQualifiedName()
))
return false;
}
return false;
}