X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Finspector%2Fjava%2Fstructure%2FClassGraph.java;h=cee1ee41f125069db0c48f597313f903d7043a41;hb=ffba53aac03e4d107545116ddcfff0c965bd5970;hp=46cbc695c1293711250660b8777307aad0e750ec;hpb=cd718904f053ee6901e9b21d76a024ef646bb01c;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 46cbc69..cee1ee4 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-2014, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ * 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
@@ -12,72 +12,48 @@ package eu.svjatoslav.inspector.java.structure;
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import eu.svjatoslav.commons.file.CommonPathResolver;
+import eu.svjatoslav.commons.string.WildCardMatcher;
 import eu.svjatoslav.inspector.java.methods.Clazz;
 import eu.svjatoslav.inspector.java.methods.ProjectScanner;
 
 public class ClassGraph {
 
-	public static void render(final String graphName, final Class... classes) {
-		final ClassGraph classGraph = new ClassGraph(classes);
-
-		classGraph.generateGraph(graphName);
-	}
-
 	/**
 	 * Maps class fully qualified names to class descriptors.
 	 */
 	private final Map<String, ClassDescriptor> fullyQualifiedNameToClassMap = new HashMap<String, ClassDescriptor>();
 
-	private Filter filter = new Filter();
+	private final List<String> blacklistClassPatterns = new ArrayList<String>();
 
-	public ClassGraph() {
-	}
+	private final List<String> whitelistClassPatterns = new ArrayList<String>();
 
-	/**
-	 * @param classes
-	 *            classes that shall be added to graph
-	 */
-	public ClassGraph(final Class<? extends Object>... classes) {
-		for (final Class<? extends Object> clazz : classes)
-			addClass(clazz);
+	public ClassGraph() {
 	}
 
 	/**
 	 * @param objects
 	 *            objects that shall be added to graph
 	 */
-	public ClassGraph(final Object... objects) {
-		for (final Object object : objects)
-			addClass(object.getClass());
-	}
-
-	/**
-	 * @param clazz
-	 *            class that shall be added to graph
-	 */
-	public ClassDescriptor addClass(final Class<? extends Object> clazz) {
-
-		if (clazz == null)
-			return null;
-
-		final String className = clazz.getName();
+	public ClassGraph add(final Object... objects) {
 
-		if (fullyQualifiedNameToClassMap.containsKey(className))
-			return fullyQualifiedNameToClassMap.get(className);
+		if (objects != null)
+			for (final Object object : objects)
+				addObject(object);
 
-		return new ClassDescriptor(clazz, this);
+		return this;
 	}
 
-	/**
-	 * @param object
-	 *            object that shall be added to graph
-	 */
-	public ClassDescriptor addObject(final Object object) {
-		return addClass(object.getClass());
+	private void addObject(final Object object) {
+		if (object instanceof Class)
+			getOrCreateClassDescriptor((Class) object);
+		else
+			getOrCreateClassDescriptor(object.getClass());
 	}
 
 	/**
@@ -91,13 +67,17 @@ public class ClassGraph {
 			try {
 				System.out.println("Class full name: " + clazz.getFullName());
 				final Class c = this.getClass().forName(clazz.getFullName());
-				addClass(c);
+				addObject(c);
 			} catch (final Exception exception) {
 				System.out.println("cannot add class: "
 						+ exception.getMessage());
 			}
 	}
 
+	public void blacklistClassPattern(final String pattern) {
+		blacklistClassPatterns.add(pattern);
+	}
+
 	/**
 	 * @param resultFileName
 	 *            file name for the generated graph. Existing file with the same
@@ -161,8 +141,8 @@ public class ClassGraph {
 			// execute GraphViz to visualize graph
 			try {
 				Runtime.getRuntime()
-						.exec(new String[] { "dot", "-Tpng", dotFilePath, "-o",
-								imageFilePath }).waitFor();
+				.exec(new String[] { "dot", "-Tpng", dotFilePath, "-o",
+						imageFilePath }).waitFor();
 			} catch (final InterruptedException e) {
 			} finally {
 			}
@@ -194,8 +174,29 @@ public class ClassGraph {
 		return resultStr;
 	}
 
-	public Filter getFilter() {
-		return filter;
+	/**
+	 * @param clazz
+	 *            class that shall be added to graph
+	 */
+	protected ClassDescriptor getOrCreateClassDescriptor(final Class clazz) {
+
+		if (clazz == null)
+			return null;
+
+		final String classFullyQualifiedName = clazz.getName();
+
+		// reuse existing instance if possible
+		if (fullyQualifiedNameToClassMap.containsKey(classFullyQualifiedName))
+			return fullyQualifiedNameToClassMap.get(classFullyQualifiedName);
+
+		// create new class descriptor
+		final ClassDescriptor newClassDescriptor = new ClassDescriptor(this);
+		fullyQualifiedNameToClassMap.put(classFullyQualifiedName,
+				newClassDescriptor);
+
+		newClassDescriptor.analyzeClass(clazz);
+
+		return newClassDescriptor;
 	}
 
 	/**
@@ -209,14 +210,23 @@ public class ClassGraph {
 
 	}
 
-	public void registerClass(final String classFullyQualifiedName,
-			final ClassDescriptor classDescriptor) {
-		fullyQualifiedNameToClassMap.put(classFullyQualifiedName,
-				classDescriptor);
+	public boolean isClassShown(final String className) {
+		for (final String pattern : blacklistClassPatterns)
+			if (WildCardMatcher.match(className, pattern))
+				return false;
+
+		if (!whitelistClassPatterns.isEmpty()) {
+			for (final String pattern : whitelistClassPatterns)
+				if (WildCardMatcher.match(className, pattern))
+					return true;
+			return false;
+		}
+
+		return true;
 	}
 
-	public void setFilter(final Filter filter) {
-		this.filter = filter;
+	public void whitelistClassPattern(final String pattern) {
+		whitelistClassPatterns.add(pattern);
 	}
 
 }