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 181474
Collapse All | Expand All

(-)a/api.java.classpath/src/org/netbeans/api/java/classpath/ClassPath.java (+8 lines)
Lines 129-135 Link Here
129
     * <code>URLClassLoader</code> (plus URLs present in parent class loaders
129
     * <code>URLClassLoader</code> (plus URLs present in parent class loaders
130
     * but excluding the bootstrap and extension class loaders).
130
     * but excluding the bootstrap and extension class loaders).
131
     * </p>
131
     * </p>
132
     * @deprecated Use {@link org.netbeans.api.java.classpath.JavaClassPathConstants.SOURCE}
132
     */
133
     */
134
    @Deprecated
133
    public static final String EXECUTE = "classpath/execute";
135
    public static final String EXECUTE = "classpath/execute";
134
136
135
    /**
137
    /**
Lines 147-153 Link Here
147
     * i.e. already-compiled classes which some new sources need to compile against,
149
     * i.e. already-compiled classes which some new sources need to compile against,
148
     * besides what is already in the JRE.
150
     * besides what is already in the JRE.
149
     * </p>
151
     * </p>
152
     * @deprecated Use {@link org.netbeans.api.java.classpath.JavaClassPathConstants.COMPILE}
150
     */
153
     */
154
    @Deprecated
151
    public static final String COMPILE = "classpath/compile";
155
    public static final String COMPILE = "classpath/compile";
152
156
153
    /**
157
    /**
Lines 169-175 Link Here
169
     * </p>
173
     * </p>
170
     * </div>
174
     * </div>
171
     * @since org.netbeans.api.java/1 1.4
175
     * @since org.netbeans.api.java/1 1.4
176
     * @deprecated Use {@link org.netbeans.api.java.classpath.JavaClassPathConstants.SOURCE}
172
     */
177
     */
178
    @Deprecated
173
    public static final String SOURCE = "classpath/source";
179
    public static final String SOURCE = "classpath/source";
174
180
175
    /**
181
    /**
Lines 187-193 Link Here
187
     * application.
193
     * application.
188
     * </p>
194
     * </p>
189
     * @since org.netbeans.api.java/1 1.4
195
     * @since org.netbeans.api.java/1 1.4
196
     * @deprecated Use {@link org.netbeans.api.java.classpath.JavaClassPathConstants.BOOT}
190
     */
197
     */
198
    @Deprecated
191
    public static final String BOOT = "classpath/boot";
199
    public static final String BOOT = "classpath/boot";
192
200
193
    /**
201
    /**
(-)a/api.java/apichanges.xml (+13 lines)
Lines 73-78 Link Here
73
<!-- ACTUAL CHANGES BEGIN HERE: -->
73
<!-- ACTUAL CHANGES BEGIN HERE: -->
74
74
75
<changes>
75
<changes>
76
        <change id="classpath-constants">
77
            <api name="classpath"/>
78
            <summary>ClassPath types consolidated into a single place</summary>
79
            <version major="1" minor="26"/>
80
            <date day="4" month="3" year="2010"/>
81
            <author login="tzezula"/>
82
            <compatibility addition="yes" modification="no" semantic="compatible" source="compatible" binary="compatible" deprecation="yes"/>
83
            <description>
84
                <p>Moved all java related ClassPath types into a single class rahter than having them in three different modules.</p>
85
            </description>
86
            <class package="org.netbeans.api.java.classpath" name="JavaClassPathConstants" />
87
            <issue number="181474"/>
88
        </change>
76
        <change id="ap-query">
89
        <change id="ap-query">
77
            <api name="classpath"/>
90
            <api name="classpath"/>
78
            <summary>Introducing AnnotationProcessingQuery</summary>
91
            <summary>Introducing AnnotationProcessingQuery</summary>
(-)a/api.java/manifest.mf (-1 / +1 lines)
Lines 1-6 Link Here
1
Manifest-Version: 1.0
1
Manifest-Version: 1.0
2
OpenIDE-Module: org.netbeans.api.java/1
2
OpenIDE-Module: org.netbeans.api.java/1
3
OpenIDE-Module-Specification-Version: 1.25
3
OpenIDE-Module-Specification-Version: 1.26
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/api/java/queries/Bundle.properties
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/api/java/queries/Bundle.properties
5
AutoUpdate-Show-In-Client: false
5
AutoUpdate-Show-In-Client: false
6
6
(-)a/api.java/src/org/netbeans/api/java/classpath/JavaClassPathConstants.java (-3 / +81 lines)
Lines 41-51 Link Here
41
41
42
/**
42
/**
43
 * Java related classpath constants.
43
 * Java related classpath constants.
44
 * 
44
 *
45
 * @author Jan Lahoda
45
 * @author Jan Lahoda
46
 * @author Tomas Zezula
46
 * @since 1.22
47
 * @since 1.22
47
 */
48
 */
48
public class JavaClassPathConstants {
49
public class JavaClassPathConstants {
50
51
    /**
52
     * Classpath setting for executing things. This type can be used to learn
53
     * runtime time classpath for execution of the file in question.
54
     * <p class="nonnormative">
55
     * It corresponds to the <code>-classpath</code> option to <code>java</code>
56
     * (the Java launcher): i.e. all compiled classes outside the JRE that
57
     * will be needed to run the program, or at least to load a certain class.
58
     * It may also be thought of as corresponding to the list of URLs in a
59
     * <code>URLClassLoader</code> (plus URLs present in parent class loaders
60
     * but excluding the bootstrap and extension class loaders).
61
     * </p>
62
     * @since 1.26
63
     */
64
    @SuppressWarnings("deprecation")    //NOI18N
65
    public static final String EXECUTE = ClassPath.EXECUTE;
66
67
    /**
68
     * ClassPath for compiling things. This type can be used to learn
69
     * compilation time classpath for the file in question.
70
     * <p class="nonnormative">
71
     * It corresponds to the <code>-classpath</code> option to <code>javac</code>:
72
     * i.e. already-compiled classes which some new sources need to compile against,
73
     * besides what is already in the JRE.
74
     * </p>
75
     * @since 1.26
76
     */
77
    @SuppressWarnings("deprecation")    //NOI18N
78
    public static final String COMPILE = ClassPath.COMPILE;
79
80
    /**
81
     * ClassPath for project sources. This type can be used to learn
82
     * package root of the file in question.
83
     * <div class="nonnormative">
84
     * <p>
85
     * It is similar to the <code>-sourcepath</code> option of <code>javac</code>.
86
     * </p>
87
     * <p>
88
     * For typical source files, the sourcepath will consist of one element:
89
     * the package root of the source file. If more than one package root is
90
     * to be compiled together, all the sources should share a sourcepath
91
     * with multiple roots.
92
     * </p>
93
     * <p>
94
     * Note that each source file for which editor code completion (and similar
95
     * actions) should work should have a classpath of this type.
96
     * </p>
97
     * </div>
98
     * @since 1.26
99
     */
100
    @SuppressWarnings("deprecation")    //NOI18N
101
    public static final String SOURCE = ClassPath.SOURCE;
102
103
    /**
104
     * Boot ClassPath of the JDK. This type can be used to learn boot classpath
105
     * which should be used for the file in question.
106
     * <p class="nonnormative">
107
     * It corresponds to the <code>-Xbootclasspath</code> and <code>-Xext</code>
108
     * options to <code>java</code> (the Java launcher): i.e. all compiled
109
     * classes in the JRE that will be needed to run the program.
110
     * It may also be thought of as corresponding to the classes loadable
111
     * by the primordial bootstrap class loader <em>plus</em> the standard
112
     * extension and endorsed-library class loaders; i.e. class loaders lying
113
     * below the regular application startup loader and any custom loaders.
114
     * Generally there ought to be a single boot classpath for the entire
115
     * application.
116
     * </p>
117
     * @since 1.26
118
     */
119
    @SuppressWarnings("deprecation")    //NOI18N
120
    public static final String BOOT = ClassPath.BOOT;
49
121
50
    /**
122
    /**
51
     * ClassPath for annotation processors. If undefined, {@link ClassPath#COMPILE}
123
     * ClassPath for annotation processors. If undefined, {@link ClassPath#COMPILE}
Lines 56-61 Link Here
56
     *
128
     *
57
     * @since 1.22
129
     * @since 1.22
58
     */
130
     */
59
    public static final String PROCESSOR_PATH = "classpath/processor";
131
    public static final String PROCESSOR_PATH = "classpath/processor";  //NOI18N
60
    
132
133
    /**
134
     * Classpath for endorsed libraries. See {@link ClassPath} for other classpath
135
     * types.
136
     * @since 1.26
137
     */
138
    public static final String ENDORSED = "classpath/endorsed"; //NOI18N
61
}
139
}
(-)a/java.api.common/nbproject/project.xml (-1 / +1 lines)
Lines 20-26 Link Here
20
                    <compile-dependency/>
20
                    <compile-dependency/>
21
                    <run-dependency>
21
                    <run-dependency>
22
                        <release-version>1</release-version>
22
                        <release-version>1</release-version>
23
                        <specification-version>1.18</specification-version>
23
                        <specification-version>1.26</specification-version>
24
                    </run-dependency>
24
                    </run-dependency>
25
                </dependency>
25
                </dependency>
26
                <dependency>
26
                <dependency>
(-)a/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ClassPathSupport.java (-1 / +4 lines)
Lines 56-61 Link Here
56
import java.util.regex.Pattern;
56
import java.util.regex.Pattern;
57
57
58
import org.netbeans.api.java.classpath.ClassPath;
58
import org.netbeans.api.java.classpath.ClassPath;
59
import org.netbeans.api.java.classpath.JavaClassPathConstants;
59
import org.netbeans.api.project.ant.AntArtifact;
60
import org.netbeans.api.project.ant.AntArtifact;
60
import org.netbeans.api.project.libraries.Library;
61
import org.netbeans.api.project.libraries.Library;
61
import org.netbeans.api.project.libraries.LibraryManager;
62
import org.netbeans.api.project.libraries.LibraryManager;
Lines 82-89 Link Here
82
     * Classpath for endorsed libraries. See {@link ClassPath} for other classpath
83
     * Classpath for endorsed libraries. See {@link ClassPath} for other classpath
83
     * types.
84
     * types.
84
     * @since org.netbeans.modules.java.api.common/0 1.11
85
     * @since org.netbeans.modules.java.api.common/0 1.11
86
     * @deprecated Use {@link org.netbeans.api.java.classpath.JavaClassPathConstants.ENDORSED}
85
     */
87
     */
86
    public static final String ENDORSED = "classpath/endorsed";
88
    @Deprecated
89
    public static final String ENDORSED = JavaClassPathConstants.ENDORSED;
87
                
90
                
88
    // Prefixes and suffixes of classpath
91
    // Prefixes and suffixes of classpath
89
    private static final String LIBRARY_PREFIX = "${libs."; // NOI18N
92
    private static final String LIBRARY_PREFIX = "${libs."; // NOI18N

Return to bug 181474