reduced method visibility

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 c31c9f6..173ddc3 100755 (executable)
--- a/src/main/java/eu/svjatoslav/inspector/java/structure/MethodDescriptor.java
+++ b/src/main/java/eu/svjatoslav/inspector/java/structure/MethodDescriptor.java
@@ -15,20 +15,17 @@ import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * This class corresponds to single method within a java class.
+ */
 public class MethodDescriptor implements GraphElement,
                Comparable<MethodDescriptor> {
 
-       /**
-        * This class corresponds to single method within a java class.
-        */
-
-       public String methodName;
-       public ClassDescriptor returnType;
+       private final String methodName;
+       private ClassDescriptor returnType;
        private final ClassDescriptor parentClass;
-
-       List<ClassDescriptor> argumentTypes = new ArrayList<ClassDescriptor>();
-
-       boolean isInherited;
+       private final List<ClassDescriptor> argumentTypes = new ArrayList<ClassDescriptor>();
+       private boolean isInherited;
 
        public MethodDescriptor(final ClassDescriptor parent,
                        final String methodName) {
@@ -125,11 +122,11 @@ public class MethodDescriptor implements GraphElement,
                return parentClass.getGraphId() + ":" + methodName;
        }
 
-       public String getMethodLabel() {
+       private String getMethodLabel() {
                return methodName;
        }
 
-       public int getOutsideVisibleReferencesCount() {
+       protected int getOutsideVisibleReferencesCount() {
                int result = 0;
 
                if (returnType.isVisible())

diff --git a/src/main/java/eu/svjatoslav/inspector/java/structure/Utils.java b/src/main/java/eu/svjatoslav/inspector/java/structure/Utils.java
index b112e2d..de74c13 100755 (executable)
--- a/src/main/java/eu/svjatoslav/inspector/java/structure/Utils.java
+++ b/src/main/java/eu/svjatoslav/inspector/java/structure/Utils.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.
@@ -14,35 +14,10 @@ import java.util.List;
 
 public class Utils {
 
-       private static final List<String> systemDataTypes = new ArrayList<String>();
-
-       private static final List<String> commonObjectMethods = new ArrayList<String>();
-
-       private static final List<String> systemPackages = new ArrayList<String>();
-
-       private static final List<String> darkColors = new ArrayList<String>();
-
-       private static final List<String> lightColors = new ArrayList<String>();
-
-       private static final List<String> enumMethods = new ArrayList<String>();
-
-       public static int lastChosenDarkColor = -1;
-
-       public static int lastChosenLightColor = -1;
-
-       static {
-               initEnumMethods();
-               initSystemDataTypes();
-               initDarkColors();
-               initLightColors();
-               initCommonObjectMethods();
-               initSystemPackages();
-       }
-
        /**
         * retrieves colors from predefined palette
         */
-       public static String getNextDarkColor() {
+       protected static String getNextDarkColor() {
                lastChosenDarkColor++;
                if (lastChosenDarkColor >= darkColors.size())
                        lastChosenDarkColor = 0;
@@ -53,7 +28,7 @@ public class Utils {
        /**
         * retrieves colors from predefined palette
         */
-       public static String getNextLightColor() {
+       protected static String getNextLightColor() {
                lastChosenLightColor++;
                if (lastChosenLightColor >= lightColors.size())
                        lastChosenLightColor = 0;
@@ -61,7 +36,7 @@ public class Utils {
                return lightColors.get(lastChosenLightColor);
        }
 
-       public static void initCommonObjectMethods() {
+       private static void initCommonObjectMethods() {
                commonObjectMethods.add("wait");
                commonObjectMethods.add("equals");
                commonObjectMethods.add("toString");
@@ -71,7 +46,7 @@ public class Utils {
                commonObjectMethods.add("getClass");
        }
 
-       public static void initDarkColors() {
+       protected static void initDarkColors() {
                darkColors.add("antiquewhite4");
                darkColors.add("blueviolet");
                darkColors.add("brown4");
@@ -84,7 +59,7 @@ public class Utils {
                darkColors.add("gray0");
        }
 
-       public static void initEnumMethods() {
+       private static void initEnumMethods() {
                enumMethods.add("values");
                enumMethods.add("valueOf");
                enumMethods.add("name");
@@ -94,7 +69,7 @@ public class Utils {
                enumMethods.add("ordinal");
        }
 
-       public static void initLightColors() {
+       private static void initLightColors() {
                lightColors.add("olivedrab2");
                lightColors.add("peachpuff2");
                lightColors.add("seagreen1");
@@ -103,7 +78,7 @@ public class Utils {
                lightColors.add("orange");
        }
 
-       public static void initSystemDataTypes() {
+       private static void initSystemDataTypes() {
                systemDataTypes.add("void");
                systemDataTypes.add("int");
                systemDataTypes.add("long");
@@ -115,25 +90,25 @@ public class Utils {
                systemDataTypes.add("byte");
        }
 
-       public static void initSystemPackages() {
+       private static void initSystemPackages() {
                systemPackages.add("java.");
                systemPackages.add("javax.");
                systemPackages.add("sun.");
        }
 
-       public static boolean isCommonObjectMethod(final String name) {
+       protected static boolean isCommonObjectMethod(final String name) {
                return commonObjectMethods.contains(name);
        }
 
-       public static boolean isEnumMethod(final String name) {
+       protected static boolean isEnumMethod(final String name) {
                return enumMethods.contains(name);
        }
 
-       public static boolean isSystemDataType(final String name) {
+       protected static boolean isSystemDataType(final String name) {
                return systemDataTypes.contains(name);
        }
 
-       public static boolean isSystemPackage(final String name) {
+       protected static boolean isSystemPackage(final String name) {
 
                for (final String packagePrefix : systemPackages)
                        if (name.startsWith(packagePrefix))
@@ -142,4 +117,29 @@ public class Utils {
                return false;
        }
 
+       private static final List<String> systemDataTypes = new ArrayList<String>();
+
+       private static final List<String> commonObjectMethods = new ArrayList<String>();
+
+       private static final List<String> systemPackages = new ArrayList<String>();
+
+       private static final List<String> darkColors = new ArrayList<String>();
+
+       private static final List<String> lightColors = new ArrayList<String>();
+
+       private static final List<String> enumMethods = new ArrayList<String>();
+
+       private static int lastChosenDarkColor = -1;
+
+       private static int lastChosenLightColor = -1;
+
+       static {
+               initEnumMethods();
+               initSystemDataTypes();
+               initDarkColors();
+               initLightColors();
+               initCommonObjectMethods();
+               initSystemPackages();
+       }
+
 }