This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a commit to branch NETBEANS-4029 in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/NETBEANS-4029 by this push: new a49d845 WIP a49d845 is described below commit a49d845789657842b5343b6b3d4e780a3e35b217 Author: Hector Espert <hectorespertpa...@gmail.com> AuthorDate: Thu Apr 9 23:36:33 2020 +0200 WIP --- .../ide/ergonomics/fod/ConfigurationPanel.java | 52 ++++++++++++---------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/ConfigurationPanel.java b/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/ConfigurationPanel.java index 6f98a8a..8620080 100644 --- a/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/ConfigurationPanel.java +++ b/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/ConfigurationPanel.java @@ -145,17 +145,9 @@ public class ConfigurationPanel extends JPanel implements Runnable { activateButton.setVisible(true); downloadButton.setVisible(true); - List<String> downloadStringList = new ArrayList<>(); - // collect descriptions from features contributing installed extras - for (FeatureInfo fi : extrasMap.values()) { - String s = required - ? fi.getExtraModulesRequiredText() - : fi.getExtraModulesRecommendedText(); - if (!downloadStringList.contains(s)) { - downloadStringList.add(s); - } - } + List<String> downloadStringList = collectDescriptionsFromFeatures(extrasMap.values(), required); + String lblDownloadMsg = generateDownloadMessageFromDescriptions(downloadStringList); if (required) { activateButton.setEnabled(false); @@ -163,20 +155,6 @@ public class ConfigurationPanel extends JPanel implements Runnable { activateButton.setEnabled(true); } - String lblDownloadMsg = ""; - if (!downloadStringList.isEmpty()) { - StringBuilder sbDownload = new StringBuilder("<html><body>"); - for (int i = 0; i < downloadStringList.size(); i++) { - sbDownload.append(downloadStringList.get(i)); - if (i > 0 || i < downloadStringList.size() - 1) { - sbDownload.append("<br>"); - } - } - - sbDownload.append("</body></html>"); - lblDownloadMsg = sbDownload.toString(); - } - if (!missingModules.isEmpty()) { StringBuilder sb = new StringBuilder(); for (FeatureInfo.ExtraModuleInfo s : missingModules) { @@ -206,6 +184,32 @@ public class ConfigurationPanel extends JPanel implements Runnable { org.openide.awt.Mnemonics.setLocalizedText(downloadButton, btnDownloadMsg); } } + + private List<String> collectDescriptionsFromFeatures(Collection<FeatureInfo> features, boolean required) { + List<String> descriptionsList = new ArrayList<>(); + for (FeatureInfo fi : features) { + String s = required ? fi.getExtraModulesRequiredText(): fi.getExtraModulesRecommendedText(); + if (!descriptionsList.contains(s)) { + descriptionsList.add(s); + } + } + return descriptionsList; + } + + private String generateDownloadMessageFromDescriptions(List<String> descriptions) { + StringBuilder sbDownload = new StringBuilder(); + if (!descriptions.isEmpty()) { + sbDownload.append("<html><body>"); + for (int i = 0; i < descriptions.size(); i++) { + sbDownload.append(descriptions.get(i)); + if (i > 0 || i < descriptions.size() - 1) { + sbDownload.append("<br>"); + } + } + sbDownload.append("</body></html>"); + } + return sbDownload.toString(); + } @Override public void removeNotify() { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists