Updated pattern name to glob to be more specific. Updated copyright.

diff --git a/src/main/java/eu/svjatoslav/inspector/java/Main.java b/src/main/java/eu/svjatoslav/inspector/java/Main.java
index f57f787..080bdab 100644 (file)
--- a/src/main/java/eu/svjatoslav/inspector/java/Main.java
+++ b/src/main/java/eu/svjatoslav/inspector/java/Main.java
@@ -20,7 +20,7 @@ public class Main {
                cg.setTargetDirectoryPath(getProperty("user.dir") + separator);
 
                cg.addProject(projectDir);
                cg.setTargetDirectoryPath(getProperty("user.dir") + separator);
 
                cg.addProject(projectDir);

-               cg.whitelistClassPattern(packageGlob);
+               cg.whitelistClassGlob(packageGlob);

                cg.setKeepDotFile(true);
                cg.generateGraph(graphName);
 
                cg.setKeepDotFile(true);
                cg.generateGraph(graphName);
 

diff --git a/src/main/java/eu/svjatoslav/inspector/java/RenderJavaInspect.java b/src/main/java/eu/svjatoslav/inspector/java/RenderJavaInspect.java
index c33c8a9..a616a63 100755 (executable)
--- a/src/main/java/eu/svjatoslav/inspector/java/RenderJavaInspect.java
+++ b/src/main/java/eu/svjatoslav/inspector/java/RenderJavaInspect.java
@@ -1,6 +1,6 @@
 /*
  * JavaInspect - Utility to visualize java software
 /*
  * 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
  *
  * 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

diff --git a/src/main/java/eu/svjatoslav/inspector/java/methods/Annotation.java b/src/main/java/eu/svjatoslav/inspector/java/methods/Annotation.java
index d4581b0..94b2232 100755 (executable)
--- a/src/main/java/eu/svjatoslav/inspector/java/methods/Annotation.java
+++ b/src/main/java/eu/svjatoslav/inspector/java/methods/Annotation.java
@@ -1,6 +1,6 @@
 /*
  * JavaInspect - Utility to visualize java software
 /*
  * 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
  * 
  * 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

diff --git a/src/main/java/eu/svjatoslav/inspector/java/methods/ClassReference.java b/src/main/java/eu/svjatoslav/inspector/java/methods/ClassReference.java
index 12216ab..a403494 100755 (executable)
--- a/src/main/java/eu/svjatoslav/inspector/java/methods/ClassReference.java
+++ b/src/main/java/eu/svjatoslav/inspector/java/methods/ClassReference.java
@@ -1,6 +1,6 @@
 /*
  * JavaInspect - Utility to visualize java software
 /*
  * 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
  * 
  * 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

diff --git a/src/main/java/eu/svjatoslav/inspector/java/methods/Clazz.java b/src/main/java/eu/svjatoslav/inspector/java/methods/Clazz.java
index 425098f..f6051c9 100755 (executable)
--- a/src/main/java/eu/svjatoslav/inspector/java/methods/Clazz.java
+++ b/src/main/java/eu/svjatoslav/inspector/java/methods/Clazz.java
@@ -1,6 +1,6 @@
 /*
  * JavaInspect - Utility to visualize java software
 /*
  * 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
  * 
  * 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

diff --git a/src/main/java/eu/svjatoslav/inspector/java/methods/EnumerationBuffer.java b/src/main/java/eu/svjatoslav/inspector/java/methods/EnumerationBuffer.java
index 15d2266..cc2691e 100755 (executable)
--- a/src/main/java/eu/svjatoslav/inspector/java/methods/EnumerationBuffer.java
+++ b/src/main/java/eu/svjatoslav/inspector/java/methods/EnumerationBuffer.java
@@ -1,6 +1,6 @@
 /*
  * JavaInspect - Utility to visualize java software
 /*
  * 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
  * 
  * 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

diff --git a/src/main/java/eu/svjatoslav/inspector/java/methods/Import.java b/src/main/java/eu/svjatoslav/inspector/java/methods/Import.java
index 33ac196..9c8b8c3 100755 (executable)
--- a/src/main/java/eu/svjatoslav/inspector/java/methods/Import.java
+++ b/src/main/java/eu/svjatoslav/inspector/java/methods/Import.java
@@ -1,6 +1,6 @@
 /*
  * JavaInspect - Utility to visualize java software
 /*
  * 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
  * 
  * 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

diff --git a/src/main/java/eu/svjatoslav/inspector/java/methods/JavaFile.java b/src/main/java/eu/svjatoslav/inspector/java/methods/JavaFile.java
index 29f1a1c..df53ee8 100755 (executable)
--- a/src/main/java/eu/svjatoslav/inspector/java/methods/JavaFile.java
+++ b/src/main/java/eu/svjatoslav/inspector/java/methods/JavaFile.java
@@ -1,6 +1,6 @@
 /*
  * JavaInspect - Utility to visualize java software
 /*
  * 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
  * 
  * 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

diff --git a/src/main/java/eu/svjatoslav/inspector/java/methods/Modifiers.java b/src/main/java/eu/svjatoslav/inspector/java/methods/Modifiers.java
index a062383..65626ef 100755 (executable)
--- a/src/main/java/eu/svjatoslav/inspector/java/methods/Modifiers.java
+++ b/src/main/java/eu/svjatoslav/inspector/java/methods/Modifiers.java
@@ -1,6 +1,6 @@
 /*
  * JavaInspect - Utility to visualize java software
 /*
  * 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
  * 
  * 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

diff --git a/src/main/java/eu/svjatoslav/inspector/java/methods/Package.java b/src/main/java/eu/svjatoslav/inspector/java/methods/Package.java
index 98e7cec..5412a8d 100755 (executable)
--- a/src/main/java/eu/svjatoslav/inspector/java/methods/Package.java
+++ b/src/main/java/eu/svjatoslav/inspector/java/methods/Package.java
@@ -1,6 +1,6 @@
 /*
  * JavaInspect - Utility to visualize java software
 /*
  * 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
  * 
  * 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

diff --git a/src/main/java/eu/svjatoslav/inspector/java/methods/Project.java b/src/main/java/eu/svjatoslav/inspector/java/methods/Project.java
index ba6c0ee..66c4e72 100755 (executable)
--- a/src/main/java/eu/svjatoslav/inspector/java/methods/Project.java
+++ b/src/main/java/eu/svjatoslav/inspector/java/methods/Project.java
@@ -1,6 +1,6 @@
 /*
  * JavaInspect - Utility to visualize java software
 /*
  * 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
  * 
  * 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

diff --git a/src/main/java/eu/svjatoslav/inspector/java/methods/ProjectScanner.java b/src/main/java/eu/svjatoslav/inspector/java/methods/ProjectScanner.java
index 78a5e9c..cf776c4 100755 (executable)
--- a/src/main/java/eu/svjatoslav/inspector/java/methods/ProjectScanner.java
+++ b/src/main/java/eu/svjatoslav/inspector/java/methods/ProjectScanner.java
@@ -1,6 +1,6 @@
 /*
  * JavaInspect - Utility to visualize java software
 /*
  * 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
  * 
  * 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

diff --git a/src/main/java/eu/svjatoslav/inspector/java/methods/package-info.java b/src/main/java/eu/svjatoslav/inspector/java/methods/package-info.java
index b18889c..35ee51d 100755 (executable)
--- a/src/main/java/eu/svjatoslav/inspector/java/methods/package-info.java
+++ b/src/main/java/eu/svjatoslav/inspector/java/methods/package-info.java
@@ -1,6 +1,6 @@
 /*
  * JavaInspect - Utility to visualize java software
 /*
  * 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
  * 
  * 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

diff --git a/src/main/java/eu/svjatoslav/inspector/java/structure/ClassDescriptor.java b/src/main/java/eu/svjatoslav/inspector/java/structure/ClassDescriptor.java
index 13d87b8..6a94130 100755 (executable)
--- a/src/main/java/eu/svjatoslav/inspector/java/structure/ClassDescriptor.java
+++ b/src/main/java/eu/svjatoslav/inspector/java/structure/ClassDescriptor.java
@@ -1,6 +1,6 @@
 /*
  * JavaInspect - Utility to visualize java software
 /*
  * 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
  *
  * 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

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..51fa04a 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
 /*
  * 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
  *
  * 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


@@ -32,9 +32,9 @@ public class ClassGraph {
      */
     private final Map<String, ClassDescriptor> fullyQualifiedNameToClassMap = new HashMap<String, ClassDescriptor>();
 
      */
     private final Map<String, ClassDescriptor> fullyQualifiedNameToClassMap = new HashMap<String, ClassDescriptor>();
 

-    private final List<String> blacklistClassPatterns = new ArrayList<String>();
+    private final List<String> blacklistClassGlobs = new ArrayList<String>();

 
 

-    private final List<String> whitelistClassPatterns = new ArrayList<String>();
+    private final List<String> whitelistClassGlobs = new ArrayList<>();

 
     private String targetDirectoryPath = CommonPathResolver.getDesktopDirectory()
             .getAbsolutePath() + separator;
 
     private String targetDirectoryPath = CommonPathResolver.getDesktopDirectory()
             .getAbsolutePath() + separator;


@@ -83,8 +83,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) {
     }
 
     public void setTargetImageType(TargetImageType targetImageType) {


@@ -183,12 +183,12 @@ public class ClassGraph {
     }
 
     protected boolean isClassShown(final String className) {
     }
 
     protected boolean isClassShown(final String className) {

-        for (final String pattern : blacklistClassPatterns)
+        for (final String pattern : blacklistClassGlobs)

             if (WildCardMatcher.match(className, pattern))
                 return false;
 
             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;
                 if (WildCardMatcher.match(className, pattern))
                     return true;
             return false;


@@ -212,9 +212,8 @@ public class ClassGraph {
         return this;
     }
 
         return this;
     }
 

-    public ClassGraph whitelistClassPattern(final String pattern) {
-        whitelistClassPatterns.add(pattern);
-
+    public ClassGraph whitelistClassGlob(final String glob) {
+        whitelistClassGlobs.add(glob);

         return this;
     }
 
         return this;
     }
 

diff --git a/src/main/java/eu/svjatoslav/inspector/java/structure/GraphElement.java b/src/main/java/eu/svjatoslav/inspector/java/structure/GraphElement.java
index 1e88dba..1504773 100755 (executable)
--- a/src/main/java/eu/svjatoslav/inspector/java/structure/GraphElement.java
+++ b/src/main/java/eu/svjatoslav/inspector/java/structure/GraphElement.java
@@ -1,6 +1,6 @@
 /*
  * JavaInspect - Utility to visualize java software
 /*
  * 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
  *
  * 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

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 1929348..3f7acef 100755 (executable)
--- a/src/main/java/eu/svjatoslav/inspector/java/structure/MethodDescriptor.java
+++ b/src/main/java/eu/svjatoslav/inspector/java/structure/MethodDescriptor.java
@@ -1,6 +1,6 @@
 /*
  * JavaInspect - Utility to visualize java software
 /*
  * 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
  *
  * 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

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 9f28ad1..435a3eb 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,6 +1,6 @@
 /*
  * JavaInspect - Utility to visualize java software
 /*
  * 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
  *
  * 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

diff --git a/src/main/java/eu/svjatoslav/inspector/java/structure/package-info.java b/src/main/java/eu/svjatoslav/inspector/java/structure/package-info.java
index eee827e..9c71850 100755 (executable)
--- a/src/main/java/eu/svjatoslav/inspector/java/structure/package-info.java
+++ b/src/main/java/eu/svjatoslav/inspector/java/structure/package-info.java
@@ -1,6 +1,6 @@
 /*
  * JavaInspect - Utility to visualize java software
 /*
  * 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
  * 
  * 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

diff --git a/usage examples/demo project/src/main/java/eu/svjatoslav/inspector/java/structure/example/RenderUsingReflection.java b/usage examples/demo project/src/main/java/eu/svjatoslav/inspector/java/structure/example/RenderUsingReflection.java
index df0ac1b..b528576 100755 (executable)
--- a/usage examples/demo project/src/main/java/eu/svjatoslav/inspector/java/structure/example/RenderUsingReflection.java
+++ b/usage examples/demo project/src/main/java/eu/svjatoslav/inspector/java/structure/example/RenderUsingReflection.java
@@ -1,6 +1,6 @@
 /*
  * JavaInspect - Utility to visualize java software
 /*
  * 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
  *
  * 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