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:50:00 UTC
[43/50] [abbrv] incubator-netbeans git commit: [NETBEANS-54] Module
Review beans
[NETBEANS-54] Module Review beans
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/b3a2ebd5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/b3a2ebd5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/b3a2ebd5
Branch: refs/heads/jdk-javac
Commit: b3a2ebd532dec0839d6749e8e7915e2b0c69bd7c
Parents: e93eb15
Author: Bastien Jansen <ba...@gmx.com>
Authored: Sat Oct 7 22:21:29 2017 +0200
Committer: Emilian Bold <em...@gmail.com>
Committed: Sat Oct 7 23:21:29 2017 +0300
----------------------------------------------------------------------
.../resources/templates/AddProperty.freemarker | 47 ++++++--------------
beans/test/qa-func/src/gui/data/TestFile.java | 18 ++++++++
.../qa-functional/data/projects/Beans/build.xml | 20 +++++++++
.../data/projects/Beans/src/beans/Add.java | 19 +++++++-
.../projects/Beans/src/beans/AddBeanInfo.java | 22 ++++++---
.../data/projects/Beans/src/beans/Beans.java | 18 ++++++++
.../data/projects/Beans/src/beans/Generate.java | 18 ++++++++
.../data/projects/Beans/src/beans/Source.java | 18 ++++++++
.../Beans/src/beans/SourceBeanInfo.java | 22 ++++++---
.../projects/Beans/src/members/Test_A_A.java | 18 ++++++++
nbbuild/build.xml | 1 +
11 files changed, 177 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b3a2ebd5/beans/src/org/netbeans/modules/beans/resources/templates/AddProperty.freemarker
----------------------------------------------------------------------
diff --git a/beans/src/org/netbeans/modules/beans/resources/templates/AddProperty.freemarker b/beans/src/org/netbeans/modules/beans/resources/templates/AddProperty.freemarker
index bf2bffb..73f046e 100644
--- a/beans/src/org/netbeans/modules/beans/resources/templates/AddProperty.freemarker
+++ b/beans/src/org/netbeans/modules/beans/resources/templates/AddProperty.freemarker
@@ -1,41 +1,22 @@
<#--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ 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
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+ http://www.apache.org/licenses/LICENSE-2.0
-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]"
+ 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.
-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):
-->
<#if ! (propertyChangeSupport??)>
<#assign propertyChangeSupport="propertyChangeSupport">
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b3a2ebd5/beans/test/qa-func/src/gui/data/TestFile.java
----------------------------------------------------------------------
diff --git a/beans/test/qa-func/src/gui/data/TestFile.java b/beans/test/qa-func/src/gui/data/TestFile.java
index c14b778..2f47b00 100644
--- a/beans/test/qa-func/src/gui/data/TestFile.java
+++ b/beans/test/qa-func/src/gui/data/TestFile.java
@@ -1,3 +1,21 @@
+/**
+ * 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.
+ */
public class TestFile {
/** Creates a new instance of TestFile */
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b3a2ebd5/beans/test/qa-functional/data/projects/Beans/build.xml
----------------------------------------------------------------------
diff --git a/beans/test/qa-functional/data/projects/Beans/build.xml b/beans/test/qa-functional/data/projects/Beans/build.xml
index 27c289a..cba60b4 100644
--- a/beans/test/qa-functional/data/projects/Beans/build.xml
+++ b/beans/test/qa-functional/data/projects/Beans/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/b3a2ebd5/beans/test/qa-functional/data/projects/Beans/src/beans/Add.java
----------------------------------------------------------------------
diff --git a/beans/test/qa-functional/data/projects/Beans/src/beans/Add.java b/beans/test/qa-functional/data/projects/Beans/src/beans/Add.java
index dfdea29..dca5e55 100644
--- a/beans/test/qa-functional/data/projects/Beans/src/beans/Add.java
+++ b/beans/test/qa-functional/data/projects/Beans/src/beans/Add.java
@@ -1,4 +1,21 @@
-
+/**
+ * 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.
+ */
package beans;
public class Add {
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b3a2ebd5/beans/test/qa-functional/data/projects/Beans/src/beans/AddBeanInfo.java
----------------------------------------------------------------------
diff --git a/beans/test/qa-functional/data/projects/Beans/src/beans/AddBeanInfo.java b/beans/test/qa-functional/data/projects/Beans/src/beans/AddBeanInfo.java
index 1c9599e..a8451d0 100644
--- a/beans/test/qa-functional/data/projects/Beans/src/beans/AddBeanInfo.java
+++ b/beans/test/qa-functional/data/projects/Beans/src/beans/AddBeanInfo.java
@@ -1,9 +1,21 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+/**
+ * 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.
*/
-
package beans;
import java.beans.*;
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b3a2ebd5/beans/test/qa-functional/data/projects/Beans/src/beans/Beans.java
----------------------------------------------------------------------
diff --git a/beans/test/qa-functional/data/projects/Beans/src/beans/Beans.java b/beans/test/qa-functional/data/projects/Beans/src/beans/Beans.java
index 6c112be..0655bf5 100644
--- a/beans/test/qa-functional/data/projects/Beans/src/beans/Beans.java
+++ b/beans/test/qa-functional/data/projects/Beans/src/beans/Beans.java
@@ -1,3 +1,21 @@
+/**
+ * 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.
+ */
package beans;
public class Beans {
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b3a2ebd5/beans/test/qa-functional/data/projects/Beans/src/beans/Generate.java
----------------------------------------------------------------------
diff --git a/beans/test/qa-functional/data/projects/Beans/src/beans/Generate.java b/beans/test/qa-functional/data/projects/Beans/src/beans/Generate.java
index 03ef655..7a03432 100644
--- a/beans/test/qa-functional/data/projects/Beans/src/beans/Generate.java
+++ b/beans/test/qa-functional/data/projects/Beans/src/beans/Generate.java
@@ -1,3 +1,21 @@
+/**
+ * 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.
+ */
package beans;
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b3a2ebd5/beans/test/qa-functional/data/projects/Beans/src/beans/Source.java
----------------------------------------------------------------------
diff --git a/beans/test/qa-functional/data/projects/Beans/src/beans/Source.java b/beans/test/qa-functional/data/projects/Beans/src/beans/Source.java
index 08f5124..1be8c06 100644
--- a/beans/test/qa-functional/data/projects/Beans/src/beans/Source.java
+++ b/beans/test/qa-functional/data/projects/Beans/src/beans/Source.java
@@ -1,3 +1,21 @@
+/**
+ * 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.
+ */
package beans;
import java.util.TooManyListenersException;
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b3a2ebd5/beans/test/qa-functional/data/projects/Beans/src/beans/SourceBeanInfo.java
----------------------------------------------------------------------
diff --git a/beans/test/qa-functional/data/projects/Beans/src/beans/SourceBeanInfo.java b/beans/test/qa-functional/data/projects/Beans/src/beans/SourceBeanInfo.java
index 48f926a..e2c2b4b 100644
--- a/beans/test/qa-functional/data/projects/Beans/src/beans/SourceBeanInfo.java
+++ b/beans/test/qa-functional/data/projects/Beans/src/beans/SourceBeanInfo.java
@@ -1,9 +1,21 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+/**
+ * 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.
*/
-
package beans;
import java.beans.*;
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b3a2ebd5/beans/test/qa-functional/data/projects/Beans/src/members/Test_A_A.java
----------------------------------------------------------------------
diff --git a/beans/test/qa-functional/data/projects/Beans/src/members/Test_A_A.java b/beans/test/qa-functional/data/projects/Beans/src/members/Test_A_A.java
index 81f1c26..e18247e 100644
--- a/beans/test/qa-functional/data/projects/Beans/src/members/Test_A_A.java
+++ b/beans/test/qa-functional/data/projects/Beans/src/members/Test_A_A.java
@@ -1,3 +1,21 @@
+/**
+ * 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.
+ */
package members;
import java.awt.event.ActionEvent;
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/b3a2ebd5/nbbuild/build.xml
----------------------------------------------------------------------
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 14db19e..eb00a51 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -1972,6 +1972,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="templates/src/org/netbeans/modules/templates/resources/userprop.txt" /> <!--no degree of creativity-->
<exclude name="api.search/test/unit/data/textFiles/utf8file.txt" /> <!--test data-->
<exclude name="api.search/test/unit/src/org/netbeans/modules/search/data/**" /> <!--test data-->
+ <exclude name="beans/src/org/netbeans/modules/beans/resources/templates/*.template" /> <!--license would be visible when users edit the templates inside their IDE-->
</fileset>
</rat:report>
</target>