CODEMODEL-10 Implemented the istanceInit() method, added a unit test using the JavaParser.

git-svn-id: https://svn.java.net/svn/codemodel~svn@325 1b0cd94c-d507-0410-907c-c8211361794a

Author: lexi

trunk/codemodel/codemodel/pom.xml

@@ -60,5 +60,11 @@
             <version>4.8.1</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.javaparser</groupId>
+            <artifactId>javaparser</artifactId>
+            <version>1.0.8</version>
+            <scope>test</scope>
+        </dependency>		
     </dependencies>
 </project>

trunk/codemodel/codemodel/src/main/java/com/sun/codemodel/JDefinedClass.java

@@ -85,6 +85,9 @@ public class JDefinedClass
 
     /** Static initializer, if this class has one */
     private JBlock init = null;
+    
+    /** Instance initializer, if this class has one */
+    private JBlock instanceInit = null;
 
     /** class javadoc */
     private JDocComment jdoc = null;
@@ -532,6 +535,18 @@ public JBlock init() {
         return init;
     }
 
+    /**
+     * Creates, if necessary, and returns the instance initializer
+     * for this class.
+     *
+     * @return JBlock containing initialization statements for this class
+     */
+    public JBlock instanceInit() {
+        if (instanceInit == null)
+            instanceInit = new JBlock();
+        return instanceInit;
+    }
+    
     /**
      * Adds a constructor to this class.
      *
@@ -808,6 +823,8 @@ protected void declareBody(JFormatter f) {
             f.d(field);
         if (init != null)
             f.nl().p("static").s(init);
+        if (instanceInit != null)
+            f.nl().s(instanceInit);
         for (JMethod m : constructors) {
             f.nl().d(m);
         }

trunk/codemodel/codemodel/src/main/java/com/sun/codemodel/writer/OutputStreamCodeWriter.java

@@ -0,0 +1,88 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * 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
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License.  You can
+ * obtain a copy of the License at
+ * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt.  See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license."  If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above.  However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+/**
+ * Output all source files into a single stream.
+ * 
+ * This is primarily for test purposes.
+ * 
+ * @author
+ * 	Aleksei Valikov (valikov@gmx.net)
+ */
+package com.sun.codemodel.writer;
+
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
+
+import com.sun.codemodel.CodeWriter;
+import com.sun.codemodel.JPackage;
+
+public class OutputStreamCodeWriter extends CodeWriter {
+	private final PrintStream out;
+
+	/**
+	 * @param os
+	 *            This stream will be closed at the end of the code generation.
+	 */
+	public OutputStreamCodeWriter(OutputStream os, String encoding) {
+		try {
+			this.out = new PrintStream(os, false, encoding);
+		} catch (UnsupportedEncodingException ueex) {
+			throw new IllegalArgumentException(ueex);
+		}
+		this.encoding = encoding;
+	}
+
+	public OutputStream openBinary(JPackage pkg, String fileName)
+			throws IOException {
+		return new FilterOutputStream(out) {
+			public void close() {
+				// don't let this stream close
+			}
+		};
+	}
+
+	public void close() throws IOException {
+		out.close();
+	}
+}

trunk/codemodel/codemodel/src/test/java/com/sun/codemodel/tests/JDefinedClassInstanceInitTest.java

@@ -0,0 +1,49 @@
+package com.sun.codemodel.tests;
+
+import static org.junit.Assert.assertNotNull;
+import japa.parser.JavaParser;
+import japa.parser.ast.CompilationUnit;
+import japa.parser.ast.body.ClassOrInterfaceDeclaration;
+import japa.parser.ast.body.InitializerDeclaration;
+import japa.parser.ast.body.TypeDeclaration;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+
+import org.junit.Test;
+
+import com.sun.codemodel.JCodeModel;
+import com.sun.codemodel.JDefinedClass;
+import com.sun.codemodel.JExpr;
+import com.sun.codemodel.JFieldVar;
+import com.sun.codemodel.JMod;
+import com.sun.codemodel.writer.OutputStreamCodeWriter;
+
+public class JDefinedClassInstanceInitTest {
+
+	@Test
+	public void generatesInstanceInit() throws Exception {
+		JCodeModel cm = new JCodeModel();
+		JDefinedClass c = cm._package("myPackage")._class(0, "MyClass");
+		JFieldVar myField = c.field(JMod.PRIVATE, String.class, "myField");
+		c.instanceInit().assign(JExpr._this().ref(myField),
+				JExpr.lit("myValue"));
+		final ByteArrayOutputStream bos = new ByteArrayOutputStream();
+		final String encoding = "UTF-8";
+		cm.build(new OutputStreamCodeWriter(bos, encoding));
+		bos.close();
+
+		final ByteArrayInputStream bis = new ByteArrayInputStream(
+				bos.toByteArray());
+
+		CompilationUnit compilationUnit = JavaParser.parse(bis, encoding);
+
+		TypeDeclaration typeDeclaration = compilationUnit.getTypes().get(0);
+		ClassOrInterfaceDeclaration classDeclaration = (ClassOrInterfaceDeclaration) typeDeclaration;
+
+		final InitializerDeclaration initializerDeclaration = (InitializerDeclaration) classDeclaration
+				.getMembers().get(1);
+
+		assertNotNull(initializerDeclaration);
+	}
+}