Code cleanup.

[javainspect.git] / src / main / java / eu / svjatoslav / inspector / java / structure / ClassGraph.java

diff --git a/src/main/java/eu/svjatoslav/inspector/java/structure/ClassGraph.java b/src/main/java/eu/svjatoslav/inspector/java/structure/ClassGraph.java
index a4d9015..1747614 100755 (executable)
--- a/src/main/java/eu/svjatoslav/inspector/java/structure/ClassGraph.java
+++ b/src/main/java/eu/svjatoslav/inspector/java/structure/ClassGraph.java
@@ -1,6 +1,6 @@
 /*
  * JavaInspect - Utility to visualize java software
- * Copyright (C) 2013-2015, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ * Copyright (C) 2013-2017, 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
@@ -30,19 +30,16 @@ public class ClassGraph {
     /**
      * Maps class fully qualified names to class descriptors.
      */
-    private final Map<String, ClassDescriptor> fullyQualifiedNameToClassMap = new HashMap<String, ClassDescriptor>();
+    private final Map<String, ClassDescriptor> fullyQualifiedNameToClassMap = new HashMap<>();
 
-    private final List<String> blacklistClassPatterns = new ArrayList<String>();
-
-    private final List<String> whitelistClassPatterns = new ArrayList<String>();
+    private final List<String> blacklistClassGlobs = new ArrayList<>();
 
+    private final List<String> whitelistClassGlobs = new ArrayList<>();
+    TargetImageType targetImageType = TargetImageType.SVG;
     private String targetDirectoryPath = CommonPathResolver.getDesktopDirectory()
             .getAbsolutePath() + separator;
-
     private boolean keepDotFile;
 
-    TargetImageType targetImageType = TargetImageType.SVG;
-
     public ClassGraph() {
     }
 
@@ -75,7 +72,7 @@ public class ClassGraph {
         for (final Clazz clazz : projectScanner.getAllClasses())
             try {
                 System.out.println("Class full name: " + clazz.getFullName());
-                final Class c = this.getClass().forName(clazz.getFullName());
+                final Class c = Class.forName(clazz.getFullName());
                 addObject(c);
             } catch (final Exception exception) {
                 System.out.println("cannot add class: "
@@ -83,8 +80,8 @@ public class ClassGraph {
             }
     }
 
-    public void blacklistClassPattern(final String pattern) {
-        blacklistClassPatterns.add(pattern);
+    public void blacklistClassGlob(final String glob) {
+        blacklistClassGlobs.add(glob);
     }
 
     public void setTargetImageType(TargetImageType targetImageType) {
@@ -128,7 +125,7 @@ public class ClassGraph {
     }
 
     private String getDot() {
-        final StringBuffer result = new StringBuffer();
+        final StringBuilder result = new StringBuilder();
 
         result.append("digraph Java {\n");
         result.append("graph [rankdir=LR, overlap = false, concentrate=true];\n");
@@ -139,8 +136,7 @@ public class ClassGraph {
 
         result.append("}\n");
 
-        final String resultStr = result.toString();
-        return resultStr;
+        return result.toString();
     }
 
     /**
@@ -183,12 +179,12 @@ public class ClassGraph {
     }
 
     protected boolean isClassShown(final String className) {
-        for (final String pattern : blacklistClassPatterns)
+        for (final String pattern : blacklistClassGlobs)
             if (WildCardMatcher.match(className, pattern))
                 return false;
 
-        if (!whitelistClassPatterns.isEmpty()) {
-            for (final String pattern : whitelistClassPatterns)
+        if (!whitelistClassGlobs.isEmpty()) {
+            for (final String pattern : whitelistClassGlobs)
                 if (WildCardMatcher.match(className, pattern))
                     return true;
             return false;
@@ -212,9 +208,8 @@ public class ClassGraph {
         return this;
     }
 
-    public ClassGraph whitelistClassPattern(final String pattern) {
-        whitelistClassPatterns.add(pattern);
-
+    public ClassGraph whitelistClassGlob(final String glob) {
+        whitelistClassGlobs.add(glob);
         return this;
     }