X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Finspector%2Fjava%2Fstructure%2FClassGraph.java;h=c31124c17b75fe274d825c3fde63f0e3a09d8c72;hb=7d1259aea992843c47f29c932434a88ea9364f7e;hp=1488b1c49427c2fc249de03a8d352e2dd818da75;hpb=c680c10ad9057106e23b149246abdd84b41775ee;p=javainspect.git

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 1488b1c..c31124c 100755
--- 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-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
@@ -29,15 +29,13 @@ 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 String targetDirectory = CommonPathResolver.getDesktopDirectory()
-            .getAbsolutePath() + "/";
+    private final List<String> blacklistClassGlobs = new ArrayList<>();
 
+    private final List<String> whitelistClassGlobs = new ArrayList<>();
+    TargetImageType targetImageType = TargetImageType.SVG;
+    private File targetDirectory = CommonPathResolver.getDesktopDirectory();
     private boolean keepDotFile;
 
     public ClassGraph() {
@@ -72,7 +70,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: "
@@ -80,8 +78,12 @@ 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) {
+        this.targetImageType = targetImageType;
     }
 
     /**
@@ -92,36 +94,39 @@ public class ClassGraph {
 
     public void generateGraph(final String resultFileName) {
 
-        final String dotFilePath = targetDirectory + resultFileName + ".dot";
-        final String imageFilePath = targetDirectory + resultFileName + ".png";
-
-        System.out.println("Dot file path:" + dotFilePath);
+        final File dotFile = new File(targetDirectory, resultFileName + ".dot");
+        final File imageFile = new File(targetDirectory, resultFileName + "." + targetImageType.fileExtension);
 
         try {
             // write DOT file to disk
-            final PrintWriter out = new PrintWriter(dotFilePath, UTF_8);
+            final PrintWriter out = new PrintWriter(dotFile, UTF_8);
             out.write(getDot());
             out.close();
 
             // execute GraphViz to visualize graph
             try {
                 Runtime.getRuntime()
-                        .exec(new String[]{"dot", "-Tpng", dotFilePath, "-o",
-                                imageFilePath}).waitFor();
+                        .exec(new String[]{"dot",
+                                "-T" + targetImageType.fileExtension,
+                                dotFile.getAbsolutePath(),
+                                "-o",
+                                imageFile.getAbsolutePath()}).waitFor();
             } catch (final InterruptedException ignored) {
             }
 
             if (!keepDotFile)
                 // delete dot file
-                if (!new File(dotFilePath).delete()) throw new RuntimeException("Cannot delete file: " + dotFilePath);
+                if (!dotFile.delete())
+                    throw new RuntimeException("Cannot delete file: " + dotFile.getAbsolutePath());
+
         } catch (final IOException e) {
-            System.err.println(e);
+            throw new RuntimeException("Unable to generate graph: " + e.getMessage(), e);
         }
 
     }
 
     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");
@@ -132,8 +137,7 @@ public class ClassGraph {
 
         result.append("}\n");
 
-        final String resultStr = result.toString();
-        return resultStr;
+        return result.toString();
     }
 
     /**
@@ -176,12 +180,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;
@@ -196,18 +200,13 @@ public class ClassGraph {
         return this;
     }
 
-    public ClassGraph setTargetDirectory(String directoryPath) {
-        if (!directoryPath.endsWith("/"))
-            directoryPath += "/";
-
-        targetDirectory = directoryPath;
-
+    public ClassGraph setTargetDirectory(File targetDirectory) {
+        this.targetDirectory = targetDirectory;
         return this;
     }
 
-    public ClassGraph whitelistClassPattern(final String pattern) {
-        whitelistClassPatterns.add(pattern);
-
+    public ClassGraph whitelistClassGlob(final String glob) {
+        whitelistClassGlobs.add(glob);
         return this;
     }