1.1 --- a/cmdline/compiler/src/com/sun/tools/javac/api/JavacTaskImplHack.java Thu Nov 03 17:38:07 2016 +0100
1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
1.3 @@ -1,54 +0,0 @@
1.4 -/*
1.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1.6 - *
1.7 - * Copyright 2009-2010 Sun Microsystems, Inc. All rights reserved.
1.8 - *
1.9 - * The contents of this file are subject to the terms of either the GNU
1.10 - * General Public License Version 2 only ("GPL") or the Common
1.11 - * Development and Distribution License("CDDL") (collectively, the
1.12 - * "License"). You may not use this file except in compliance with the
1.13 - * License. You can obtain a copy of the License at
1.14 - * http://www.netbeans.org/cddl-gplv2.html
1.15 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
1.16 - * specific language governing permissions and limitations under the
1.17 - * License. When distributing the software, include this License Header
1.18 - * Notice in each file and include the License file at
1.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1.20 - * particular file as subject to the "Classpath" exception as provided
1.21 - * by Sun in the GPL Version 2 section of the License file that
1.22 - * accompanied this code. If applicable, add the following below the
1.23 - * License Header, with the fields enclosed by brackets [] replaced by
1.24 - * your own identifying information:
1.25 - * "Portions Copyrighted [year] [name of copyright owner]"
1.26 - *
1.27 - * If you wish your version of this file to be governed by only the CDDL
1.28 - * or only the GPL Version 2, indicate your decision by adding
1.29 - * "[Contributor] elects to include this software in this distribution
1.30 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
1.31 - * single choice of license, a recipient has the option to distribute
1.32 - * your version of this file under either the CDDL, the GPL Version 2 or
1.33 - * to extend the choice of license to its licensees as provided above.
1.34 - * However, if you add GPL Version 2 code and therefore, elected the GPL
1.35 - * Version 2 license, then the option applies only if the new code is
1.36 - * made subject to such option by the copyright holder.
1.37 - *
1.38 - * Contributor(s):
1.39 - *
1.40 - * Portions Copyrighted 2009-2010 Sun Microsystems, Inc.
1.41 - */
1.42 -
1.43 -package com.sun.tools.javac.api;
1.44 -
1.45 -import com.sun.tools.javac.util.Context;
1.46 -
1.47 -/**
1.48 - *
1.49 - * @author lahvac
1.50 - */
1.51 -public class JavacTaskImplHack extends JavacTaskImpl {
1.52 -
1.53 - public JavacTaskImplHack(Context ctx) {
1.54 - super(ctx);
1.55 - }
1.56 -
1.57 -}
2.1 --- a/cmdline/compiler/src/com/sun/tools/javac/resources/compiler.java Thu Nov 03 17:38:07 2016 +0100
2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
2.3 @@ -1,48 +0,0 @@
2.4 -/*
2.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2.6 - *
2.7 - * Copyright 2009-2010 Sun Microsystems, Inc. All rights reserved.
2.8 - *
2.9 - * The contents of this file are subject to the terms of either the GNU
2.10 - * General Public License Version 2 only ("GPL") or the Common
2.11 - * Development and Distribution License("CDDL") (collectively, the
2.12 - * "License"). You may not use this file except in compliance with the
2.13 - * License. You can obtain a copy of the License at
2.14 - * http://www.netbeans.org/cddl-gplv2.html
2.15 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
2.16 - * specific language governing permissions and limitations under the
2.17 - * License. When distributing the software, include this License Header
2.18 - * Notice in each file and include the License file at
2.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2.20 - * particular file as subject to the "Classpath" exception as provided
2.21 - * by Sun in the GPL Version 2 section of the License file that
2.22 - * accompanied this code. If applicable, add the following below the
2.23 - * License Header, with the fields enclosed by brackets [] replaced by
2.24 - * your own identifying information:
2.25 - * "Portions Copyrighted [year] [name of copyright owner]"
2.26 - *
2.27 - * If you wish your version of this file to be governed by only the CDDL
2.28 - * or only the GPL Version 2, indicate your decision by adding
2.29 - * "[Contributor] elects to include this software in this distribution
2.30 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
2.31 - * single choice of license, a recipient has the option to distribute
2.32 - * your version of this file under either the CDDL, the GPL Version 2 or
2.33 - * to extend the choice of license to its licensees as provided above.
2.34 - * However, if you add GPL Version 2 code and therefore, elected the GPL
2.35 - * Version 2 license, then the option applies only if the new code is
2.36 - * made subject to such option by the copyright holder.
2.37 - *
2.38 - * Contributor(s):
2.39 - *
2.40 - * Portions Copyrighted 2009-2010 Sun Microsystems, Inc.
2.41 - */
2.42 -
2.43 -package com.sun.tools.javac.resources;
2.44 -
2.45 -import org.netbeans.modules.jackpot30.compiler.CompilerResourcesImpl;
2.46 -
2.47 -/**
2.48 - *
2.49 - * @author lahvac
2.50 - */
2.51 -public class compiler extends CompilerResourcesImpl {}
3.1 --- a/cmdline/compiler/src/com/sun/tools/javac/resources/javac.java Thu Nov 03 17:38:07 2016 +0100
3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
3.3 @@ -1,48 +0,0 @@
3.4 -/*
3.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3.6 - *
3.7 - * Copyright 2009-2010 Sun Microsystems, Inc. All rights reserved.
3.8 - *
3.9 - * The contents of this file are subject to the terms of either the GNU
3.10 - * General Public License Version 2 only ("GPL") or the Common
3.11 - * Development and Distribution License("CDDL") (collectively, the
3.12 - * "License"). You may not use this file except in compliance with the
3.13 - * License. You can obtain a copy of the License at
3.14 - * http://www.netbeans.org/cddl-gplv2.html
3.15 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
3.16 - * specific language governing permissions and limitations under the
3.17 - * License. When distributing the software, include this License Header
3.18 - * Notice in each file and include the License file at
3.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
3.20 - * particular file as subject to the "Classpath" exception as provided
3.21 - * by Sun in the GPL Version 2 section of the License file that
3.22 - * accompanied this code. If applicable, add the following below the
3.23 - * License Header, with the fields enclosed by brackets [] replaced by
3.24 - * your own identifying information:
3.25 - * "Portions Copyrighted [year] [name of copyright owner]"
3.26 - *
3.27 - * If you wish your version of this file to be governed by only the CDDL
3.28 - * or only the GPL Version 2, indicate your decision by adding
3.29 - * "[Contributor] elects to include this software in this distribution
3.30 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
3.31 - * single choice of license, a recipient has the option to distribute
3.32 - * your version of this file under either the CDDL, the GPL Version 2 or
3.33 - * to extend the choice of license to its licensees as provided above.
3.34 - * However, if you add GPL Version 2 code and therefore, elected the GPL
3.35 - * Version 2 license, then the option applies only if the new code is
3.36 - * made subject to such option by the copyright holder.
3.37 - *
3.38 - * Contributor(s):
3.39 - *
3.40 - * Portions Copyrighted 2009-2010 Sun Microsystems, Inc.
3.41 - */
3.42 -
3.43 -package com.sun.tools.javac.resources;
3.44 -
3.45 -import org.netbeans.modules.jackpot30.compiler.CompilerResourcesImpl;
3.46 -
3.47 -/**
3.48 - *
3.49 - * @author lahvac
3.50 - */
3.51 -public class javac extends CompilerResourcesImpl {}
4.1 --- a/cmdline/compiler/src/org/netbeans/api/java/source/CompilationInfoHack.java Thu Nov 03 17:38:07 2016 +0100
4.2 +++ b/cmdline/compiler/src/org/netbeans/api/java/source/CompilationInfoHack.java Sat Jan 07 13:27:58 2017 +0100
4.3 @@ -43,7 +43,7 @@
4.4 import com.sun.source.util.JavacTask;
4.5 import com.sun.source.util.TreePath;
4.6 import com.sun.source.util.Trees;
4.7 -import com.sun.tools.javac.api.JavacTaskImplHack;
4.8 +import com.sun.tools.javac.api.JavacTaskImpl;
4.9 import com.sun.tools.javac.api.JavacTrees;
4.10 import com.sun.tools.javac.code.Source;
4.11 import com.sun.tools.javac.model.JavacElements;
4.12 @@ -118,7 +118,7 @@
4.13
4.14 try {
4.15 context.put(JavacTask.class, (JavacTask) null);
4.16 - javacTask.set(this.impl, new JavacTaskImplHack(context));
4.17 + javacTask.set(this.impl, new JavacTaskImpl(context) {});
4.18 } finally {
4.19 context.put(JavacTask.class, (JavacTask) null);
4.20 context.put(JavacTask.class, prevTask);