Added support for super-wildcards.

.gitignore

@@ -243,3 +243,7 @@
 /trunk/codemodel/codemodel-annotation-compiler/target
 /trunk/codemodel/codemodel-annotation-compiler/velocity.log
 /trunk/codemodel/codemodel-annotation-compiler/*.iml
+
+.gradle/
+codemodel/build/
+codemodel/target/

build.gradle

@@ -2,7 +2,7 @@ allprojects  {
   apply plugin: 'maven'
 
   group = 'com.unquietcode.tools.jcodemodel'
-  version = '1.0.2'
+  version = '1.0.2-SNAPSHOT'
 }
 
 subprojects {

codemodel-annotation-compiler/pom.xml

@@ -44,20 +44,20 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>unquietcode.tools.jcodemodel</groupId>
     <artifactId>codemodel-annotation-compiler</artifactId>
-    <version>1.0.2</version>
+    <version>1.0.2-SNAPSHOT</version>
     <name>Codemodel Annotation Compiler</name>
     <description>The annotation compiler ant task for the CodeModel java source code generation library</description>
     <parent>
         <groupId>unquietcode.tools.jcodemodel</groupId>
         <artifactId>codemodel-project</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <dependencies>
         <dependency>
             <groupId>unquietcode.tools.jcodemodel</groupId>
             <artifactId>codemodel</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.sun.istack</groupId>

codemodel/build.gradle

@@ -28,14 +28,14 @@ artifacts {
 uploadArchives {
 	repositories {
 		mavenDeployer {
-			beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+			//beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
 			repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-				authentication(userName: ossrhUsername, password: ossrhPassword)
+				authentication(userName: hasProperty('ossrhUsername')?ossrhUsername:'', password: hasProperty('ossrhPassword')?ossrhPassword:'')
 			}
 
 			snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-				authentication(userName: ossrhUsername, password: ossrhPassword)
+				authentication(userName: hasProperty('ossrhUsername')?ossrhUsername:'', password: hasProperty('ossrhPassword')?ossrhPassword:'')
 			}
 
 			pom.project {
@@ -70,6 +70,6 @@ uploadArchives {
 	}
 }
 
-signing {
-	sign configurations.archives
-}
+//signing {
+//	sign configurations.archives
+//}

codemodel/pom.xml

@@ -45,7 +45,7 @@
     <parent>
         <groupId>unquietcode.tools.jcodemodel</groupId>
         <artifactId>codemodel-project</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

codemodel/src/main/java/com/sun/codemodel/JAnnotationUse.java

@@ -306,10 +306,10 @@ public JAnnotationUse param(String name, JEnumConstant value){
       *  This can be used for e.g to specify
       * <pre>
       *        &#64;XmlCollectionItem(type=Integer.class);
-      * <pre>
-      * For adding a value of Class<? extends Annotation>
-      * @link
-      * #annotationParam(java.lang.String, java.lang.Class<? extends java.lang.annotation.Annotation>)
+      * </pre>
+      * For adding a value of {@code Class<? extends Annotation>}
+      * {@link
+      * #annotationParam(java.lang.String, java.lang.Class)}
       * @param name
       *        The simple name for this annotation param
       *

codemodel/src/main/java/com/sun/codemodel/JArray.java

@@ -37,66 +37,84 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-
 package com.sun.codemodel;
 
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * array creation and initialization.
  */
 public final class JArray extends JExpressionImpl {
 
     private final JType type;
-    private final JExpression size;
+    private final List<JExpression> sizes = new ArrayList<JExpression>();
     private List<JExpression> exprs = null;
 
     /**
      * Add an element to the array initializer
+     * @param e
+     * @return 
      */
     public JArray add(JExpression e) {
-        if (exprs == null)
+        if (exprs == null) {
             exprs = new ArrayList<JExpression>();
+        }
         exprs.add(e);
         return this;
     }
 
+    public JArray addSize(JExpression e) {
+        if (e != null) {
+            sizes.add(e);
+        }
+        return this;
+    }
+
     JArray(JType type, JExpression size) {
         this.type = type;
-        this.size = size;
+        if (size != null) {
+            sizes.add(size);
+        }
     }
 
     public void generate(JFormatter f) {
-        
+
         // generally we produce new T[x], but when T is an array type (T=T'[])
         // then new T'[][x] is wrong. It has to be new T'[x][].
         int arrayCount = 0;
         JType t = type;
-        
-        while( t.isArray() ) {
+
+        while (t.isArray()) {
             t = t.elementType();
             arrayCount++;
         }
 
-        f.p("new").g(t).p('[');
-        if (size != null)
-            f.g(size);
-        f.p(']');
-
-        for( int i=0; i<arrayCount; i++ )
-            f.p("[]");
-
-        if ((size == null) || (exprs != null))
+        if (arrayCount < sizes.size()) {
+            arrayCount = sizes.size();
+        }
+
+        f.p("new").g(t);
+
+        for (int i = 0; i < arrayCount; i++) {
+            f.p('[');
+            if (sizes.get(i) != null) {
+                f.g(sizes.get(i));
+            }
+            f.p(']');
+        }
+
+        if ((sizes.isEmpty()) || (exprs != null)) {
             f.p('{');
+        }
         if (exprs != null) {
             f.g(exprs);
         } else {
             f.p(' ');
         }
-        if ((size == null) || (exprs != null))
+        if ((sizes.isEmpty()) || (exprs != null)) {
             f.p('}');
+        }
     }
 
 }

codemodel/src/main/java/com/sun/codemodel/JArrayClass.java

@@ -40,8 +40,8 @@
 
 package com.sun.codemodel;
 
-import java.util.Iterator;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -135,4 +135,9 @@ protected JClass substituteParams(JTypeVar[] variables, List<JClass> bindings) {
         return new JArrayClass(owner(),c);
     }
 
+    @Override
+    public JClass inner(String name) {
+        return null;
+    }
+
 }

codemodel/src/main/java/com/sun/codemodel/JBlock.java

@@ -41,8 +41,8 @@
 package com.sun.codemodel;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Collections;
+import java.util.List;
 
 /**
  * A block of Java code, which may contain statements and local declarations.
@@ -66,19 +66,29 @@ public final class JBlock implements JGenerable, JStatement {
      */
     private boolean bracesRequired = true;
     private boolean indentRequired = true;
+    private boolean newlineRequired = true;
 
     /**
      * Current position.
      */
     private int pos;
 
     public JBlock() {
-        this(true,true);
+        this(true, true, true);
     }
 
     public JBlock(boolean bracesRequired, boolean indentRequired) {
+        this(bracesRequired, indentRequired, true);
+    }
+
+    public JBlock(boolean bracesRequired, boolean indentRequired, boolean newlineRequired) {
         this.bracesRequired = bracesRequired;
         this.indentRequired = indentRequired;
+        this.newlineRequired = newlineRequired;
+    }
+
+    public void setNewlineRequired(boolean val) {
+        this.newlineRequired = val;
     }
 
     /**
@@ -402,10 +412,17 @@ public void _continue() {
      */
     public JBlock block() {
         JBlock b = new JBlock();
-        b.bracesRequired = false;
-        b.indentRequired = false;
+        // why false? of course they are both required
+//        b.bracesRequired = false;
+//        b.indentRequired = false;
         return insert(b);
     }
+
+    public JSynchronized _synchronized(JExpression lock) {
+        JSynchronized syn = new JSynchronized(lock);
+        insert(syn);
+        return syn;
+    }
 
     /**
      * Creates a "literal" statement directly.
@@ -462,7 +479,7 @@ public JForEach forEach(JType varType, String name, JExpression collection) {
     }
     public void state(JFormatter f) {
         f.g(this);
-        if (bracesRequired)
+        if (newlineRequired)
             f.nl();
     }
 

codemodel/src/main/java/com/sun/codemodel/JCatchBlock.java

@@ -45,15 +45,18 @@
  * Catch block for a try/catch/finally statement
  */
 
-public class JCatchBlock implements JGenerable {
+public class JCatchBlock implements JTryBlock.CatchBlock {
 
     JClass exception;
     private JVar var = null;
     private JBlock body = new JBlock();
+    private boolean isMulti = false;
 
     JCatchBlock(JClass exception) {
         this.exception = exception;
     }
+
+
 
     public JVar param(String name) {
         if (var != null) throw new IllegalStateException();