|
Lines 778-786
Link Here
|
| 778 |
} |
778 |
} |
| 779 |
} |
779 |
} |
| 780 |
if (!alreadyHaveJH) { |
780 |
if (!alreadyHaveJH) { |
| 781 |
Util.err.log("Adding automatic dependency on JavaHelp for module " + m.getCodeNameBase()); |
781 |
Util.err.log("Adding automatic dependency on org.netbeans.api.javahelp.Help for module " + m.getCodeNameBase()); |
| 782 |
dependencies.addAll(Dependency.create(Dependency.TYPE_REQUIRES, |
782 |
dependencies.addAll(Dependency.create(Dependency.TYPE_REQUIRES, |
| 783 |
"org.netbeans.api.javahelp.Help")); // NOI18N |
783 |
"org.netbeans.api.javahelp.Help")); // NOI18N |
|
|
784 |
} |
| 785 |
// #27776: need to also handle package deps on javax.help, |
| 786 |
// which should now be module deps on |
| 787 |
// org.netbeans.modules.javahelp. |
| 788 |
alreadyHaveJH = false; |
| 789 |
it = dependencies.iterator(); |
| 790 |
while (it.hasNext()) { |
| 791 |
Dependency d = (Dependency)it.next(); |
| 792 |
if (d.getType() == Dependency.TYPE_MODULE && |
| 793 |
d.getName().startsWith("org.netbeans.modules.javahelp/")) { // NOI18N |
| 794 |
alreadyHaveJH = true; |
| 795 |
break; |
| 796 |
} |
| 797 |
} |
| 798 |
if (!alreadyHaveJH) { |
| 799 |
boolean needPackageJH = false; |
| 800 |
it = dependencies.iterator(); |
| 801 |
String pkg = "javax.help"; // NOI18N |
| 802 |
while (it.hasNext()) { |
| 803 |
Dependency d = (Dependency)it.next(); |
| 804 |
String name = d.getName(); |
| 805 |
if (d.getType() == Dependency.TYPE_PACKAGE && |
| 806 |
(name.equals(pkg) || name.startsWith("[" + pkg + ".") || name.startsWith(pkg + "["))) { // NOI18N |
| 807 |
needPackageJH = true; |
| 808 |
break; |
| 809 |
} |
| 810 |
} |
| 811 |
if (needPackageJH) { |
| 812 |
Util.err.log("Adding automatic dependency on org.netbeans.modules.javahelp for module " + m.getCodeNameBase()); |
| 813 |
dependencies.addAll(Dependency.create(Dependency.TYPE_MODULE, |
| 814 |
"org.netbeans.modules.javahelp/1 > 1.0")); // NOI18N |
| 815 |
} |
| 784 |
} |
816 |
} |
| 785 |
} |
817 |
} |
| 786 |
// For pre-3.14, add automatic deps on org.openide.src and org.openide.deprecated. |
818 |
// For pre-3.14, add automatic deps on org.openide.src and org.openide.deprecated. |