incubator-netbeans git commit: [NETBEANS-54] Module Review api.htmlui -no external library

[jl...@apache.org]

Repository: incubator-netbeans
Updated Branches:
  refs/heads/master bf9caf7aa -> 3880c5162


[NETBEANS-54] Module Review api.htmlui
-no external library

-checked Rat report: no license of manifest and signature file (see central problems); unconverted license in api.htmlui/src/org/netbeans/api/htmlui/HTMLDialog.java (misplaced /*\n, so the tool, being strict, refused to convert it. After deleting the '/*\n', the tool was happy to convert the header).

-skimmed through the module, did not notice additional problems


Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/3880c516
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/3880c516
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/3880c516

Branch: refs/heads/master
Commit: 3880c5162f149eb0d3953aacac63c4c014cd101d
Parents: bf9caf7
Author: Jan Lahoda <jl...@netbeans.org>
Authored: Sun Sep 24 08:20:19 2017 +0200
Committer: Jan Lahoda <jl...@netbeans.org>
Committed: Sun Oct 1 14:33:27 2017 +0200

----------------------------------------------------------------------
 .../src/org/netbeans/api/htmlui/HTMLDialog.java | 54 ++++++--------------
 1 file changed, 15 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/3880c516/api.htmlui/src/org/netbeans/api/htmlui/HTMLDialog.java
----------------------------------------------------------------------
diff --git a/api.htmlui/src/org/netbeans/api/htmlui/HTMLDialog.java b/api.htmlui/src/org/netbeans/api/htmlui/HTMLDialog.java
index f4677ce..3526e2c 100644
--- a/api.htmlui/src/org/netbeans/api/htmlui/HTMLDialog.java
+++ b/api.htmlui/src/org/netbeans/api/htmlui/HTMLDialog.java
@@ -1,44 +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 2014 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):
- *
- * Portions Copyrighted 2014 Sun Microsystems, Inc.
+ * 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.api.htmlui;