Merge pull request apache#2135 from neilcsmith-net/issue3810

[NETBEANS-4328] Make sure JavaFX is recommended but not required on JDK 11+.
canpse · May 22, 2020 · a012c77 · a012c77
2 parents 11d2883 + 568e13a
commit a012c77
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...nomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/ConfigurationPanel.java b/...nomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/ConfigurationPanel.java
@@ -117,7 +117,7 @@ public void setInfo(FeatureInfo info, String displayName, Collection<UpdateEleme
 
             if (extraModule.isRequiredFor(jdk)) {
                 jCheckBox.setSelected(true);
-                jCheckBox.setEnabled(false);
+//                jCheckBox.setEnabled(false);
                 extrasFilter.add(extraModule);
             }
             jCheckBox.addActionListener(e -> {

diff --git a/...mics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FindComponentModules.java b/...mics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FindComponentModules.java
@@ -299,7 +299,7 @@ public Map<FeatureInfo.ExtraModuleInfo, FeatureInfo>  getExtrasToDownload() {
     private void registerExtraDownloadable(FeatureInfo fi, FeatureInfo.ExtraModuleInfo fmi) {
         boolean required = false;
         if (fmi.isRequiredFor(jdk)) {
-            required = true;
+//            required = true;
         }
         if (fi.getExtraModulesRequiredText() != null && fi.getExtraModulesRecommendedText() == null) {
             required = true;

diff --git a/...ics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FoDUpdateUnitProvider.java b/...ics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FoDUpdateUnitProvider.java
@@ -103,7 +103,7 @@ public Map<String, UpdateItem> getUpdateItems () throws IOException {
                 boolean required = false;
 
                 if (mi.isRequiredFor(jdk)) {
-                    required = true;
+//                    required = true;
                 }
                 if (fi.getExtraModulesRequiredText() != null && fi.getExtraModulesRecommendedText() == null) {
                     required = true;