This is an automated email from the ASF dual-hosted git repository.
sdedic 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 7fd26e5 [NETBEANS-1074] Module Review javascript2.model (#730)
7fd26e5 is described below
commit 7fd26e5d80ea6f7b26544ac4fad612a66455c0fb
Author: Svatopluk Dedic <svatopluk.de...@oracle.com>
AuthorDate: Tue Aug 21 09:11:47 2018 +0200
[NETBEANS-1074] Module Review javascript2.model (#730)
[NETBEANS-1074] Review Module javascript2.model. Fixed unit test broken by
relicensing
---
.../javascript2/model/JsWithObjectImpl.java | 61 +++++++---------------
.../testfiles/model/anonymousFunction.js.model | 2 +-
2 files changed, 20 insertions(+), 43 deletions(-)
diff --git
a/javascript2.model/src/org/netbeans/modules/javascript2/model/JsWithObjectImpl.java
b/javascript2.model/src/org/netbeans/modules/javascript2/model/JsWithObjectImpl.java
index d689160..3a5be31 100644
---
a/javascript2.model/src/org/netbeans/modules/javascript2/model/JsWithObjectImpl.java
+++
b/javascript2.model/src/org/netbeans/modules/javascript2/model/JsWithObjectImpl.java
@@ -1,3 +1,22 @@
+/*
+ * 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 org.netbeans.modules.javascript2.model;
import org.netbeans.modules.javascript2.model.api.ModelUtils;
@@ -16,48 +35,6 @@ import org.netbeans.modules.javascript2.model.api.JsObject;
import org.netbeans.modules.javascript2.model.api.JsWith;
import org.netbeans.modules.javascript2.model.api.Occurrence;
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2013 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):
- *
- * Portions Copyrighted 2013 Sun Microsystems, Inc.
- */
-
/**
*
* @author Petr Pisl
diff --git
a/javascript2.model/test/unit/data/testfiles/model/anonymousFunction.js.model
b/javascript2.model/test/unit/data/testfiles/model/anonymousFunction.js.model
index 78facd3..2052f65 100644
---
a/javascript2.model/test/unit/data/testfiles/model/anonymousFunction.js.model
+++
b/javascript2.model/test/unit/data/testfiles/model/anonymousFunction.js.model
@@ -2,7 +2,7 @@ FUNCTION anonymousFunction [ANONYMOUS: false, DECLARED: true -
anonymousFunction
# RETURN TYPES
undefined, RESOLVED: true
# PROPERTIES
-anonymousFunctionL#44 : FUNCTION anonymousFunctionL#44 [ANONYMOUS: true,
DECLARED: true - anonymousFunctionL#44, MODIFIERS: PUBLIC, FUNCTION]
+anonymousFunctionL#21 : FUNCTION anonymousFunctionL#21 [ANONYMOUS: true,
DECLARED: true - anonymousFunctionL#21, MODIFIERS: PUBLIC, FUNCTION]
# RETURN TYPES
undefined, RESOLVED: true
# PROPERTIES
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
