# HG changeset patch
# Parent 4f74c9883026e82fa40e8cf539c7a799528357f2

diff --git a/java.source/apichanges.xml b/java.source/apichanges.xml
--- a/java.source/apichanges.xml
+++ b/java.source/apichanges.xml
@@ -108,6 +108,20 @@
     <!-- ACTUAL CHANGES BEGIN HERE: -->
 
     <changes>
+        <change id="TypeUtilities.getTypeName">
+             <api name="general"/>
+             <summary>Added TypeUtilities.getTypeName method.</summary>
+             <version major="0" minor="62"/>
+             <date day="6" month="7" year="2010"/>
+             <author login="jlahoda"/>
+             <compatibility addition="yes" binary="compatible" deletion="no" deprecation="no" modification="no" semantic="compatible" source="compatible"/>
+             <description>
+                 Added <code>TypeUtilities.getTypeName</code> method, which
+                 allows to print type to string.
+             </description>
+             <class package="org.netbeans.api.java.source" name="TypeUtilities"/>
+             <issue number="104194"/>
+        </change>
         <change id="SourceUtils.getAttributeValueCompletions">
              <api name="general"/>
              <summary>Added SourceUtils.getAttributeValueCompletions method.</summary>
diff --git a/java.source/nbproject/project.properties b/java.source/nbproject/project.properties
--- a/java.source/nbproject/project.properties
+++ b/java.source/nbproject/project.properties
@@ -46,7 +46,7 @@
 javadoc.title=Java Source
 javadoc.arch=${basedir}/arch.xml
 javadoc.apichanges=${basedir}/apichanges.xml
-spec.version.base=0.61.0
+spec.version.base=0.62.0
 test.qa-functional.cp.extra=${refactoring.java.dir}/modules/ext/javac-api-nb-7.0-b07.jar
 test.unit.run.cp.extra=${o.n.core.dir}/core/core.jar:\
     ${o.n.core.dir}/lib/boot.jar:\
diff --git a/java.source/src/org/netbeans/api/java/source/TypeUtilities.java b/java.source/src/org/netbeans/api/java/source/TypeUtilities.java
--- a/java.source/src/org/netbeans/api/java/source/TypeUtilities.java
+++ b/java.source/src/org/netbeans/api/java/source/TypeUtilities.java
@@ -27,7 +27,7 @@
  * Contributor(s):
  *
  * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+ * Software is Sun Microsystems, Inc. Portions Copyright 1997-2010 Sun
  * Microsystems, Inc. All Rights Reserved.
  *
  * If you wish your version of this file to be governed by only the CDDL
@@ -45,9 +45,24 @@
 
 import com.sun.tools.javac.code.Type;
 import com.sun.tools.javac.code.Types;
+import java.util.Arrays;
+import java.util.EnumSet;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.ArrayType;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.ErrorType;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
+import javax.lang.model.type.TypeVariable;
+import javax.lang.model.type.WildcardType;
+import javax.lang.model.util.SimpleTypeVisitor6;
+import org.netbeans.api.annotations.common.CheckReturnValue;
+import org.netbeans.api.annotations.common.NonNull;
+import org.netbeans.api.annotations.common.NullAllowed;
 
 /**Various utilities related to the {@link TypeMirror}s.
  * 
@@ -114,4 +129,145 @@
         return Types.instance(info.impl.getJavacTask().getContext()).subst((Type)type, l1, l2);
     }
     
+    /**Get textual representation of the given type.
+     * 
+     * @param type to print
+     * @param options allows to specify various adjustments to the output text
+     * @return textual representation of the given type
+     * @since 0.62
+     */
+    public @NonNull @CheckReturnValue CharSequence getTypeName(@NullAllowed TypeMirror type, @NonNull TypeNameOptions... options) {
+	if (type == null)
+            return ""; //NOI18N
+        Set<TypeNameOptions> opt = EnumSet.noneOf(TypeNameOptions.class);
+        opt.addAll(Arrays.asList(options));
+        return new TypeNameVisitor(opt.contains(TypeNameOptions.PRINT_AS_VARARG)).visit(type, opt.contains(TypeNameOptions.PRINT_FQN)).toString();
+    }
+    
+    /**Options for the {@link #getTypeName(javax.lang.model.type.TypeMirror, org.netbeans.api.java.source.TypeUtilities.TypeNameOptions[]) } method.
+     * @since 0.62
+     */
+    public enum TypeNameOptions {
+        /**
+         * Print declared types as fully qualified names.
+         */
+        PRINT_FQN,
+        /**
+         * Print "..." instead of "[]".
+         */
+        PRINT_AS_VARARG;
+    }
+
+    private static final String UNKNOWN = "<unknown>"; //NOI18N
+    private static final String CAPTURED_WILDCARD = "<captured wildcard>"; //NOI18N
+    private static class TypeNameVisitor extends SimpleTypeVisitor6<StringBuilder,Boolean> {
+        
+        private boolean varArg;
+        private boolean insideCapturedWildcard = false;
+        
+        private TypeNameVisitor(boolean varArg) {
+            super(new StringBuilder());
+            this.varArg = varArg;
+        }
+        
+        @Override
+        public StringBuilder defaultAction(TypeMirror t, Boolean p) {
+            return DEFAULT_VALUE.append(t);
+        }
+        
+        @Override
+        public StringBuilder visitDeclared(DeclaredType t, Boolean p) {
+            Element e = t.asElement();
+            if (e instanceof TypeElement) {
+                TypeElement te = (TypeElement)e;
+                DEFAULT_VALUE.append((p ? te.getQualifiedName() : te.getSimpleName()).toString());
+                Iterator<? extends TypeMirror> it = t.getTypeArguments().iterator();
+                if (it.hasNext()) {
+                    DEFAULT_VALUE.append("<"); //NOI18N
+                    while(it.hasNext()) {
+                        visit(it.next(), p);
+                        if (it.hasNext())
+                            DEFAULT_VALUE.append(", "); //NOI18N
+                    }
+                    DEFAULT_VALUE.append(">"); //NOI18N
+                }
+                return DEFAULT_VALUE;                
+            } else {
+                return DEFAULT_VALUE.append(UNKNOWN); //NOI18N
+            }
+        }
+                        
+        @Override
+        public StringBuilder visitArray(ArrayType t, Boolean p) {
+            boolean isVarArg = varArg;
+            varArg = false;
+            visit(t.getComponentType(), p);
+            return DEFAULT_VALUE.append(isVarArg ? "..." : "[]"); //NOI18N
+        }
+
+        @Override
+        public StringBuilder visitTypeVariable(TypeVariable t, Boolean p) {
+            Element e = t.asElement();
+            if (e != null) {
+                String name = e.getSimpleName().toString();
+                if (!CAPTURED_WILDCARD.equals(name))
+                    return DEFAULT_VALUE.append(name);
+            }
+            DEFAULT_VALUE.append("?"); //NOI18N
+            if (!insideCapturedWildcard) {
+                insideCapturedWildcard = true;
+                TypeMirror bound = t.getLowerBound();
+                if (bound != null && bound.getKind() != TypeKind.NULL) {
+                    DEFAULT_VALUE.append(" super "); //NOI18N
+                    visit(bound, p);
+                } else {
+                    bound = t.getUpperBound();
+                    if (bound != null && bound.getKind() != TypeKind.NULL) {
+                        DEFAULT_VALUE.append(" extends "); //NOI18N
+                        if (bound.getKind() == TypeKind.TYPEVAR)
+                            bound = ((TypeVariable)bound).getLowerBound();
+                        visit(bound, p);
+                    }
+                }
+                insideCapturedWildcard = false;
+            }
+            return DEFAULT_VALUE;
+        }
+
+        @Override
+        public StringBuilder visitWildcard(WildcardType t, Boolean p) {
+            int len = DEFAULT_VALUE.length();
+            DEFAULT_VALUE.append("?"); //NOI18N
+            TypeMirror bound = t.getSuperBound();
+            if (bound == null) {
+                bound = t.getExtendsBound();
+                if (bound != null) {
+                    DEFAULT_VALUE.append(" extends "); //NOI18N
+                    if (bound.getKind() == TypeKind.WILDCARD)
+                        bound = ((WildcardType)bound).getSuperBound();
+                    visit(bound, p);
+                } else if (len == 0) {
+                    bound = SourceUtils.getBound(t);
+                    if (bound != null && (bound.getKind() != TypeKind.DECLARED || !((TypeElement)((DeclaredType)bound).asElement()).getQualifiedName().contentEquals("java.lang.Object"))) { //NOI18N
+                        DEFAULT_VALUE.append(" extends "); //NOI18N
+                        visit(bound, p);
+                    }
+                }
+            } else {
+                DEFAULT_VALUE.append(" super "); //NOI18N
+                visit(bound, p);
+            }
+            return DEFAULT_VALUE;
+        }
+
+        @Override
+        public StringBuilder visitError(ErrorType t, Boolean p) {
+            Element e = t.asElement();
+            if (e instanceof TypeElement) {
+                TypeElement te = (TypeElement)e;
+                return DEFAULT_VALUE.append((p ? te.getQualifiedName() : te.getSimpleName()).toString());
+            }
+            return DEFAULT_VALUE;
+        }
+    }
 }
diff --git a/java.source/test/unit/src/org/netbeans/api/java/source/TypeUtilitiesTest.java b/java.source/test/unit/src/org/netbeans/api/java/source/TypeUtilitiesTest.java
--- a/java.source/test/unit/src/org/netbeans/api/java/source/TypeUtilitiesTest.java
+++ b/java.source/test/unit/src/org/netbeans/api/java/source/TypeUtilitiesTest.java
@@ -27,7 +27,7 @@
  * Contributor(s):
  *
  * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun
+ * Software is Sun Microsystems, Inc. Portions Copyright 1997-2010 Sun
  * Microsystems, Inc. All Rights Reserved.
  *
  * If you wish your version of this file to be governed by only the CDDL
@@ -44,6 +44,7 @@
 package org.netbeans.api.java.source;
 
 import java.io.File;
+import java.io.IOException;
 import java.net.URL;
 import java.util.Collections;
 import javax.lang.model.element.TypeElement;
@@ -53,6 +54,8 @@
 import org.netbeans.junit.NbTestCase;
 import org.netbeans.modules.java.source.usages.IndexUtil;
 import org.netbeans.spi.java.classpath.support.ClassPathSupport;
+import org.openide.filesystems.FileObject;
+import org.openide.filesystems.FileUtil;
 
 /**
  *
@@ -143,4 +146,23 @@
         
     }
     
+    public void testTypeName() throws Exception {
+        FileObject root = FileUtil.createMemoryFileSystem().getRoot();
+        FileObject src  = root.createData("Test.java");
+        TestUtilities.copyStringToFile(src, "package test; public class Test {}");
+        JavaSource js = JavaSource.create(ClasspathInfo.create(ClassPathSupport.createClassPath(SourceUtilsTestUtil.getBootClassPath().toArray(new URL[0])), ClassPathSupport.createClassPath(new URL[0]), ClassPathSupport.createClassPath(new URL[0])), src);
+        
+        js.runUserActionTask(new Task<CompilationController>() {
+            public void run(CompilationController info) throws IOException  {
+                info.toPhase(JavaSource.Phase.RESOLVED);
+                TypeElement context = info.getTopLevelElements().get(0);
+                assertEquals("java.util.List<java.lang.String>[]", info.getTypeUtilities().getTypeName(info.getTreeUtilities().parseType("java.util.List<java.lang.String>[]", context), TypeUtilities.TypeNameOptions.PRINT_FQN));
+                assertEquals("List<String>[]", info.getTypeUtilities().getTypeName(info.getTreeUtilities().parseType("java.util.List<java.lang.String>[]", context)));
+                assertEquals("java.util.List<java.lang.String>...", info.getTypeUtilities().getTypeName(info.getTreeUtilities().parseType("java.util.List<java.lang.String>[]", context), TypeUtilities.TypeNameOptions.PRINT_FQN, TypeUtilities.TypeNameOptions.PRINT_AS_VARARG));
+                assertEquals("List<String>...", info.getTypeUtilities().getTypeName(info.getTreeUtilities().parseType("java.util.List<java.lang.String>[]", context), TypeUtilities.TypeNameOptions.PRINT_AS_VARARG));
+            }
+        }, true);
+        
+    }
+    
 }