Repository: incubator-netbeans Updated Branches: refs/heads/master 8c77c613f -> 116566306
[NETBEANS-54] Module Review openide.util.ui Adds some license headers to test resources. Minor change in UtilitiesTranslateTest to support comment lines (ie. the license header) for a given test resource. Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/17b657b1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/17b657b1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/17b657b1 Branch: refs/heads/master Commit: 17b657b158d1f488ca1b1ea7c644deb469e7f33b Parents: 8c77c61 Author: Emilian Bold <[email protected]> Authored: Tue Sep 26 11:04:07 2017 +0300 Committer: Emilian Bold <[email protected]> Committed: Thu Sep 28 00:04:51 2017 +0300 ---------------------------------------------------------------------- .../unit/src/META-INF/upgrade/NbBundle.test | 18 +++++++ .../src/org/openide/util/UtilitiesTranslate.txt | 17 ++++++ .../openide/util/UtilitiesTranslate29878.txt | 57 ++++++-------------- .../org/openide/util/UtilitiesTranslateOrig.txt | 17 ++++++ .../openide/util/UtilitiesTranslateTest.java | 5 ++ .../test/unit/src/org/openide/xml/random.dtd | 20 +++++++ 6 files changed, 94 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/17b657b1/openide.util.ui/test/unit/src/META-INF/upgrade/NbBundle.test ---------------------------------------------------------------------- diff --git a/openide.util.ui/test/unit/src/META-INF/upgrade/NbBundle.test b/openide.util.ui/test/unit/src/META-INF/upgrade/NbBundle.test index 05dc9b4..e606a0f 100644 --- a/openide.util.ui/test/unit/src/META-INF/upgrade/NbBundle.test +++ b/openide.util.ui/test/unit/src/META-INF/upgrade/NbBundle.test @@ -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. + */ %%TestCase getBundle package test; import org.openide.util.NbBundle; http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/17b657b1/openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslate.txt ---------------------------------------------------------------------- diff --git a/openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslate.txt b/openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslate.txt index 68d33f2..808ebba 100644 --- a/openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslate.txt +++ b/openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslate.txt @@ -1,3 +1,20 @@ +# 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. +# # The format should handle comments # And also empty lines http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/17b657b1/openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslate29878.txt ---------------------------------------------------------------------- diff --git a/openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslate29878.txt b/openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslate29878.txt index b1dd96d..5eca4a3 100644 --- a/openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslate29878.txt +++ b/openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslate29878.txt @@ -1,3 +1,20 @@ +# 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. +# # file:/home.local/jarda/work/openide/src/META-INF/netbeans/translate.names org.openide.util.actions.SystemAction=org.openide.util.actions.SystemAction @@ -10,46 +27,6 @@ org.openide.util.actions.SystemAction=org.openide.util.actions.SystemAction # jar:file:/home.local/jarda/work/nbbuild/netbeans/modules/autoload/core-output.jar!/META-INF/netbeans/translate.names -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright 2012 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 2012 Sun Microsystems, Inc. - org.netbeans.core.actions.NextOutJumpAction=org.netbeans.core.output.NextOutJumpAction org.netbeans.core.actions.PreviousOutJumpAction=org.netbeans.core.output.PreviousOutJumpAction http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/17b657b1/openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslateOrig.txt ---------------------------------------------------------------------- diff --git a/openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslateOrig.txt b/openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslateOrig.txt index 2cdd77c..910d5c2 100644 --- a/openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslateOrig.txt +++ b/openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslateOrig.txt @@ -1,3 +1,20 @@ +# 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. +# com.netbeans org.netbeans com.netbeans.ddl org.netbeans.lib.ddl com.netbeans.developer org.netbeans http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/17b657b1/openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslateTest.java ---------------------------------------------------------------------- diff --git a/openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslateTest.java b/openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslateTest.java index 9d438c1..dc96cc5 100644 --- a/openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslateTest.java +++ b/openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslateTest.java @@ -157,6 +157,11 @@ public class UtilitiesTranslateTest extends NbTestCase { if (line == null) { break; } + + if (line.startsWith("#")) { + //comment + continue; + } int space = line.indexOf (' '); assertTrue ("Line does not have spaces" + line, space >= 0); http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/17b657b1/openide.util.ui/test/unit/src/org/openide/xml/random.dtd ---------------------------------------------------------------------- diff --git a/openide.util.ui/test/unit/src/org/openide/xml/random.dtd b/openide.util.ui/test/unit/src/org/openide/xml/random.dtd index 34d89a9..99d25b0 100644 --- a/openide.util.ui/test/unit/src/org/openide/xml/random.dtd +++ b/openide.util.ui/test/unit/src/org/openide/xml/random.dtd @@ -1,2 +1,22 @@ <?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. + +--> <!ELEMENT p ANY>
