From: Svjatoslav Agejenko Date: Tue, 3 Mar 2015 17:59:26 +0000 (+0200) Subject: reduced fields and methods visibility X-Git-Tag: javainspect-1.5~15 X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=javainspect.git;a=commitdiff_plain;h=934aea34806546c732112258e5e98a482cf9d50e reduced fields and methods visibility --- 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 --- 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; - public String classFullyQualifiedName; + private String fullyQualifiedName; private final Map nameToFieldMap = new TreeMap(); @@ -71,9 +71,9 @@ public class ClassDescriptor implements GraphElement { this.classGraph = classGraph; } - public void analyzeClass(final Class clazz) { + protected void analyzeClass(final Class clazz) { - classFullyQualifiedName = clazz.getName(); + fullyQualifiedName = clazz.getName(); isArray = clazz.isArray(); @@ -111,11 +111,11 @@ public class ClassDescriptor implements GraphElement { }; - public boolean areReferencesShown() { + protected boolean areReferencesShown() { return referencesCount <= MAX_REFERECNES_COUNT; } - public void enlistFieldReferences(final StringBuffer result) { + private void enlistFieldReferences(final StringBuffer result) { if (nameToFieldMap.isEmpty()) return; @@ -126,7 +126,7 @@ public class ClassDescriptor implements GraphElement { result.append(entry.getValue().getDot()); } - public void enlistFields(final StringBuffer result) { + private void enlistFields(final StringBuffer result) { if (nameToFieldMap.isEmpty()) return; @@ -139,13 +139,13 @@ public class ClassDescriptor implements GraphElement { result.append(entry.getValue().getEmbeddedDot()); } - public void enlistImplementedInterfaces(final StringBuffer result) { + private void enlistImplementedInterfaces(final StringBuffer result) { if (interfaces.isEmpty()) return; result.append("\n"); result.append(" // interfaces implemented by class: " - + classFullyQualifiedName + "\n"); + + fullyQualifiedName + "\n"); for (final ClassDescriptor interfaceDescriptor : interfaces) { if (!interfaceDescriptor.isVisible()) @@ -161,7 +161,7 @@ public class ClassDescriptor implements GraphElement { } } - public void enlistMethodReferences(final StringBuffer result) { + private void enlistMethodReferences(final StringBuffer result) { if (methods.isEmpty()) return; @@ -171,7 +171,7 @@ public class ClassDescriptor implements GraphElement { result.append(methodDescriptor.getDot()); } - public void enlistMethods(final StringBuffer result) { + private void enlistMethods(final StringBuffer result) { if (methods.isEmpty()) return; @@ -183,7 +183,7 @@ public class ClassDescriptor implements GraphElement { result.append(methodDescriptor.getEmbeddedDot()); } - public void enlistSuperClass(final StringBuffer result) { + private void enlistSuperClass(final StringBuffer result) { if (superClass == null) return; @@ -194,17 +194,16 @@ public class ClassDescriptor implements GraphElement { 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"); } - public void generateDotHeader(final StringBuffer result) { + private void generateDotHeader(final StringBuffer result) { result.append("\n"); - result.append("// Class: " + classFullyQualifiedName + "\n"); + result.append("// Class: " + fullyQualifiedName + "\n"); result.append(" " + getGraphId() + "[label=<" + "\n"); } - public List getAllFields() { - final List result = new ArrayList(); - - for (final Map.Entry entry : nameToFieldMap - .entrySet()) - result.add(entry.getValue()); - - return result; - } - - public String getBackgroundColor() { + private String getBackgroundColor() { String bgColor = ""; if (isEnum) @@ -247,26 +236,25 @@ public class ClassDescriptor implements GraphElement { return bgColor; } - public String getBorderWidth() { + private String getBorderWidth() { if (!areReferencesShown()) return "4"; return "1"; } - public ClassGraph getClassGraph() { + protected ClassGraph getClassGraph() { return classGraph; } - public String getClassName(final boolean differentiateArray) { + protected String getClassName(final boolean differentiateArray) { // 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 - result = arrayComponent.classFullyQualifiedName; + result = arrayComponent.fullyQualifiedName; if (result.contains(".")) { final int i = result.lastIndexOf('.'); result = result.substring(i + 1); @@ -285,14 +273,10 @@ public class ClassDescriptor implements GraphElement { return result; } - public String getColor() { - if (getDistinctiveColor() == null) - setDistinctiveColor(Utils.getNextDarkColor()); + protected String getColor() { + if (distinctiveReferenceColor == null) + distinctiveReferenceColor = Utils.getNextDarkColor(); - return getDistinctiveColor(); - } - - public String getDistinctiveColor() { return distinctiveReferenceColor; } @@ -334,7 +318,7 @@ public class ClassDescriptor implements GraphElement { * Returns field with given name (case is ignored). Or null if * field is not found. */ - public FieldDescriptor getFieldIgnoreCase(final String fieldToSearch) { + protected FieldDescriptor getFieldIgnoreCase(final String fieldToSearch) { for (final String fieldName : nameToFieldMap.keySet()) if (fieldToSearch.equalsIgnoreCase(fieldName)) @@ -343,35 +327,25 @@ public class ClassDescriptor implements GraphElement { return null; } + protected String getFullyQualifiedName() { + return fullyQualifiedName; + } + @Override public String getGraphId() { final String result = "class_" - + classFullyQualifiedName.replace('.', '_').replace(";", "") - .replace("[L", "").replace('$', '_'); + + fullyQualifiedName.replace('.', '_').replace(";", "") + .replace("[L", "").replace('$', '_'); return result; } - public String getInterfaceColor() { + private String getInterfaceColor() { 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(); @@ -411,19 +385,19 @@ public class ClassDescriptor implements GraphElement { return result; } - public String getPackageName() { + private String getPackageName() { - final int i = classFullyQualifiedName.lastIndexOf('.'); + final int i = fullyQualifiedName.lastIndexOf('.'); if (i == -1) return ""; - return classFullyQualifiedName.substring(0, i).replace("[L", ""); + return fullyQualifiedName.substring(0, i).replace("[L", ""); } - public String getParentClassesName() { - int i = classFullyQualifiedName.lastIndexOf('.'); - final String fullClassName = classFullyQualifiedName.substring(i + 1); + private String getParentClassesName() { + int i = fullyQualifiedName.lastIndexOf('.'); + final String fullClassName = fullyQualifiedName.substring(i + 1); i = fullClassName.lastIndexOf('$'); if (i == -1) @@ -432,7 +406,7 @@ public class ClassDescriptor implements GraphElement { return parentClassesName.replace('$', '.'); } - public String getSuperClassColor() { + private String getSuperClassColor() { 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 * true if such field is found. */ - public boolean hasFieldIgnoreCase(final String fieldToSearch) { + protected boolean hasFieldIgnoreCase(final String fieldToSearch) { for (final String fieldName : nameToFieldMap.keySet()) if (fieldToSearch.equalsIgnoreCase(fieldName)) @@ -452,11 +426,11 @@ public class ClassDescriptor implements GraphElement { return false; } - public void hide() { + private void hide() { isShown = false; } - public void hideClassIfNoReferences() { + protected void hideClassIfNoReferences() { if (!isVisible()) return; @@ -471,7 +445,7 @@ public class ClassDescriptor implements GraphElement { return; } - public void indexFields(final Field[] fields) { + private void indexFields(final Field[] fields) { for (final Field field : fields) getOrCreateFieldDescriptor(field); } @@ -491,19 +465,18 @@ public class ClassDescriptor implements GraphElement { @Override public boolean isVisible() { - if (Utils.isSystemDataType(classFullyQualifiedName)) + if (Utils.isSystemDataType(fullyQualifiedName)) return false; - if (Utils.isSystemPackage(classFullyQualifiedName)) + if (Utils.isSystemPackage(fullyQualifiedName)) return false; - if (!getClassGraph().getFilter().isClassShown(classFullyQualifiedName)) + if (!getClassGraph().getFilter().isClassShown(fullyQualifiedName)) 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. @@ -515,19 +488,16 @@ public class ClassDescriptor implements GraphElement { /** * Register event when another class is extending this one. */ - public void registerExtension() { + protected void registerExtension() { extensionsCount++; } - public void registerImplementation() { + protected void registerImplementation() { implementationsCount++; } - public void registerReference() { + protected void registerReference() { 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 --- 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() - .equals(parentClass.classFullyQualifiedName)) + .equals(parentClass.getFullyQualifiedName())) 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 --- 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 - * + * * 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 --- 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() - .equals(parentClass.classFullyQualifiedName)) + .equals(parentClass.getFullyQualifiedName())) 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) - if ("boolean".equals(field.getType().classFullyQualifiedName)) + if ("boolean".equals(field.getType().getFullyQualifiedName())) return false; }