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) { |