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

(-)a/autoupdate.services/src/org/netbeans/modules/autoupdate/services/DependencyChecker.java (+19 lines)
Lines 44-49 Link Here
44
import java.util.*;
44
import java.util.*;
45
import java.util.logging.Level;
45
import java.util.logging.Level;
46
import java.util.logging.Logger;
46
import java.util.logging.Logger;
47
import org.netbeans.Util;
47
import org.openide.modules.ModuleInfo;
48
import org.openide.modules.ModuleInfo;
48
import org.openide.modules.Dependency;
49
import org.openide.modules.Dependency;
49
import org.openide.modules.SpecificationVersion;
50
import org.openide.modules.SpecificationVersion;
Lines 93-98 Link Here
93
                    if (! matchDependencyJava (dep)) {
94
                    if (! matchDependencyJava (dep)) {
94
                        err.log(Level.FINE, "The Java platform version " + dep +
95
                        err.log(Level.FINE, "The Java platform version " + dep +
95
                                " or higher was requested but only " + Dependency.JAVA_SPEC + " is running.");
96
                                " or higher was requested but only " + Dependency.JAVA_SPEC + " is running.");
97
                        res.add (dep);
98
                    }
99
                    break;
100
                case (Dependency.TYPE_PACKAGE) :
101
                    if (! matchPackageDependency (dep)) {
102
                        err.log(Level.FINE, "The package " + dep +
103
                                " was requested but it is not in current ClassPath.");
96
                        res.add (dep);
104
                        res.add (dep);
97
                    }
105
                    }
98
                    break;
106
                    break;
Lines 157-162 Link Here
157
                        res.add (dep);
165
                        res.add (dep);
158
                    }
166
                    }
159
                    break;
167
                    break;
168
                case (Dependency.TYPE_PACKAGE) :
169
                    if (! matchPackageDependency (dep)) {
170
                        err.log(Level.FINE, "The package " + dep +
171
                                " was requested but it is not in current ClassPath.");
172
                        res.add (dep);
173
                    }
174
                    break;
160
                default:
175
                default:
161
                    //assert false : "Unknown type of Dependency, was " + dep.getType ();
176
                    //assert false : "Unknown type of Dependency, was " + dep.getType ();
162
                    err.log(Level.FINE, "Uncovered Dependency " + dep);                    
177
                    err.log(Level.FINE, "Uncovered Dependency " + dep);                    
Lines 200-205 Link Here
200
        }
215
        }
201
        // All other usages unlikely
216
        // All other usages unlikely
202
        return true;
217
        return true;
218
    }
219
    
220
    private static boolean matchPackageDependency (Dependency dep) {
221
        return Util.checkPackageDependency (dep, ClassLoader.getSystemClassLoader ());
203
    }
222
    }
204
    
223
    
205
    static boolean checkDependencyModuleAllowEqual (Dependency dep, ModuleInfo module) {
224
    static boolean checkDependencyModuleAllowEqual (Dependency dep, ModuleInfo module) {
(-)a/o.n.bootstrap/manifest.mf (-1 / +1 lines)
Lines 1-4 Link Here
1
Manifest-Version: 1.0
1
Manifest-Version: 1.0
2
OpenIDE-Module: org.netbeans.bootstrap/1
2
OpenIDE-Module: org.netbeans.bootstrap/1
3
OpenIDE-Module-Specification-Version: 2.13
3
OpenIDE-Module-Specification-Version: 2.14
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/Bundle.properties
4
OpenIDE-Module-Localizing-Bundle: org/netbeans/Bundle.properties
(-)a/o.n.bootstrap/src/org/netbeans/Util.java (-1 / +6 lines)
Lines 242-249 Link Here
242
    
242
    
243
    /** Check whether a package dependency is met.
243
    /** Check whether a package dependency is met.
244
     * A classloader must be supplied to check in.
244
     * A classloader must be supplied to check in.
245
     * @param dep a module dependency
246
     * @param cl a package-accessible classloader
247
     * @return true if package is met
248
     * @throws IllegalArgumentException 
249
     * @since 2.14
245
     */
250
     */
246
    static boolean checkPackageDependency(Dependency dep, ClassLoader cl) throws IllegalArgumentException {
251
    public static boolean checkPackageDependency(Dependency dep, ClassLoader cl) throws IllegalArgumentException {
247
        if (dep.getType() != Dependency.TYPE_PACKAGE) {
252
        if (dep.getType() != Dependency.TYPE_PACKAGE) {
248
            throw new IllegalArgumentException("Not a package dependency"); // NOI18N
253
            throw new IllegalArgumentException("Not a package dependency"); // NOI18N
249
        }
254
        }

Return to bug 136269