You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2017/10/08 15:04:18 UTC
[1/2] incubator-netbeans git commit: [NETBEANS-54] Module Review
core.multiview
Repository: incubator-netbeans
Updated Branches:
refs/heads/master 5c6a51553 -> a7508776f
[NETBEANS-54] Module Review core.multiview
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/2acf5099
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/2acf5099
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/2acf5099
Branch: refs/heads/master
Commit: 2acf5099f2ebadfd6c8abdf3ffc380cccd7878e5
Parents: c7eb12c
Author: geertjan <ge...@oracle.com>
Authored: Sun Oct 8 08:07:11 2017 +0200
Committer: geertjan <ge...@oracle.com>
Committed: Sun Oct 8 08:07:11 2017 +0200
----------------------------------------------------------------------
.../multiview/MultiViewTopComponentLookup.java | 55 ++++++--------------
1 file changed, 15 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/2acf5099/core.multiview/src/org/netbeans/core/multiview/MultiViewTopComponentLookup.java
----------------------------------------------------------------------
diff --git a/core.multiview/src/org/netbeans/core/multiview/MultiViewTopComponentLookup.java b/core.multiview/src/org/netbeans/core/multiview/MultiViewTopComponentLookup.java
index 9616a1a..859521f 100644
--- a/core.multiview/src/org/netbeans/core/multiview/MultiViewTopComponentLookup.java
+++ b/core.multiview/src/org/netbeans/core/multiview/MultiViewTopComponentLookup.java
@@ -1,45 +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 1997-2010 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]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the OriginalM
- * Code is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
- * Microsystems, Inc. All Rights Reserved.
- *
- * 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.
+ * 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.core.multiview;
[2/2] incubator-netbeans git commit: Merge branch 'pr/86'
Posted by ma...@apache.org.
Merge branch 'pr/86'
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/a7508776
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/a7508776
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/a7508776
Branch: refs/heads/master
Commit: a7508776fa9a8e7cdf712b575dee5180c480c2e2
Parents: 5c6a515 2acf509
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Sun Oct 8 17:04:05 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Sun Oct 8 17:04:05 2017 +0200
----------------------------------------------------------------------
.../multiview/MultiViewTopComponentLookup.java | 55 ++++++--------------
1 file changed, 15 insertions(+), 40 deletions(-)
----------------------------------------------------------------------