Repository: incubator-netbeans Updated Branches: refs/heads/master 90564d1f4 -> 6975dc089
[NETBEANS-54] Module Review git Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/6975dc08 Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/6975dc08 Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/6975dc08 Branch: refs/heads/master Commit: 6975dc089b8c80fa08ffe6ed126263b8ea8fad27 Parents: 90564d1 Author: Tim Riemer <[email protected]> Authored: Mon Oct 9 07:40:14 2017 +0200 Committer: Emilian Bold <[email protected]> Committed: Mon Oct 9 08:40:14 2017 +0300 ---------------------------------------------------------------------- .../modules/git/options/Bundle.properties | 56 ++++++-------------- .../modules/git/ui/selectors/Bundle.properties | 55 ++++++------------- git/test/qa-functional/data/files/text.txt | 17 ++++++ 3 files changed, 49 insertions(+), 79 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6975dc08/git/src/org/netbeans/modules/git/options/Bundle.properties ---------------------------------------------------------------------- diff --git a/git/src/org/netbeans/modules/git/options/Bundle.properties b/git/src/org/netbeans/modules/git/options/Bundle.properties index eeb365a..dc19a55 100644 --- a/git/src/org/netbeans/modules/git/options/Bundle.properties +++ b/git/src/org/netbeans/modules/git/options/Bundle.properties @@ -1,44 +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. - -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2010 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 2010 Sun Microsystems, Inc. GitOptionsPanel.cbOpenOutputWindow.text=Automatically open Output &window tabs ACSD_cbOpenOutputWindow=Git commands log their output into output window tabs which are opened if needed. http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6975dc08/git/src/org/netbeans/modules/git/ui/selectors/Bundle.properties ---------------------------------------------------------------------- diff --git a/git/src/org/netbeans/modules/git/ui/selectors/Bundle.properties b/git/src/org/netbeans/modules/git/ui/selectors/Bundle.properties index 3c5b66c..886cb70 100644 --- a/git/src/org/netbeans/modules/git/ui/selectors/Bundle.properties +++ b/git/src/org/netbeans/modules/git/ui/selectors/Bundle.properties @@ -1,42 +1,19 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -# Copyright 2011 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 2011 Sun Microsystems, Inc. +# 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. ItemsPanel.titleLabel.toolTipText=Available remote branches http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6975dc08/git/test/qa-functional/data/files/text.txt ---------------------------------------------------------------------- diff --git a/git/test/qa-functional/data/files/text.txt b/git/test/qa-functional/data/files/text.txt index f3a3485..6c9af59 100644 --- a/git/test/qa-functional/data/files/text.txt +++ b/git/test/qa-functional/data/files/text.txt @@ -1 +1,18 @@ +# 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. + text \ No newline at end of file
