This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 234144
Collapse All | Expand All

(-)a/javahelp/apichanges.xml (+17 lines)
Lines 110-115 Link Here
110
110
111
  <changes>
111
  <changes>
112
112
113
      <change id="mergeCustomHelpset">
114
          <api name="general"/>
115
          <summary>Added class <code>HelpUtils</code></summary>
116
          <version major="2" minor="34"/>
117
          <date day="19" month="8" year="2013"/>
118
          <author login="jhavlin"/>
119
          <compatibility addition="yes" />
120
          <description>
121
              <p>
122
                  Provide a method for merging of a custom HelpSet object to the
123
                  master helpset.
124
              </p>
125
          </description>
126
          <class package="org.netbeans.api.javahelp" name="HelpUtils"/>
127
          <issue number="234144"/>
128
      </change>
129
113
      <change id="HelpSetRegistration">
130
      <change id="HelpSetRegistration">
114
          <api name="general"/>
131
          <api name="general"/>
115
          <summary>Added <code>@HelpSetRegistration</code></summary>
132
          <summary>Added <code>@HelpSetRegistration</code></summary>
(-)a/javahelp/manifest.mf (-1 / +1 lines)
Lines 1-7 Link Here
1
Manifest-Version: 1.0
1
Manifest-Version: 1.0
2
OpenIDE-Module: org.netbeans.modules.javahelp/1
2
OpenIDE-Module: org.netbeans.modules.javahelp/1
3
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javahelp/resources/Bundle.properties
3
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javahelp/resources/Bundle.properties
4
OpenIDE-Module-Specification-Version: 2.33
4
OpenIDE-Module-Specification-Version: 2.34
5
OpenIDE-Module-Provides: org.netbeans.api.javahelp.Help
5
OpenIDE-Module-Provides: org.netbeans.api.javahelp.Help
6
OpenIDE-Module-Requires: org.openide.modules.InstalledFileLocator, org.openide.modules.ModuleFormat2
6
OpenIDE-Module-Requires: org.openide.modules.InstalledFileLocator, org.openide.modules.ModuleFormat2
7
OpenIDE-Module-Layer: org/netbeans/modules/javahelp/resources/layer.xml
7
OpenIDE-Module-Layer: org/netbeans/modules/javahelp/resources/layer.xml
(-)a/javahelp/src/org/netbeans/api/javahelp/HelpUtils.java (+74 lines)
Line 0 Link Here
1
/*
2
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3
 *
4
 * Copyright 2013 Oracle and/or its affiliates. All rights reserved.
5
 *
6
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7
 * Other names may be trademarks of their respective owners.
8
 *
9
 * The contents of this file are subject to the terms of either the GNU
10
 * General Public License Version 2 only ("GPL") or the Common
11
 * Development and Distribution License("CDDL") (collectively, the
12
 * "License"). You may not use this file except in compliance with the
13
 * License. You can obtain a copy of the License at
14
 * http://www.netbeans.org/cddl-gplv2.html
15
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
16
 * specific language governing permissions and limitations under the
17
 * License.  When distributing the software, include this License Header
18
 * Notice in each file and include the License file at
19
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
20
 * particular file as subject to the "Classpath" exception as provided
21
 * by Oracle in the GPL Version 2 section of the License file that
22
 * accompanied this code. If applicable, add the following below the
23
 * License Header, with the fields enclosed by brackets [] replaced by
24
 * your own identifying information:
25
 * "Portions Copyrighted [year] [name of copyright owner]"
26
 *
27
 * If you wish your version of this file to be governed by only the CDDL
28
 * or only the GPL Version 2, indicate your decision by adding
29
 * "[Contributor] elects to include this software in this distribution
30
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
31
 * single choice of license, a recipient has the option to distribute
32
 * your version of this file under either the CDDL, the GPL Version 2 or
33
 * to extend the choice of license to its licensees as provided above.
34
 * However, if you add GPL Version 2 code and therefore, elected the GPL
35
 * Version 2 license, then the option applies only if the new code is
36
 * made subject to such option by the copyright holder.
37
 *
38
 * Contributor(s):
39
 *
40
 * Portions Copyrighted 2013 Sun Microsystems, Inc.
41
 */
42
package org.netbeans.api.javahelp;
43
44
import javax.help.HelpSet;
45
import org.netbeans.modules.javahelp.HelpConstants;
46
47
/**
48
 * Utility methods for helpsets.
49
 *
50
 * @since javahelp/2.34
51
 * @author jhavlin
52
 */
53
public final class HelpUtils {
54
55
    /**
56
     * Merge a custom helpset to the master helpset.
57
     * <p>
58
     * Merge helpsets registered using e.g.
59
     * {@code @ServiceProvider(service=HelpSet.class)} to the master helpset.
60
     * </p>
61
     * <p>
62
     * You may need this method if you create helpsets that use some special
63
     * sources of data, e.g. the web. See bug 234144.
64
     * </p>
65
     *
66
     * @param customHelpSet The custom help set.
67
     */
68
    public static void mergeCustomHelpset(HelpSet customHelpSet) {
69
        customHelpSet.setKeyData(
70
                HelpConstants.HELPSET_MERGE_CONTEXT,
71
                HelpConstants.HELPSET_MERGE_ATTR,
72
                true);
73
    }
74
}
(-)a/javahelp/test/unit/src/org/netbeans/api/javahelp/HelpUtilsTest.java (+65 lines)
Line 0 Link Here
1
/*
2
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3
 *
4
 * Copyright 2013 Oracle and/or its affiliates. All rights reserved.
5
 *
6
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7
 * Other names may be trademarks of their respective owners.
8
 *
9
 * The contents of this file are subject to the terms of either the GNU
10
 * General Public License Version 2 only ("GPL") or the Common
11
 * Development and Distribution License("CDDL") (collectively, the
12
 * "License"). You may not use this file except in compliance with the
13
 * License. You can obtain a copy of the License at
14
 * http://www.netbeans.org/cddl-gplv2.html
15
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
16
 * specific language governing permissions and limitations under the
17
 * License.  When distributing the software, include this License Header
18
 * Notice in each file and include the License file at
19
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
20
 * particular file as subject to the "Classpath" exception as provided
21
 * by Oracle in the GPL Version 2 section of the License file that
22
 * accompanied this code. If applicable, add the following below the
23
 * License Header, with the fields enclosed by brackets [] replaced by
24
 * your own identifying information:
25
 * "Portions Copyrighted [year] [name of copyright owner]"
26
 *
27
 * If you wish your version of this file to be governed by only the CDDL
28
 * or only the GPL Version 2, indicate your decision by adding
29
 * "[Contributor] elects to include this software in this distribution
30
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
31
 * single choice of license, a recipient has the option to distribute
32
 * your version of this file under either the CDDL, the GPL Version 2 or
33
 * to extend the choice of license to its licensees as provided above.
34
 * However, if you add GPL Version 2 code and therefore, elected the GPL
35
 * Version 2 license, then the option applies only if the new code is
36
 * made subject to such option by the copyright holder.
37
 *
38
 * Contributor(s):
39
 *
40
 * Portions Copyrighted 2013 Sun Microsystems, Inc.
41
 */
42
package org.netbeans.api.javahelp;
43
44
import javax.help.HelpSet;
45
import org.junit.Test;
46
import static org.junit.Assert.*;
47
import org.netbeans.modules.javahelp.HelpConstants;
48
49
/**
50
 *
51
 * @author jhavlin
52
 */
53
public class HelpUtilsTest {
54
55
    public HelpUtilsTest() {
56
    }
57
58
    @Test
59
    public void testMergeCustomHelpset() {
60
        HelpSet hs = new HelpSet();
61
        HelpUtils.mergeCustomHelpset(hs);
62
        assertEquals(true, hs.getKeyData(HelpConstants.HELPSET_MERGE_CONTEXT,
63
                HelpConstants.HELPSET_MERGE_ATTR));
64
    }
65
}

Return to bug 234144