X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=javainspect.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Finspector%2Fjava%2Fstructure%2FUtils.java;h=c6fe3f10335e96e4b826a5fb744ed3207826aee3;hp=c926d7827d251cd74fed2ac0ced3745fa56e9ba7;hb=7d1259aea992843c47f29c932434a88ea9364f7e;hpb=31e8e0b97c9f60f8820d708fa86c11d65f5445f3

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 c926d78..c6fe3f1 100755
--- 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-2014, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
- * 
+ * Copyright (C) 2013-2020, 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,132 +14,129 @@ 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() {
-		lastChosenDarkColor++;
-		if (lastChosenDarkColor >= darkColors.size())
-			lastChosenDarkColor = 0;
-
-		return darkColors.get(lastChosenDarkColor);
-	}
-
-	/**
-	 * retrieves colors from predefined palette
-	 */
-	public static String getNextLightColor() {
-		lastChosenLightColor++;
-		if (lastChosenLightColor >= lightColors.size())
-			lastChosenLightColor = 0;
-
-		return lightColors.get(lastChosenLightColor);
-	}
-
-	public static void initCommonObjectMethods() {
-		commonObjectMethods.add("wait");
-		commonObjectMethods.add("equals");
-		commonObjectMethods.add("toString");
-		commonObjectMethods.add("hashCode");
-		commonObjectMethods.add("notify");
-		commonObjectMethods.add("notifyAll");
-		commonObjectMethods.add("getClass");
-	}
-
-	public static void initDarkColors() {
-		darkColors.add("antiquewhite4");
-		darkColors.add("blueviolet");
-		darkColors.add("brown4");
-		darkColors.add("chartreuse4");
-		darkColors.add("cyan4");
-		darkColors.add("deeppink1");
-		darkColors.add("deepskyblue3");
-		darkColors.add("firebrick1");
-		darkColors.add("goldenrod3");
-		darkColors.add("gray0");
-	}
-
-	public static void initEnumMethods() {
-		enumMethods.add("values");
-		enumMethods.add("valueOf");
-		enumMethods.add("name");
-		enumMethods.add("compareTo");
-		enumMethods.add("valueOf");
-		enumMethods.add("getDeclaringClass");
-		enumMethods.add("ordinal");
-	}
-
-	public static void initLightColors() {
-		lightColors.add("olivedrab2");
-		lightColors.add("peachpuff2");
-		lightColors.add("seagreen1");
-		lightColors.add("violet");
-		lightColors.add("aqua");
-		lightColors.add("orange");
-	}
-
-	public static void initSystemDataTypes() {
-		systemDataTypes.add("void");
-		systemDataTypes.add("int");
-		systemDataTypes.add("long");
-		systemDataTypes.add("float");
-		systemDataTypes.add("double");
-		systemDataTypes.add("boolean");
-		systemDataTypes.add("char");
-		systemDataTypes.add("short");
-		systemDataTypes.add("byte");
-	}
-
-	public static void initSystemPackages() {
-		systemPackages.add("java.");
-		systemPackages.add("javax.");
-		systemPackages.add("sun.");
-	}
-
-	public static boolean isCommonObjectMethod(final String name) {
-		return commonObjectMethods.contains(name);
-	}
-
-	public static boolean isEnumMethod(final String name) {
-		return enumMethods.contains(name);
-	}
-
-	public static boolean isSystemDataType(final String name) {
-		return systemDataTypes.contains(name);
-	}
-
-	public static boolean isSystemPackage(final String name) {
-
-		for (final String packagePrefix : systemPackages)
-			if (name.startsWith(packagePrefix))
-				return true;
-
-		return false;
-	}
+    private static final List<String> systemDataTypes = new ArrayList<>();
+    private static final List<String> commonObjectMethods = new ArrayList<>();
+    private static final List<String> systemPackages = new ArrayList<>();
+    private static final List<String> darkColors = new ArrayList<>();
+    private static final List<String> lightColors = new ArrayList<>();
+    private static final List<String> enumMethods = new ArrayList<>();
+    private static int lastChosenDarkColor = -1;
+    private static int lastChosenLightColor = -1;
+
+    static {
+        initEnumMethods();
+        initSystemDataTypes();
+        initDarkColors();
+        initLightColors();
+        initCommonObjectMethods();
+        initSystemPackages();
+    }
+
+    /**
+     * retrieves colors from predefined palette
+     *
+     * @return next available dark color name
+     */
+    protected static String getNextDarkColor() {
+        lastChosenDarkColor++;
+        if (lastChosenDarkColor >= darkColors.size())
+            lastChosenDarkColor = 0;
+
+        return darkColors.get(lastChosenDarkColor);
+    }
+
+    /**
+     * retrieves colors from predefined palette
+     *
+     * @return next available light color name
+     */
+    protected static String getNextLightColor() {
+        lastChosenLightColor++;
+        if (lastChosenLightColor >= lightColors.size())
+            lastChosenLightColor = 0;
+
+        return lightColors.get(lastChosenLightColor);
+    }
+
+    private static void initCommonObjectMethods() {
+        commonObjectMethods.add("wait");
+        commonObjectMethods.add("equals");
+        commonObjectMethods.add("toString");
+        commonObjectMethods.add("hashCode");
+        commonObjectMethods.add("notify");
+        commonObjectMethods.add("notifyAll");
+        commonObjectMethods.add("getClass");
+    }
+
+    protected static void initDarkColors() {
+        darkColors.add("antiquewhite4");
+        darkColors.add("blueviolet");
+        darkColors.add("brown4");
+        darkColors.add("chartreuse4");
+        darkColors.add("cyan4");
+        darkColors.add("deeppink1");
+        darkColors.add("deepskyblue3");
+        darkColors.add("firebrick1");
+        darkColors.add("goldenrod3");
+        darkColors.add("gray0");
+    }
+
+    private static void initEnumMethods() {
+        enumMethods.add("values");
+        enumMethods.add("valueOf");
+        enumMethods.add("name");
+        enumMethods.add("compareTo");
+        enumMethods.add("valueOf");
+        enumMethods.add("getDeclaringClass");
+        enumMethods.add("ordinal");
+    }
+
+    private static void initLightColors() {
+        lightColors.add("olivedrab2");
+        lightColors.add("peachpuff2");
+        lightColors.add("seagreen1");
+        lightColors.add("violet");
+        lightColors.add("cyan");
+        lightColors.add("orange");
+    }
+
+    private static void initSystemDataTypes() {
+        systemDataTypes.add("void");
+        systemDataTypes.add("int");
+        systemDataTypes.add("long");
+        systemDataTypes.add("float");
+        systemDataTypes.add("double");
+        systemDataTypes.add("boolean");
+        systemDataTypes.add("char");
+        systemDataTypes.add("short");
+        systemDataTypes.add("byte");
+    }
+
+    private static void initSystemPackages() {
+        systemPackages.add("java.");
+        systemPackages.add("javax.");
+        systemPackages.add("sun.");
+    }
+
+    protected static boolean isCommonObjectMethod(final String name) {
+        return commonObjectMethods.contains(name);
+    }
+
+    protected static boolean isEnumMethod(final String name) {
+        return enumMethods.contains(name);
+    }
+
+    protected static boolean isSystemDataType(final String name) {
+        return systemDataTypes.contains(name);
+    }
+
+    protected static boolean isSystemPackage(final String name) {
+
+        for (final String packagePrefix : systemPackages)
+            if (name.startsWith(packagePrefix))
+                return true;
+
+        return false;
+    }
 
 }