stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Lana Steuck 2015-12-17 20:25:21 -08:00
commit 2197283b8b
252 changed files with 764 additions and 431 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
langtools/make/tools/propertiesparser/parser/Message.java
View File

@ -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;

1
langtools/make/tools/propertiesparser/parser/MessageFile.java
View File

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

1
langtools/make/tools/propertiesparser/parser/MessageInfo.java
View File

@ -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;

1
langtools/make/tools/propertiesparser/parser/MessageLine.java
View File

@ -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;

1
langtools/src/java.compiler/share/classes/javax/tools/DocumentationTool.java
View File

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

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

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

@ -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;

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

@ -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;

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

@ -1,7 +1,6 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights
* reserved. DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE
* HEADER.
* Copyright (c) 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
* under the terms of the GNU General Public License version 2 only, as

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

@ -597,36 +597,42 @@ public class Types {
}
public Type removeWildcards(Type site) {
Type capturedSite = capture(site);
if (capturedSite != site) {
Type formalInterface = site.tsym.type;
ListBuffer<Type> typeargs = new ListBuffer<>();
List<Type> actualTypeargs = site.getTypeArguments();
List<Type> capturedTypeargs = capturedSite.getTypeArguments();
//simply replace the wildcards with its bound
for (Type t : formalInterface.getTypeArguments()) {
if (actualTypeargs.head.hasTag(WILDCARD)) {
WildcardType wt = (WildcardType)actualTypeargs.head;
Type bound;
switch (wt.kind) {
case EXTENDS:
case UNBOUND:
CapturedType capVar = (CapturedType)capturedTypeargs.head;
//use declared bound if it doesn't depend on formal type-args
bound = capVar.bound.containsAny(capturedSite.getTypeArguments()) ?
wt.type : capVar.bound;
break;
default:
bound = wt.type;
if (site.getTypeArguments().stream().anyMatch(t -> t.hasTag(WILDCARD))) {
//compute non-wildcard parameterization - JLS 9.9
List<Type> actuals = site.getTypeArguments();
List<Type> formals = site.tsym.type.getTypeArguments();
ListBuffer<Type> targs = new ListBuffer<>();
for (Type formal : formals) {
Type actual = actuals.head;
Type bound = formal.getUpperBound();
if (actuals.head.hasTag(WILDCARD)) {
WildcardType wt = (WildcardType)actual;
//check that bound does not contain other formals
if (bound.containsAny(formals)) {
targs.add(wt.type);
} else {
//compute new type-argument based on declared bound and wildcard bound
switch (wt.kind) {
case UNBOUND:
targs.add(bound);
break;
case EXTENDS:
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;
capturedTypeargs = capturedTypeargs.tail;
actuals = actuals.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);

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

@ -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.*;

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

@ -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));
}

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

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

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

@ -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;

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

@ -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;

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

@ -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}

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

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

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

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

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

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

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

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

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

@ -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

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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.*;

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

@ -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;

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

@ -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;

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

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

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

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

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

@ -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

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

@ -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

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

@ -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.*;

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

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

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

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

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

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

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

@ -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

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

@ -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

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

@ -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.*;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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.*;

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

@ -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;

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

@ -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;

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

@ -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;

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

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

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

@ -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;

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

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

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

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

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

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

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

@ -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;

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

@ -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;

1
langtools/src/jdk.jshell/share/classes/jdk/jshell/DeclarationSnippet.java
View File

@ -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;

1
langtools/src/jdk.jshell/share/classes/jdk/jshell/ErroneousSnippet.java
View File

@ -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;

1
langtools/src/jdk.jshell/share/classes/jdk/jshell/Eval.java
View File

@ -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;

12
langtools/src/jdk.jshell/share/classes/jdk/jshell/ExecutionControl.java
View File

@ -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 cmdLine = "jdk.internal.jshell.remote.RemoteAgent";
String connectorName = "com.sun.jdi.CommandLineLaunch";
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()) {
/*

1
langtools/src/jdk.jshell/share/classes/jdk/jshell/ExpressionSnippet.java
View File

@ -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;

Some files were not shown because too many files have changed in this diff Show More