fbaro · fbaro · May 9, 2018 · Dec 13, 2017 · Dec 13, 2017 · Dec 13, 2017
diff --git a/README.md b/README.md
@@ -12,8 +12,14 @@ this would be very tricky.
 
 A site with the links to the [API docs](http://phax.github.io/jcodemodel/) etc. is available.
 
-## News and noteworthy
+# News and noteworthy
 
+* v3.0.3 - work in progress
+  * Improved API access to inner classes (issue #60)
+* v3.0.2 - 2018-04-11
+  * Fixed method resolution using direct class references (issue #58)
+  * Added some additional `JInvocation.arg...` sanity methods
+  * Enum constant argument list is now accessible
 * v3.0.1 - 2017-10-25
   * Added explicit support for invoking `super` - thx to @heruan for pointing this out
   * Added possibility to create a lambda reference from an invocation (issue #56 and PR #57 from @heruan)
@@ -82,11 +88,11 @@ Add the following to your pom.xml to use this artifact:
 <dependency>
   <groupId>com.helger</groupId>
   <artifactId>jcodemodel</artifactId>
-  <version>3.0.1</version>
+  <version>3.0.2</version>
 </dependency>
 ```
 
 ---
 
-My personal [Coding Styleguide](https://github.com/phax/meta/blob/master/CodeingStyleguide.md) |
+My personal [Coding Styleguide](https://github.com/phax/meta/blob/master/CodingStyleguide.md) |
 On Twitter: <a href="https://twitter.com/philiphelger">@philiphelger</a>
diff --git a/findbugs-exclude.xml b/findbugs-exclude.xml
@@ -3,7 +3,7 @@
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
     Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
-    Portions Copyright 2013-2017 Philip Helger + contributors
+    Portions Copyright 2013-2018 Philip Helger + contributors
 
     The contents of this file are subject to the terms of either the GNU
     General Public License Version 2 only ("GPL") or the Common Development

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
     Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
-    Portions Copyright 2013-2017 Philip Helger + contributors
+    Portions Copyright 2013-2018 Philip Helger + contributors
 
     The contents of this file are subject to the terms of either the GNU
     General Public License Version 2 only ("GPL") or the Common Development
@@ -46,10 +46,10 @@
   <parent>
     <groupId>com.helger</groupId>
     <artifactId>parent-pom</artifactId>
-    <version>1.9.3</version>
+    <version>1.10.3</version>
   </parent>
   <artifactId>jcodemodel</artifactId>
-  <version>3.0.2-SNAPSHOT</version>
+  <version>3.0.3-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <name>jcodemodel</name>
   <description>Java code generation library</description>
@@ -137,7 +137,7 @@
     <dependency>
       <groupId>com.github.javaparser</groupId>
       <artifactId>javaparser-core</artifactId>
-      <version>3.5.6</version>
+      <version>3.6.4</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/src/etc/javadoc.css b/src/etc/javadoc.css
@@ -2,7 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright 2013-2017 Philip Helger + contributors
+ * Portions Copyright 2013-2018 Philip Helger + contributors
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development

diff --git a/src/etc/license-template.txt b/src/etc/license-template.txt
@@ -1,7 +1,7 @@
 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
 Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
-Portions Copyright 2013-2017 Philip Helger + contributors
+Portions Copyright 2013-2018 Philip Helger + contributors
 
 The contents of this file are subject to the terms of either the GNU
 General Public License Version 2 only ("GPL") or the Common Development

diff --git a/src/main/java/com/helger/jcodemodel/AbstractCodeWriter.java b/src/main/java/com/helger/jcodemodel/AbstractCodeWriter.java
@@ -2,7 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright 2013-2017 Philip Helger + contributors
+ * Portions Copyright 2013-2018 Philip Helger + contributors
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development

diff --git a/src/main/java/com/helger/jcodemodel/AbstractJAnnotationValue.java b/src/main/java/com/helger/jcodemodel/AbstractJAnnotationValue.java
@@ -2,7 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright 2013-2017 Philip Helger + contributors
+ * Portions Copyright 2013-2018 Philip Helger + contributors
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development

diff --git a/src/main/java/com/helger/jcodemodel/AbstractJAnnotationValueOwned.java b/src/main/java/com/helger/jcodemodel/AbstractJAnnotationValueOwned.java
@@ -2,7 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright 2013-2017 Philip Helger + contributors
+ * Portions Copyright 2013-2018 Philip Helger + contributors
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development

diff --git a/src/main/java/com/helger/jcodemodel/AbstractJClass.java b/src/main/java/com/helger/jcodemodel/AbstractJClass.java
@@ -2,7 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright 2013-2017 Philip Helger + contributors
+ * Portions Copyright 2013-2018 Philip Helger + contributors
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -42,6 +42,7 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -425,6 +426,42 @@ public final JTypeWildcard wildcard (@Nonnull final EWildcardBoundMode eMode)
   protected abstract AbstractJClass substituteParams (@Nonnull JTypeVar [] aVariables,
                                                       @Nonnull List <? extends AbstractJClass> aBindings);
 
+  /**
+   * Get all inner classes of this class.
+   *
+   * @return Never <code>null</code>.
+   * @since 3.0.3
+   */
+  @Nonnull
+  public Collection <AbstractJClassContainer <?>> getAllInnerClasses ()
+  {
+    if (this instanceof AbstractJClassContainer <?>)
+    {
+      @SuppressWarnings ("rawtypes")
+      final Collection <AbstractJClassContainer <?>> aInnerClasses = ((AbstractJClassContainer) this).classes ();
+      return aInnerClasses;
+    }
+    return Collections.emptyList ();
+  }
+
+  /**
+   * Check if this class is a class container and if so try to find the inner
+   * class with the provided name.
+   *
+   * @param sName
+   *        The name to check. May be <code>null</code>.
+   * @return The inner class with the provided name.
+   * @since 3.0.3
+   */
+  @Nullable
+  public AbstractJClassContainer <?> getInnerClass (@Nullable final String sName)
+  {
+    for (final AbstractJClassContainer <?> aInnerClass : getAllInnerClasses ())
+      if (aInnerClass.name ().equals (sName))
+        return aInnerClass;
+    return null;
+  }
+
   /**
    * @return name<code>.class</code>
    */

diff --git a/src/main/java/com/helger/jcodemodel/AbstractJClassContainer.java b/src/main/java/com/helger/jcodemodel/AbstractJClassContainer.java
@@ -2,7 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright 2013-2017 Philip Helger + contributors
+ * Portions Copyright 2013-2018 Philip Helger + contributors
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -82,8 +82,6 @@ public abstract class AbstractJClassContainer <CLASSTYPE extends AbstractJClassC
    * capitalized in a case sensitive file system (
    * {@link JCodeModel#isFileSystemCaseSensitive()}) to avoid conflicts. Lazily
    * created to save footprint.
-   *
-   * @see #_getClasses()
    */
   protected Map <String, CLASSTYPE> m_aClasses;
 
@@ -178,7 +176,8 @@ public String fullName ()
   }
 
   /**
-   * @return <code>true</code> if this is an anonymous class.
+   * @return <code>true</code> if this is an anonymous class. Note: this applies
+   *         only to classes.
    */
   public final boolean isAnonymous ()
   {
@@ -213,14 +212,6 @@ public final JPackage getPackage ()
     return parentContainer ().getPackage ();
   }
 
-  @Nonnull
-  private Map <String, CLASSTYPE> _getClasses ()
-  {
-    if (m_aClasses == null)
-      m_aClasses = new TreeMap <> ();
-    return m_aClasses;
-  }
-
   @Nonnull
   protected abstract CLASSTYPE createInnerClass (final int nMods,
                                                  @Nonnull final EClassType eClassType,
@@ -237,17 +228,25 @@ public final CLASSTYPE _class (final int nMods,
     else
       sRealName = sName;
 
-    final CLASSTYPE aExistingClass = _getClasses ().get (sRealName);
-    if (aExistingClass != null)
-      throw new JClassAlreadyExistsException (aExistingClass);
+    // Existing class?
+    if (m_aClasses != null)
+    {
+      final CLASSTYPE aExistingClass = m_aClasses.get (sRealName);
+      if (aExistingClass != null)
+        throw new JClassAlreadyExistsException (aExistingClass);
+    }
+    else
+      m_aClasses = new TreeMap <> ();
 
+    // Create and add inner class
     final CLASSTYPE c = createInnerClass (nMods, eClassType, sName);
-    _getClasses ().put (sRealName, c);
+    m_aClasses.put (sRealName, c);
     return c;
   }
 
   /**
    * Returns an iterator that walks the nested classes defined in this class.
+   * Don't modify the returned collection!
    */
   @Nonnull
   public final Collection <CLASSTYPE> classes ()

diff --git a/src/main/java/com/helger/jcodemodel/AbstractJGenerifiableImpl.java b/src/main/java/com/helger/jcodemodel/AbstractJGenerifiableImpl.java
@@ -2,7 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright 2013-2017 Philip Helger + contributors
+ * Portions Copyright 2013-2018 Philip Helger + contributors
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development

diff --git a/src/main/java/com/helger/jcodemodel/AbstractJResourceFile.java b/src/main/java/com/helger/jcodemodel/AbstractJResourceFile.java
@@ -2,7 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright 2013-2017 Philip Helger + contributors
+ * Portions Copyright 2013-2018 Philip Helger + contributors
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development

diff --git a/src/main/java/com/helger/jcodemodel/AbstractJType.java b/src/main/java/com/helger/jcodemodel/AbstractJType.java
@@ -2,7 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright 2013-2017 Philip Helger + contributors
+ * Portions Copyright 2013-2018 Philip Helger + contributors
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development

diff --git a/src/main/java/com/helger/jcodemodel/EClassType.java b/src/main/java/com/helger/jcodemodel/EClassType.java
@@ -2,7 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright 2013-2017 Philip Helger + contributors
+ * Portions Copyright 2013-2018 Philip Helger + contributors
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development

diff --git a/src/main/java/com/helger/jcodemodel/EWildcardBoundMode.java b/src/main/java/com/helger/jcodemodel/EWildcardBoundMode.java
@@ -2,7 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright 2013-2017 Philip Helger + contributors
+ * Portions Copyright 2013-2018 Philip Helger + contributors
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development

diff --git a/src/main/java/com/helger/jcodemodel/IJAnnotatable.java b/src/main/java/com/helger/jcodemodel/IJAnnotatable.java
@@ -2,7 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright 2013-2017 Philip Helger + contributors
+ * Portions Copyright 2013-2018 Philip Helger + contributors
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development

diff --git a/src/main/java/com/helger/jcodemodel/IJAnnotationWriter.java b/src/main/java/com/helger/jcodemodel/IJAnnotationWriter.java
@@ -2,7 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright 2013-2017 Philip Helger + contributors
+ * Portions Copyright 2013-2018 Philip Helger + contributors
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development

diff --git a/src/main/java/com/helger/jcodemodel/IJAssignmentTarget.java b/src/main/java/com/helger/jcodemodel/IJAssignmentTarget.java
@@ -2,7 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright 2013-2017 Philip Helger + contributors
+ * Portions Copyright 2013-2018 Philip Helger + contributors
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development

diff --git a/src/main/java/com/helger/jcodemodel/IJClassContainer.java b/src/main/java/com/helger/jcodemodel/IJClassContainer.java
@@ -2,7 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright 2013-2017 Philip Helger + contributors
+ * Portions Copyright 2013-2018 Philip Helger + contributors
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development

diff --git a/src/main/java/com/helger/jcodemodel/IJDeclaration.java b/src/main/java/com/helger/jcodemodel/IJDeclaration.java
@@ -2,7 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright 2013-2017 Philip Helger + contributors
+ * Portions Copyright 2013-2018 Philip Helger + contributors
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development

diff --git a/src/main/java/com/helger/jcodemodel/IJDocCommentable.java b/src/main/java/com/helger/jcodemodel/IJDocCommentable.java
@@ -2,7 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright 2013-2017 Philip Helger + contributors
+ * Portions Copyright 2013-2018 Philip Helger + contributors
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development

diff --git a/src/main/java/com/helger/jcodemodel/IJExpression.java b/src/main/java/com/helger/jcodemodel/IJExpression.java
@@ -2,7 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright 2013-2017 Philip Helger + contributors
+ * Portions Copyright 2013-2018 Philip Helger + contributors
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development

diff --git a/src/main/java/com/helger/jcodemodel/IJExpressionStatement.java b/src/main/java/com/helger/jcodemodel/IJExpressionStatement.java
@@ -2,7 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright 2013-2017 Philip Helger + contributors
+ * Portions Copyright 2013-2018 Philip Helger + contributors
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development

diff --git a/src/main/java/com/helger/jcodemodel/IJGenerable.java b/src/main/java/com/helger/jcodemodel/IJGenerable.java
@@ -2,7 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright 2013-2017 Philip Helger + contributors
+ * Portions Copyright 2013-2018 Philip Helger + contributors
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development

diff --git a/src/main/java/com/helger/jcodemodel/IJGenerifiable.java b/src/main/java/com/helger/jcodemodel/IJGenerifiable.java
@@ -2,7 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright 2013-2017 Philip Helger + contributors
+ * Portions Copyright 2013-2018 Philip Helger + contributors
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development

diff --git a/src/main/java/com/helger/jcodemodel/IJObject.java b/src/main/java/com/helger/jcodemodel/IJObject.java
@@ -2,7 +2,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright 2013-2017 Philip Helger + contributors
+ * Portions Copyright 2013-2018 Philip Helger + contributors
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development