You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by jl...@apache.org on 2017/10/08 13:49:32 UTC
[15/50] [abbrv] incubator-netbeans git commit: [NETBEANS-54] Module
Review editor
[NETBEANS-54] Module Review editor
- No external libraries.
- Checked Rat report: added license to project files. Did NOT add license to editor/demosrc/README nor to the rest of test files.
- Unit tests org.netbeans.editor.PlainDocumentCompatibilityRandomTest and org.netbeans.modules.editor.NbEditorToolBarTest fail (but they were also failing before this PR).
- QA Tests should be run.
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/215acff0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/215acff0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/215acff0
Branch: refs/heads/jdk-javac
Commit: 215acff0f9714513987031fae8bf329b0514789c
Parents: fc44b5c
Author: Antonio Vieiro <an...@vieiro.net>
Authored: Tue Oct 3 09:14:10 2017 +0200
Committer: Junichi Yamamoto <ju...@apache.org>
Committed: Sat Oct 7 19:46:40 2017 +0900
----------------------------------------------------------------------
editor/demosrc/base/settings.properties | 50 ++++++-------------
editor/src/META-INF/netbeans/translate.names | 52 ++++++--------------
.../test/qa-functional/data/cp-prj-1/build.xml | 20 ++++++++
.../data/cp-prj-1/nbproject/project.properties | 17 +++++++
.../data/cp-prj-1/nbproject/project.xml | 20 ++++++++
.../data/projects/editor_test/build.xml | 20 ++++++++
.../editor_test/nbproject/project.properties | 17 +++++++
.../projects/editor_test/nbproject/project.xml | 20 ++++++++
.../editor/impl/KitsTracker-test-layer.xml | 20 ++++++++
.../SideBarFactoriesProvider-test-layer.xml | 20 ++++++++
10 files changed, 185 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/215acff0/editor/demosrc/base/settings.properties
----------------------------------------------------------------------
diff --git a/editor/demosrc/base/settings.properties b/editor/demosrc/base/settings.properties
index 3c8fa2a..4b58609 100644
--- a/editor/demosrc/base/settings.properties
+++ b/editor/demosrc/base/settings.properties
@@ -1,40 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# 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
#
-# Copyright (c) 2000, 2016 Oracle and/or its affiliates. All rights reserved.
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# 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):
+# 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.
+
# File with settings of kits the editor is providing, their recognized file
# types, icons, menu labels and so on.
#
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/215acff0/editor/src/META-INF/netbeans/translate.names
----------------------------------------------------------------------
diff --git a/editor/src/META-INF/netbeans/translate.names b/editor/src/META-INF/netbeans/translate.names
index 540b579..dea8e73 100644
--- a/editor/src/META-INF/netbeans/translate.names
+++ b/editor/src/META-INF/netbeans/translate.names
@@ -1,41 +1,21 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# 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
#
-# Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# 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):
+# 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.
+
# org.oldpackage.MyClass=org.newpackage.MyClass
org.netbeans.modules.editor.options.PlainPrintOptions=org.netbeans.modules.editor.plain.options.PlainPrintOptions
org.netbeans.modules.editor.options.JavaPrintOptions=org.netbeans.modules.java.editor.options.JavaPrintOptions
-org.netbeans.modules.editor.options.HTMLPrintOptions=org.netbeans.modules.html.editor.options.HTMLPrintOptions
\ No newline at end of file
+org.netbeans.modules.editor.options.HTMLPrintOptions=org.netbeans.modules.html.editor.options.HTMLPrintOptions
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/215acff0/editor/test/qa-functional/data/cp-prj-1/build.xml
----------------------------------------------------------------------
diff --git a/editor/test/qa-functional/data/cp-prj-1/build.xml b/editor/test/qa-functional/data/cp-prj-1/build.xml
index 1f25285..d7db021 100644
--- a/editor/test/qa-functional/data/cp-prj-1/build.xml
+++ b/editor/test/qa-functional/data/cp-prj-1/build.xml
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
<!-- You may freely edit this file. See commented blocks below for -->
<!-- some examples of how to customize the build. -->
<!-- (If you delete it and reopen the project it will be recreated.) -->
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/215acff0/editor/test/qa-functional/data/cp-prj-1/nbproject/project.properties
----------------------------------------------------------------------
diff --git a/editor/test/qa-functional/data/cp-prj-1/nbproject/project.properties b/editor/test/qa-functional/data/cp-prj-1/nbproject/project.properties
index 6df67d7..5186731 100644
--- a/editor/test/qa-functional/data/cp-prj-1/nbproject/project.properties
+++ b/editor/test/qa-functional/data/cp-prj-1/nbproject/project.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.
+
application.args=
build.classes.dir=${build.dir}/classes
build.classes.excludes=**/*.java,**/*.form
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/215acff0/editor/test/qa-functional/data/cp-prj-1/nbproject/project.xml
----------------------------------------------------------------------
diff --git a/editor/test/qa-functional/data/cp-prj-1/nbproject/project.xml b/editor/test/qa-functional/data/cp-prj-1/nbproject/project.xml
index 43c9eee..733578c 100644
--- a/editor/test/qa-functional/data/cp-prj-1/nbproject/project.xml
+++ b/editor/test/qa-functional/data/cp-prj-1/nbproject/project.xml
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.java.j2seproject</type>
<configuration>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/215acff0/editor/test/qa-functional/data/projects/editor_test/build.xml
----------------------------------------------------------------------
diff --git a/editor/test/qa-functional/data/projects/editor_test/build.xml b/editor/test/qa-functional/data/projects/editor_test/build.xml
index f6bff2d..cc762b0 100644
--- a/editor/test/qa-functional/data/projects/editor_test/build.xml
+++ b/editor/test/qa-functional/data/projects/editor_test/build.xml
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
<!-- You may freely edit this file. See commented blocks below for -->
<!-- some examples of how to customize the build. -->
<!-- (If you delete it and reopen the project it will be recreated.) -->
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/215acff0/editor/test/qa-functional/data/projects/editor_test/nbproject/project.properties
----------------------------------------------------------------------
diff --git a/editor/test/qa-functional/data/projects/editor_test/nbproject/project.properties b/editor/test/qa-functional/data/projects/editor_test/nbproject/project.properties
index c670c69..fa94834 100644
--- a/editor/test/qa-functional/data/projects/editor_test/nbproject/project.properties
+++ b/editor/test/qa-functional/data/projects/editor_test/nbproject/project.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.
+
application.args=
build.classes.dir=${build.dir}/classes
build.classes.excludes=**/*.java,**/*.form
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/215acff0/editor/test/qa-functional/data/projects/editor_test/nbproject/project.xml
----------------------------------------------------------------------
diff --git a/editor/test/qa-functional/data/projects/editor_test/nbproject/project.xml b/editor/test/qa-functional/data/projects/editor_test/nbproject/project.xml
index 16aef3d..0f996d2 100644
--- a/editor/test/qa-functional/data/projects/editor_test/nbproject/project.xml
+++ b/editor/test/qa-functional/data/projects/editor_test/nbproject/project.xml
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.java.j2seproject</type>
<configuration>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/215acff0/editor/test/unit/src/org/netbeans/modules/editor/impl/KitsTracker-test-layer.xml
----------------------------------------------------------------------
diff --git a/editor/test/unit/src/org/netbeans/modules/editor/impl/KitsTracker-test-layer.xml b/editor/test/unit/src/org/netbeans/modules/editor/impl/KitsTracker-test-layer.xml
index 4102a4e..4197150 100644
--- a/editor/test/unit/src/org/netbeans/modules/editor/impl/KitsTracker-test-layer.xml
+++ b/editor/test/unit/src/org/netbeans/modules/editor/impl/KitsTracker-test-layer.xml
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.0//EN" "http://www.netbeans.org/dtds/filesystem-1_0.dtd">
<filesystem>
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/215acff0/editor/test/unit/src/org/netbeans/modules/editor/impl/SideBarFactoriesProvider-test-layer.xml
----------------------------------------------------------------------
diff --git a/editor/test/unit/src/org/netbeans/modules/editor/impl/SideBarFactoriesProvider-test-layer.xml b/editor/test/unit/src/org/netbeans/modules/editor/impl/SideBarFactoriesProvider-test-layer.xml
index af37436..4688946 100644
--- a/editor/test/unit/src/org/netbeans/modules/editor/impl/SideBarFactoriesProvider-test-layer.xml
+++ b/editor/test/unit/src/org/netbeans/modules/editor/impl/SideBarFactoriesProvider-test-layer.xml
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.0//EN" "http://www.netbeans.org/dtds/filesystem-1_0.dtd">
<filesystem>