[NETBEANS-54] Module Review jshell.support
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/0ed2eb83 Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/0ed2eb83 Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/0ed2eb83 Branch: refs/heads/jdk-javac Commit: 0ed2eb83b8cabbd97f874412f3bb176a2088ccda Parents: 4ee38a5 Author: Michael Simons <[email protected]> Authored: Sat Oct 7 21:13:17 2017 +0200 Committer: Emilian Bold <[email protected]> Committed: Sat Oct 7 22:13:17 2017 +0300 ---------------------------------------------------------------------- .../modules/jshell/project/Bundle.properties | 55 ++++++-------------- .../netbeans/modules/jshell/tool/Feedback.java | 37 ++++++------- 2 files changed, 32 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/0ed2eb83/jshell.support/src/org/netbeans/modules/jshell/project/Bundle.properties ---------------------------------------------------------------------- diff --git a/jshell.support/src/org/netbeans/modules/jshell/project/Bundle.properties b/jshell.support/src/org/netbeans/modules/jshell/project/Bundle.properties index 8a337d7..060e319 100644 --- a/jshell.support/src/org/netbeans/modules/jshell/project/Bundle.properties +++ b/jshell.support/src/org/netbeans/modules/jshell/project/Bundle.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + CHECK_EnableJShell=Enable JShell access JShellOptions.checkEnable.text=Enable JShell access JShellOptions.loaderSystem.text=System @@ -10,45 +27,7 @@ JShellOptions.classLoaderOptions.border.title=Classloader Policy JShellOptions.loader.system=System JShellOptions.loader.class=From class JShellOptions.loader.eval=Evaluate -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2016 Oracle and/or its affiliates. All rights reserved. - -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. - -# 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 -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. 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 -# nbbuild/licenses/CDDL-GPL-2-CP. 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. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" - -# 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 do not 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. - -# Contributor(s): -# Portions Copyrighted 2016 Sun Microsystems, Inc. JShellOptions2.checkEnable.text=Enable JShell access JShellOptions2.source.text= JShellOptions2.btnBrowseClass.text=Browse... http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/0ed2eb83/jshell.support/src/org/netbeans/modules/jshell/tool/Feedback.java ---------------------------------------------------------------------- diff --git a/jshell.support/src/org/netbeans/modules/jshell/tool/Feedback.java b/jshell.support/src/org/netbeans/modules/jshell/tool/Feedback.java index 10c3fa3..7a3d977 100644 --- a/jshell.support/src/org/netbeans/modules/jshell/tool/Feedback.java +++ b/jshell.support/src/org/netbeans/modules/jshell/tool/Feedback.java @@ -1,28 +1,21 @@ -/* - * Copyright (c) 2016, 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 - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ - package org.netbeans.modules.jshell.tool; import java.util.ArrayList;
