You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by em...@apache.org on 2017/10/22 06:58:19 UTC
[incubator-netbeans] branch master updated: [NETBEANS-54] Module
Review form.j2ee
This is an automated email from the ASF dual-hosted git repository.
emi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 57feaeb [NETBEANS-54] Module Review form.j2ee
57feaeb is described below
commit 57feaeb73e2b093dc66d9b400933c84e48e2d9dc
Author: gezapeti <ge...@gmail.com>
AuthorDate: Sun Oct 22 08:57:42 2017 +0200
[NETBEANS-54] Module Review form.j2ee
---
.../j2ee/resources/templates/MasterDetailForm_form | 16 +++++++
.../j2ee/resources/templates/MasterDetailForm_java | 52 +++++++---------------
2 files changed, 31 insertions(+), 37 deletions(-)
diff --git a/form.j2ee/src/org/netbeans/modules/form/j2ee/resources/templates/MasterDetailForm_form b/form.j2ee/src/org/netbeans/modules/form/j2ee/resources/templates/MasterDetailForm_form
index e51a45c..5753034 100644
--- a/form.j2ee/src/org/netbeans/modules/form/j2ee/resources/templates/MasterDetailForm_form
+++ b/form.j2ee/src/org/netbeans/modules/form/j2ee/resources/templates/MasterDetailForm_form
@@ -1,5 +1,21 @@
<?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.
+-->
<Form version="1.4" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<NonVisualComponents>
<Component class="javax.persistence.EntityManager" name="entityManager">
diff --git a/form.j2ee/src/org/netbeans/modules/form/j2ee/resources/templates/MasterDetailForm_java b/form.j2ee/src/org/netbeans/modules/form/j2ee/resources/templates/MasterDetailForm_java
index 5b3a9a4..c1a4e2f 100644
--- a/form.j2ee/src/org/netbeans/modules/form/j2ee/resources/templates/MasterDetailForm_java
+++ b/form.j2ee/src/org/netbeans/modules/form/j2ee/resources/templates/MasterDetailForm_java
@@ -1,41 +1,19 @@
<#--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 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):
+ 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.
-->
<#assign licenseFirst = "/*">
<#assign licensePrefix = " * ">
--
To stop receiving notification emails like this one, please contact
['"commits@netbeans.apache.org" <co...@netbeans.apache.org>'].