Merge

langtools/make/tools/propertiesparser/parser/Message.java

@@ -20,6 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package propertiesparser.parser;
 
 import java.util.ArrayList;

langtools/make/tools/propertiesparser/parser/MessageFile.java

@@ -20,6 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package propertiesparser.parser;
 
 import java.io.*;

langtools/make/tools/propertiesparser/parser/MessageInfo.java

@@ -20,6 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package propertiesparser.parser;
 
 import propertiesparser.parser.MessageType.CompoundType;

langtools/make/tools/propertiesparser/parser/MessageLine.java

@@ -20,6 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package propertiesparser.parser;
 
 import java.util.regex.Pattern;

langtools/src/java.compiler/share/classes/javax/tools/DocumentationTool.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package javax.tools;
 
 import java.io.Writer;

langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/ErroneousTree.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.source.doctree;
 
 import javax.tools.Diagnostic;

langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/UnknownBlockTagTree.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.source.doctree;
 
 import java.util.List;

langtools/src/jdk.compiler/share/classes/com/sun/source/doctree/UnknownInlineTagTree.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.source.doctree;
 
 import java.util.List;

langtools/src/jdk.compiler/share/classes/com/sun/source/util/DocTreePathScanner.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.source.util;
 
 import com.sun.source.doctree.DocTree;

langtools/src/jdk.compiler/share/classes/com/sun/source/util/Plugin.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.source.util;
 
 import java.util.ServiceLoader;

langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java

@@ -23,7 +23,6 @@
  * questions.
  */
 
-
 package com.sun.tools.javac.api;
 
 import java.io.File;

langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.javac.api;
 
 import java.util.Locale;

langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/AnnoConstruct.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.javac.code;
 
 import java.lang.annotation.Annotation;

langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeMetadata.java

@@ -1,7 +1,6 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
- * reserved.  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as

langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Types.java

@@ -597,36 +597,42 @@ public class Types {
     }
 
     public Type removeWildcards(Type site) {
-        Type capturedSite = capture(site);
+        if (site.getTypeArguments().stream().anyMatch(t -> t.hasTag(WILDCARD))) {
-        if (capturedSite != site) {
+            //compute non-wildcard parameterization - JLS 9.9
-            Type formalInterface = site.tsym.type;
+            List<Type> actuals = site.getTypeArguments();
-            ListBuffer<Type> typeargs = new ListBuffer<>();
+            List<Type> formals = site.tsym.type.getTypeArguments();
-            List<Type> actualTypeargs = site.getTypeArguments();
+            ListBuffer<Type> targs = new ListBuffer<>();
-            List<Type> capturedTypeargs = capturedSite.getTypeArguments();
+            for (Type formal : formals) {
-            //simply replace the wildcards with its bound
+                Type actual = actuals.head;
-            for (Type t : formalInterface.getTypeArguments()) {
+                Type bound = formal.getUpperBound();
-                if (actualTypeargs.head.hasTag(WILDCARD)) {
+                if (actuals.head.hasTag(WILDCARD)) {
-                    WildcardType wt = (WildcardType)actualTypeargs.head;
+                    WildcardType wt = (WildcardType)actual;
-                    Type bound;
+                    //check that bound does not contain other formals
-                    switch (wt.kind) {
+                    if (bound.containsAny(formals)) {
-                        case EXTENDS:
+                        targs.add(wt.type);
-                        case UNBOUND:
+                    } else {
-                            CapturedType capVar = (CapturedType)capturedTypeargs.head;
+                        //compute new type-argument based on declared bound and wildcard bound
-                            //use declared bound if it doesn't depend on formal type-args
+                        switch (wt.kind) {
-                            bound = capVar.bound.containsAny(capturedSite.getTypeArguments()) ?
+                            case UNBOUND:
-                                    wt.type : capVar.bound;
+                                targs.add(bound);
-                            break;
+                                break;
-                        default:
+                            case EXTENDS:
-                            bound = wt.type;
+                                targs.add(glb(bound, wt.type));
+                                break;
+                            case SUPER:
+                                targs.add(wt.type);
+                                break;
+                            default:
+                                Assert.error("Cannot get here!");
+                        }
                     }
-                    typeargs.append(bound);
                 } else {
-                    typeargs.append(actualTypeargs.head);
+                    //not a wildcard - the new type argument remains unchanged
+                    targs.add(actual);
                 }
-                actualTypeargs = actualTypeargs.tail;
+                actuals = actuals.tail;
-                capturedTypeargs = capturedTypeargs.tail;
             }
-            return subst(formalInterface, formalInterface.getTypeArguments(), typeargs.toList());
+            return subst(site.tsym.type, formals, targs.toList());
         } else {
             return site;
         }
@@ -1436,12 +1442,13 @@ public class Types {
     public boolean isCastable(Type t, Type s, Warner warn) {
         if (t == s)
             return true;
-
+        if (t.isPrimitive() != s.isPrimitive()) {
-        if (t.isPrimitive() != s.isPrimitive())
+            t = skipTypeVars(t, false);
             return (isConvertible(t, s, warn)
                     || (allowObjectToPrimitiveCast &&
                         s.isPrimitive() &&
                         isSubtype(boxedClass(s).type, t)));
+        }
         if (warn != warnStack.head) {
             try {
                 warnStack = warnStack.prepend(warn);

langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.javac.comp;
 
 import com.sun.tools.javac.tree.*;

langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java

@@ -2707,11 +2707,11 @@ public class Lower extends TreeTranslator {
             if (fvs.nonEmpty()) {
                 List<Type> addedargtypes = List.nil();
                 for (List<VarSymbol> l = fvs; l.nonEmpty(); l = l.tail) {
+                    final Name pName = proxyName(l.head.name);
+                    m.capturedLocals =
+                        m.capturedLocals.prepend((VarSymbol)
+                                                (proxies.findFirst(pName)));
                     if (TreeInfo.isInitialConstructor(tree)) {
-                        final Name pName = proxyName(l.head.name);
-                        m.capturedLocals =
-                            m.capturedLocals.append((VarSymbol)
-                                                    (proxies.findFirst(pName)));
                         added = added.prepend(
                           initField(tree.body.pos, pName));
                     }

langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JRTIndex.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.javac.file;
 
 import java.io.IOException;

langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.javac.file;
 
 import java.io.File;

langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Profile.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.javac.jvm;
 
 import com.sun.tools.javac.util.Context;

langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.javac.main;
 
 import java.io.File;

langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/Parser.java

@@ -23,7 +23,6 @@
  * questions.
  */
 
-
 package com.sun.tools.javac.parser;
 
 import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;

langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/JDKPlatformProvider.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.javac.platform;
 
 import java.io.IOException;

langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/PlatformDescription.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.javac.platform;
 
 import java.io.Closeable;

langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/PlatformProvider.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.javac.platform;
 
 /** A collection of platform descriptions that can be selected using {@code -release name}

langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/PlatformUtils.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.javac.platform;
 
 import com.sun.tools.javac.main.Arguments;

langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/sym/Profiles.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.javac.sym;
 
 import java.io.BufferedInputStream;

langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/DocCommentTable.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.javac.tree;
 
 import com.sun.source.doctree.ErroneousTree;

langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.javac.util;
 
 import java.nio.file.Path;

langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ForwardingDiagnosticFormatter.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.javac.util;
 
 import java.util.Set;

langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Iterators.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.javac.util;
 
 import java.util.Iterator;

langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.javac.util;
 
 import java.util.Collection;

langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.javac.util;
 
 import java.nio.file.Path;

langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/LLNI.java

@@ -23,7 +23,6 @@
  * questions.
  */
 
-
 package com.sun.tools.javah;
 
 import java.io.OutputStream;

langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/Mangle.java

@@ -23,7 +23,6 @@
  * questions.
  */
 
-
 package com.sun.tools.javah;
 
 import javax.lang.model.element.ExecutableElement;

langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/TypeSignature.java

@@ -23,7 +23,6 @@
  * questions.
  */
 
-
 package com.sun.tools.javah;
 
 import java.util.*;

langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/Util.java

@@ -23,7 +23,6 @@
  * questions.
  */
 
-
 package com.sun.tools.javah;
 
 import java.io.PrintWriter;

langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/PubApiExtractor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/client/PortFileInaccessibleException.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.sjavac.client;
 
 import java.io.IOException;

langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/FileObjectWithLocation.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.sjavac.comp;
 
 import javax.tools.FileObject;

langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/JavaFileObjectWithLocation.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.sjavac.comp;
 
 import javax.tools.ForwardingJavaFileObject;

langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PathAndPackageVerifier.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.sjavac.comp;
 
 import java.nio.file.Path;

langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/PooledSjavac.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.sjavac.comp;
 
 import java.io.Writer;

langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SjavacImpl.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.sjavac.comp;
 
 import java.io.IOException;

langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/comp/SmartWriter.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.sjavac.comp;
 
 import java.io.*;

langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/ArrayTypeDesc.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.sjavac.pubapi;
 
 import java.io.Serializable;

langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PrimitiveTypeDesc.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.sjavac.pubapi;
 
 import java.io.Serializable;

langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubApi.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.sjavac.pubapi;
 
 

langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubMethod.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.sjavac.pubapi;
 
 import java.io.Serializable;

langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubType.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.sjavac.pubapi;
 
 import java.io.Serializable;

langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/PubVar.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.sjavac.pubapi;
 
 import java.io.Serializable;

langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/ReferenceTypeDesc.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.sjavac.pubapi;
 
 import java.io.Serializable;

langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/TypeDesc.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.sjavac.pubapi;
 
 import java.io.Serializable;

langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/pubapi/TypeVarTypeDesc.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.sjavac.pubapi;
 
 import java.io.Serializable;

langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/IdleResetSjavac.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.sjavac.server;
 
 import java.io.Writer;

langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/PortFileMonitor.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.sjavac.server;
 
 import java.io.IOException;

langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/RequestHandler.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.sjavac.server;
 
 import static com.sun.tools.sjavac.server.SjavacServer.LINE_TYPE_RC;

langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/Sjavac.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.sjavac.server;
 
 import java.io.Writer;

langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/SjavacServer.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.sjavac.server;
 
 import java.io.FileNotFoundException;

langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/Terminable.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.sjavac.server;
 
 /**

langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AbstractProfileIndexWriter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeFieldWriterImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.doclets.formats.html;
 
 import java.io.*;

langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/formats/html/LinkInfoImpl.java

@@ -23,7 +23,6 @@
  * questions.
  */
 
-
 package com.sun.tools.doclets.formats.html;
 
 import com.sun.javadoc.*;

langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeWriter.java

@@ -23,7 +23,6 @@
  * questions.
  */
 
-
 package com.sun.tools.doclets.internal.toolkit;
 
 import java.io.*;

langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ClassWriter.java

@@ -23,7 +23,6 @@
  * questions.
  */
 
-
 package com.sun.tools.doclets.internal.toolkit;
 
 import java.io.*;

langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ProfilePackageSummaryWriter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/ProfileSummaryWriter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.doclets.internal.toolkit.builders;
 
 import java.io.*;

langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/CodeTaglet.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.doclets.internal.toolkit.taglets;
 
 import java.util.Map;

langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/IndexTaglet.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.doclets.internal.toolkit.taglets;
 
 import java.util.Map;

langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LiteralTaglet.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.doclets.internal.toolkit.taglets;
 
 import java.util.Map;

langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.doclets.internal.toolkit.util;
 
 import java.text.MessageFormat;

langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets/internal/toolkit/util/TextTag.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.doclets.internal.toolkit.util;
 import com.sun.javadoc.*;
 

langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/api/JavadocTaskImpl.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.javadoc.api;
 
 import com.sun.tools.javac.util.ClientCodeException;

langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassWriter.java

@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -24,6 +23,7 @@
  * questions.
  */
 
+
 package com.sun.tools.classfile;
 
 import java.io.ByteArrayOutputStream;

langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/CompilationID_attribute.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.classfile;
 
 import java.io.IOException;

langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ConstantPoolException.java

@@ -23,7 +23,6 @@
  * questions.
  */
 
-
 package com.sun.tools.classfile;
 
 /*

langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Dependencies.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.classfile;
 
 import java.util.Deque;

langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Descriptor.java

@@ -23,7 +23,6 @@
  * questions.
  */
 
-
 package com.sun.tools.classfile;
 
 import java.io.IOException;

langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/DescriptorException.java

@@ -23,7 +23,6 @@
  * questions.
  */
 
-
 package com.sun.tools.classfile;
 
 /*

langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java

@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -24,6 +23,7 @@
  * questions.
  */
 
+
 package com.sun.tools.classfile;
 
 import java.io.IOException;

langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/SourceID_attribute.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.classfile;
 
 import java.io.IOException;

langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.javap;
 
 import com.sun.tools.classfile.Attribute;

langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Analyzer.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.jdeps;
 
 import java.io.PrintStream;

langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Archive.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.jdeps;
 
 import com.sun.tools.classfile.ClassFile;

langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ClassFileReader.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.jdeps;
 
 import com.sun.tools.classfile.ClassFile;

langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsTask.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.jdeps;
 
 import com.sun.tools.classfile.AccessFlags;

langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Module.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.jdeps;
 
 import java.util.Collections;

langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModulesXmlReader.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.jdeps;
 
 import java.io.IOException;

langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/PlatformClassPath.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.jdeps;
 
 import com.sun.tools.classfile.ClassFile;

langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Profile.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package com.sun.tools.jdeps;
 
 import java.io.IOException;

langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/remote/RemoteCodes.java

@@ -23,7 +23,6 @@
  * questions.
  */
 
-
 package jdk.internal.jshell.remote;
 
 import java.util.regex.Pattern;

langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/EditingHistory.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package jdk.internal.jshell.tool;
 
 import java.util.ArrayList;

langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/StopDetectingInputStream.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package jdk.internal.jshell.tool;
 
 import java.io.IOException;

langtools/src/jdk.jshell/share/classes/jdk/jshell/DeclarationSnippet.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package jdk.jshell;
 
 import java.util.Collection;

langtools/src/jdk.jshell/share/classes/jdk/jshell/ErroneousSnippet.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package jdk.jshell;
 
 import jdk.jshell.Key.ErroneousKey;

langtools/src/jdk.jshell/share/classes/jdk/jshell/Eval.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package jdk.jshell;
 
 import java.util.ArrayList;

langtools/src/jdk.jshell/share/classes/jdk/jshell/ExecutionControl.java

@@ -33,6 +33,7 @@ import java.net.ServerSocket;
 import java.net.Socket;
 import com.sun.jdi.*;
 import java.io.EOFException;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import jdk.jshell.ClassTracker.ClassInfo;
@@ -247,17 +248,18 @@ class ExecutionControl {
         //MessageOutput.textResources = ResourceBundle.getBundle("impl.TTYResources",
         //        Locale.getDefault());
 
-        String connect = "com.sun.jdi.CommandLineLaunch:";
+        String connectorName = "com.sun.jdi.CommandLineLaunch";
-        String cmdLine = "jdk.internal.jshell.remote.RemoteAgent";
         String classPath = System.getProperty("java.class.path");
         String bootclassPath = System.getProperty("sun.boot.class.path");
-        String javaArgs = "-classpath " + classPath + " -Xbootclasspath:" + bootclassPath;
+        String javaArgs = "-classpath \"" + classPath + "\" -Xbootclasspath:\"" + bootclassPath + "\"";
+        Map<String, String> argumentName2Value = new HashMap<>();
+        argumentName2Value.put("main", "jdk.internal.jshell.remote.RemoteAgent " + port);
+        argumentName2Value.put("options", javaArgs);
 
-        String connectSpec = connect + "main=" + cmdLine + " " + port + ",options=" + javaArgs + ",";
         boolean launchImmediately = true;
         int traceFlags = 0;// VirtualMachine.TRACE_SENDS | VirtualMachine.TRACE_EVENTS;
 
-        env.init(connectSpec, launchImmediately, traceFlags);
+        env.init(connectorName, argumentName2Value, launchImmediately, traceFlags);
 
         if (env.connection().isOpen() && env.vm().canBeModified()) {
             /*

langtools/src/jdk.jshell/share/classes/jdk/jshell/ExpressionSnippet.java

@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 package jdk.jshell;
 
 import jdk.jshell.Key.ExpressionKey;