[netbeans] branch apisupport-ant-tests updated (4766679 -> 6cc2ff6)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch apisupport-ant-tests in repository https://gitbox.apache.org/repos/asf/netbeans.git. discard 4766679 Fix apisupport.ant tests new 6cc2ff6 Fix apisupport.ant tests This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (4766679) \ N -- N -- N refs/heads/apisupport-ant-tests (6cc2ff6) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: apisupport/apisupport.ant/build.xml | 13 + .../example-external-projects/suite3/nbplatform/.gitkeep| 1 - .../nbplatform/platform5/core/core/META-INF/manifest.mf | 2 ++ .../random/modules/ext/stuff/META-INF/manifest.mf | 1 + .../nbplatform/random/modules/random/META-INF/manifest.mf | 3 +++ .../project/queries/ClassPathProviderImplTest.java | 2 +- .../project/queries/SubprojectProviderImplTest.java | 10 ++ .../modules/apisupport/project/universe/ModuleListTest.java | 2 +- .../modules/apisupport/project/universe/TestEntryTest.java | 2 +- 9 files changed, 28 insertions(+), 8 deletions(-) delete mode 100644 apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/nbplatform/.gitkeep create mode 100644 apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/nbplatform/platform5/core/core/META-INF/manifest.mf create mode 100644 apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/nbplatform/random/modules/ext/stuff/META-INF/manifest.mf create mode 100644 apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/nbplatform/random/modules/random/META-INF/manifest.mf - 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
[netbeans] 01/01: [TRAVIS] Enable cache
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a commit to branch travis_cache in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 80656912ee5a626cb206b7a475b4abee3190d2d3 Author: Hector Espert AuthorDate: Fri Apr 17 22:23:15 2020 +0200 [TRAVIS] Enable cache --- .travis.yml | 5 + 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 348e149..071047e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,12 +23,17 @@ addons: - xvfb - openjfx - libgfortran3 + install: - export PATH="$PATH:$TRAVIS_BUILD_DIR/nbbuild/travis" - export DISPLAY=:99.0 - Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & - sleep 3 +cache: + directories: + - $HOME/.hgexternalcache + matrix: include: - name: Check line endings and verify RAT report - 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
[netbeans] branch travis_cache created (now 8065691)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch travis_cache in repository https://gitbox.apache.org/repos/asf/netbeans.git. at 8065691 [TRAVIS] Enable cache This branch includes the following new commits: new 8065691 [TRAVIS] Enable cache The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - 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
[netbeans] 01/01: Fix apisupport.ant tests
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a commit to branch apisupport-ant-tests in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 4766679eb3a8db936d4116277b8b1f6e36dbba3c Author: Hector Espert AuthorDate: Fri Apr 17 20:36:54 2020 +0200 Fix apisupport.ant tests --- .gitignore | 2 +- .travis.yml| 2 +- .../html4j/nbproject/project.properties| 2 +- .../javafx/nbproject/project.properties| 2 +- .../suite3/nbplatform/.gitkeep | 1 + .../apisupport/project/ApisupportAntUtilsTest.java | 4 +- .../AvoidModuleListInProjectConstructorTest.java | 2 +- .../apisupport/project/DialogDisplayerImpl.java| 70 ++ .../modules/apisupport/project/EvaluatorTest.java | 6 +- .../apisupport/project/ModuleDependencyTest.java | 5 +- .../apisupport/project/NbModuleProjectTest.java| 5 +- .../project/NbModuleProviderImplTest.java | 2 - .../apisupport/project/ProjectXMLManagerTest.java | 4 +- .../modules/apisupport/project/UseFxTest.java | 1 - .../apisupport/project/UseHtml4JavaTest.java | 1 - .../queries/AccessibilityQueryImplTest.java| 14 ++--- .../queries/AntArtifactProviderImplTest.java | 7 ++- .../project/queries/ClassPathProviderImplTest.java | 4 +- .../queries/GlobalJavadocForBinaryImplTest.java| 3 +- .../project/queries/JavadocForBinaryImplTest.java | 2 +- .../project/queries/SourceForBinaryImplTest.java | 22 +++ .../project/queries/SourceLevelQueryImplTest.java | 2 +- .../queries/SubprojectProviderImplTest.java| 4 +- .../queries/UnitTestForSourceQueryImplTest.java| 20 +++ .../project/spi/BrandingSupportTest.java | 3 +- .../project/suite/BuildZipDistributionTest.java| 1 - .../apisupport/project/ui/ModuleActionsTest.java | 4 +- .../ui/wizard/LibraryStartVisualPanelTest.java | 2 +- .../project/universe/ModuleListTest.java | 9 +-- 29 files changed, 136 insertions(+), 70 deletions(-) diff --git a/.gitignore b/.gitignore index 35528c1..0245b1d 100644 --- a/.gitignore +++ b/.gitignore @@ -100,4 +100,4 @@ derby.log /groovy/gradle/netbeans-gradle-tooling/.gradle/ /groovy/gradle/netbeans-gradle-tooling/gradle/wrapper/gradle-wrapper.jar /groovy/gradle/release/modules/gradle/daemon-loader/.gradle/ -/nbbuild/misc/prepare-bundles/target/ \ No newline at end of file +/nbbuild/misc/prepare-bundles/target/ diff --git a/.travis.yml b/.travis.yml index 348e149..b115979 100644 --- a/.travis.yml +++ b/.travis.yml @@ -459,7 +459,7 @@ matrix: - ant $OPTS clean - ant $OPTS build script: -#- ant $OPTS -f apisupport/apisupport.ant test +- ant $OPTS -f apisupport/apisupport.ant test - ant $OPTS -f apisupport/apisupport.project test - ant $OPTS -f apisupport/apisupport.refactoring test - ant $OPTS -f apisupport/apisupport.wizards test diff --git a/apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/project.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/project.properties index 8c80113..5137752 100644 --- a/apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/project.properties +++ b/apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/project.properties @@ -15,5 +15,5 @@ # specific language governing permissions and limitations # under the License. -javac.source=1.6 +javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial diff --git a/apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/project.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/project.properties index 8c80113..5137752 100644 --- a/apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/project.properties +++ b/apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/project.properties @@ -15,5 +15,5 @@ # specific language governing permissions and limitations # under the License. -javac.source=1.6 +javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial diff --git a/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/nbplatform/.gitkeep b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/nbplatform/.gitkeep new file mode 100644 index 000..8b13789 --- /dev/null +++ b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/nbplatform/.gitkeep @@ -0,0 +1 @@ + diff --git a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ApisupportAntUtilsTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport
[netbeans] branch apisupport-ant-tests created (now 4766679)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch apisupport-ant-tests in repository https://gitbox.apache.org/repos/asf/netbeans.git. at 4766679 Fix apisupport.ant tests This branch includes the following new commits: new 4766679 Fix apisupport.ant tests The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - 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
[netbeans] branch NETBEANS-4029 updated (4b432f8 -> 8d4bfc7)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch NETBEANS-4029 in repository https://gitbox.apache.org/repos/asf/netbeans.git. discard 4b432f8 Tests discard df60dd9 [NETBEANS-4029] Fix feature dialog add 8d4bfc7 [NETBEANS-4029] Fix feature dialog This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (4b432f8) \ N -- N -- N refs/heads/NETBEANS-4029 (8d4bfc7) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: ergonomics/ide.ergonomics/nbproject/project.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) - 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
[netbeans] branch NETBEANS-4029 updated (df60dd9 -> 4b432f8)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch NETBEANS-4029 in repository https://gitbox.apache.org/repos/asf/netbeans.git. from df60dd9 [NETBEANS-4029] Fix feature dialog add 4b432f8 Tests No new revisions were added by this update. Summary of changes: .../ide/ergonomics/fod/ConfigurationPanel.java | 24 ++-- .../ide/ergonomics/fod/ConfigurationPanelTest.java | 150 + .../ide/ergonomics/fod/TestBundle.properties | 2 + .../ide/ergonomics/fod/TestBundle2.properties | 3 + 4 files changed, 171 insertions(+), 8 deletions(-) create mode 100644 ergonomics/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/ConfigurationPanelTest.java - 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
[netbeans] branch NETBEANS-4029 updated (a49d845 -> df60dd9)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch NETBEANS-4029 in repository https://gitbox.apache.org/repos/asf/netbeans.git. discard a49d845 WIP discard abe985c [NETBEANS-4029] Fix feature dialog new df60dd9 [NETBEANS-4029] Fix feature dialog This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (a49d845) \ N -- N -- N refs/heads/NETBEANS-4029 (df60dd9) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/netbeans/modules/ide/ergonomics/fod/ConfigurationPanel.java| 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) - 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
[netbeans] 01/01: [NETBEANS-4029] Fix feature dialog
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
commit df60dd98a3bdb494e0c0f913283957cf81100356
Author: Hector Espert
AuthorDate: Thu Apr 9 23:21:11 2020 +0200
[NETBEANS-4029] Fix feature dialog
---
.../ide/ergonomics/fod/ConfigurationPanel.java | 53 ++
1 file changed, 34 insertions(+), 19 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 be78b57..f038985 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
@@ -24,9 +24,11 @@ import java.awt.EventQueue;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.Callable;
@@ -49,7 +51,6 @@ import org.netbeans.api.progress.ProgressHandle;
import org.netbeans.api.progress.ProgressHandleFactory;
import org.netbeans.modules.autoupdate.ui.api.PluginManager;
import org.openide.awt.Mnemonics;
-import org.openide.modules.SpecificationVersion;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;
import org.openide.util.RequestProcessor.Task;
@@ -93,7 +94,7 @@ public class ConfigurationPanel extends JPanel implements
Runnable {
public void setInfo(FeatureInfo info, String displayName,
Collection toInstall,
Collection missingModules,
Map extrasMap, boolean
required) {
-this.extrasFilter = new HashSet();
+this.extrasFilter = new HashSet<>();
this.featureInfo = info;
this.featureInstall = toInstall;
boolean activateNow = toInstall.isEmpty() && missingModules.isEmpty();
@@ -142,29 +143,17 @@ public class ConfigurationPanel extends JPanel implements
Runnable {
downloadLabel.setVisible(true);
activateButton.setVisible(true);
downloadButton.setVisible(true);
-StringBuilder sbDownload = new StringBuilder();
-
+
// collect descriptions from features contributing installed extras
-for (FeatureInfo fi : extrasMap.values()) {
-String s = required
-? fi.getExtraModulesRequiredText()
-: fi.getExtraModulesRecommendedText();
-if (s != null) {
-if (sbDownload.length() > 0) {
-sbDownload.append("\n");
-}
-sbDownload.append(s);
-}
-}
+List downloadStringList =
collectDescriptionsFromFeatures(extrasMap.values(), required);
+String lblDownloadMsg =
generateDownloadMessageFromDescriptions(downloadStringList);
+
if (required) {
activateButton.setEnabled(false);
} else {
activateButton.setEnabled(true);
}
-String lblDownloadMsg = sbDownload.toString();
-
-String list = "";
if (!missingModules.isEmpty()) {
StringBuilder sb = new StringBuilder();
for (FeatureInfo.ExtraModuleInfo s : missingModules) {
@@ -173,7 +162,7 @@ public class ConfigurationPanel extends JPanel implements
Runnable {
}
sb.append(s.displayName());
}
-list = sb.toString();
+String list = sb.toString();
if (required) {
lblDownloadMsg =
NbBundle.getMessage(ConfigurationPanel.class, "MSG_MissingRequiredModules",
displayName, list);
activateButton.setEnabled(false);
@@ -194,6 +183,32 @@ public class ConfigurationPanel extends JPanel implements
Runnable {
org.openide.awt.Mnemonics.setLocalizedText(downloadButton,
btnDownloadMsg);
}
}
+
+private List
collectDescriptionsFromFeatures(Collection features, boolean
required) {
+List 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
descriptions) {
[netbeans] branch NETBEANS-4029 updated: WIP
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
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 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 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("");
-for (int i = 0; i < downloadStringList.size(); i++) {
-sbDownload.append(downloadStringList.get(i));
-if (i > 0 || i < downloadStringList.size() - 1) {
-sbDownload.append("");
-}
-}
-
-sbDownload.append("");
-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
collectDescriptionsFromFeatures(Collection features, boolean
required) {
+List 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
descriptions) {
+StringBuilder sbDownload = new StringBuilder();
+if (!descriptions.isEmpty()) {
+sbDownload.append("");
+for (int i = 0; i < descriptions.size(); i++) {
+sbDownload.append(descriptions.get(i));
+if (i > 0 || i < descriptions.size() - 1) {
+sbDownload.append("");
+}
+}
+sbDownload.append("");
+}
+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
[netbeans] branch NETBEANS-4029 created (now abe985c)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch NETBEANS-4029 in repository https://gitbox.apache.org/repos/asf/netbeans.git. at abe985c [NETBEANS-4029] Fix feature dialog This branch includes the following new commits: new abe985c [NETBEANS-4029] Fix feature dialog The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - 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
[netbeans] 01/01: [NETBEANS-4029] Fix feature dialog
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
commit abe985cafc7df5d26f72a18cc84364bc386c5963
Author: Hector Espert
AuthorDate: Thu Apr 9 23:21:11 2020 +0200
[NETBEANS-4029] Fix feature dialog
---
.../ide/ergonomics/fod/ConfigurationPanel.java | 32 +++---
1 file changed, 22 insertions(+), 10 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 be78b57..6f98a8a 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
@@ -24,9 +24,11 @@ import java.awt.EventQueue;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.Callable;
@@ -142,29 +144,39 @@ public class ConfigurationPanel extends JPanel implements
Runnable {
downloadLabel.setVisible(true);
activateButton.setVisible(true);
downloadButton.setVisible(true);
-StringBuilder sbDownload = new StringBuilder();
-
+
+List downloadStringList = new ArrayList<>();
+
// collect descriptions from features contributing installed extras
for (FeatureInfo fi : extrasMap.values()) {
String s = required
? fi.getExtraModulesRequiredText()
: fi.getExtraModulesRecommendedText();
-if (s != null) {
-if (sbDownload.length() > 0) {
-sbDownload.append("\n");
-}
-sbDownload.append(s);
+if (!downloadStringList.contains(s)) {
+downloadStringList.add(s);
}
}
+
if (required) {
activateButton.setEnabled(false);
} else {
activateButton.setEnabled(true);
}
-String lblDownloadMsg = sbDownload.toString();
+String lblDownloadMsg = "";
+if (!downloadStringList.isEmpty()) {
+StringBuilder sbDownload = new StringBuilder("");
+for (int i = 0; i < downloadStringList.size(); i++) {
+sbDownload.append(downloadStringList.get(i));
+if (i > 0 || i < downloadStringList.size() - 1) {
+sbDownload.append("");
+}
+}
+
+sbDownload.append("");
+lblDownloadMsg = sbDownload.toString();
+}
-String list = "";
if (!missingModules.isEmpty()) {
StringBuilder sb = new StringBuilder();
for (FeatureInfo.ExtraModuleInfo s : missingModules) {
@@ -173,7 +185,7 @@ public class ConfigurationPanel extends JPanel implements
Runnable {
}
sb.append(s.displayName());
}
-list = sb.toString();
+String list = sb.toString();
if (required) {
lblDownloadMsg =
NbBundle.getMessage(ConfigurationPanel.class, "MSG_MissingRequiredModules",
displayName, list);
activateButton.setEnabled(false);
-
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
[netbeans] branch master updated: [TRAVIS] Retry webcommon javascript2.jquery module
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git The following commit(s) were added to refs/heads/master by this push: new a05bfc2 [TRAVIS] Retry webcommon javascript2.jquery module new a6db3da Merge pull request #2045 from hectorespert/retry_webcommon_javascript2_jquery a05bfc2 is described below commit a05bfc229bfb98c3f98b953c70adcd6b59dd8f38 Author: Hector Espert AuthorDate: Tue Mar 24 20:58:51 2020 +0100 [TRAVIS] Retry webcommon javascript2.jquery module --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2ee7585..8e2c310 100644 --- a/.travis.yml +++ b/.travis.yml @@ -520,7 +520,7 @@ matrix: - hide-logs.sh ant $OPTS -f webcommon/javascript2.extdoc test - hide-logs.sh ant $OPTS -f webcommon/javascript2.extjs test - hide-logs.sh ant $OPTS -f webcommon/javascript2.jade test -- hide-logs.sh ant $OPTS -f webcommon/javascript2.jquery test +- travis_retry hide-logs.sh ant $OPTS -f webcommon/javascript2.jquery test - hide-logs.sh ant $OPTS -f webcommon/javascript2.jsdoc test - hide-logs.sh ant $OPTS -f webcommon/javascript2.json test - hide-logs.sh ant $OPTS -f webcommon/javascript2.knockout test - 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
[netbeans-website] branch master updated: Upgrade to Gradle 6.3 (#466)
This is an automated email from the ASF dual-hosted git repository.
hectorespert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-website.git
The following commit(s) were added to refs/heads/master by this push:
new 0bca999 Upgrade to Gradle 6.3 (#466)
0bca999 is described below
commit 0bca9998d7584213491a87cc1a16c19822eb3142
Author: Hector Espert
AuthorDate: Thu Apr 2 08:25:40 2020 +0200
Upgrade to Gradle 6.3 (#466)
* Upgrade to gradle 6.3
* Remove wrapper config
---
netbeans.apache.org/build.gradle| 12
netbeans.apache.org/gradle/deps.gradle | 2 +-
.../gradle/wrapper/gradle-wrapper.jar | Bin 54783 -> 55741 bytes
.../gradle/wrapper/gradle-wrapper.properties| 3 +--
netbeans.apache.org/gradlew | 8
netbeans.apache.org/gradlew.bat | 2 +-
6 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/netbeans.apache.org/build.gradle b/netbeans.apache.org/build.gradle
index 55f5c97..7ddd139 100644
--- a/netbeans.apache.org/build.gradle
+++ b/netbeans.apache.org/build.gradle
@@ -206,7 +206,7 @@ task buildSite(dependsOn: ["preprocessContent", "bake"],
}
-task("run", type: JavaExec, group: "Run", overwrite: true) {
+task run(type: JavaExec, group: "Run") {
def wDir = new File(buildDir, "tomcat")
@@ -216,17 +216,13 @@ task("run", type: JavaExec, group: "Run", overwrite:
true) {
}
main "TomcatMain"
-classpath buildscript.configurations.classpath +
files("${rootProject.projectDir}/buildSrc/build/classes/main")
+classpath buildscript.configurations.classpath +
files("${rootProject.projectDir}/buildSrc/build/classes/groovy/main")
args = [bakedDir, 8080, "SHUTDOWN", 8088]
workingDir = wDir
}
-task("stop", type: JavaExec, group: "Run", overwrite: true) {
+task stop(type: JavaExec, group: "Run") {
main "TomcatStopMain"
-classpath buildscript.configurations.classpath +
files("${rootProject.projectDir}/buildSrc/build/classes/main")
+classpath buildscript.configurations.classpath +
files("${rootProject.projectDir}/buildSrc/build/classes/groovy/main")
args = ["SHUTDOWN", 8082]
}
-
-wrapper {
-gradleVersion = libs.gradle
-}
diff --git a/netbeans.apache.org/gradle/deps.gradle
b/netbeans.apache.org/gradle/deps.gradle
index 1e86767..2c1d522 100644
--- a/netbeans.apache.org/gradle/deps.gradle
+++ b/netbeans.apache.org/gradle/deps.gradle
@@ -22,7 +22,7 @@ buildscript {
tomcat
"org.apache.tomcat.embed:tomcat-embed-logging-juli:${libs.tomcatJuli}"
}
libs = [
-groovy: "2.4.11",
+groovy: "2.5.10",
jbake: "2.5.1",
snakeYaml: "1.18",
gradle: "3.5.1",
diff --git a/netbeans.apache.org/gradle/wrapper/gradle-wrapper.jar
b/netbeans.apache.org/gradle/wrapper/gradle-wrapper.jar
index 19c760f..457aad0 100644
Binary files a/netbeans.apache.org/gradle/wrapper/gradle-wrapper.jar and
b/netbeans.apache.org/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/netbeans.apache.org/gradle/wrapper/gradle-wrapper.properties
b/netbeans.apache.org/gradle/wrapper/gradle-wrapper.properties
index d212895..a4b4429 100644
--- a/netbeans.apache.org/gradle/wrapper/gradle-wrapper.properties
+++ b/netbeans.apache.org/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Sun Jun 04 17:14:53 EDT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
diff --git a/netbeans.apache.org/gradlew b/netbeans.apache.org/gradlew
index 4453cce..af6708f 100755
--- a/netbeans.apache.org/gradlew
+++ b/netbeans.apache.org/gradlew
@@ -28,16 +28,16 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to
pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
-warn ( ) {
+warn () {
echo "$*"
}
-die ( ) {
+die () {
echo
echo "$*"
echo
@@ -155,7 +155,7 @@ if $cygwin ; then
fi
# Escape application args
-save ( ) {
+save () {
for i do printf %s\\n "$i" | sed "s/'/'''/g;1s/^/'/;\$s/\$/' /" ;
done
echo " "
}
diff --git a/netbeans.apache.org/gradlew.bat b/netbeans.apache.org/g
[netbeans] branch master updated: [TRAVIS] Add java modules
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git The following commit(s) were added to refs/heads/master by this push: new 6b5649e [TRAVIS] Add java modules new 0401f36 Merge pull request #2032 from hectorespert/travis_java_modules 6b5649e is described below commit 6b5649e5d5fdf994b73ae739ad5844a6372f1641 Author: Hector Espert AuthorDate: Wed Mar 18 19:57:02 2020 +0100 [TRAVIS] Add java modules --- .travis.yml | 59 +-- 1 file changed, 57 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9f49eb5..2ee7585 100644 --- a/.travis.yml +++ b/.travis.yml @@ -339,7 +339,7 @@ matrix: - ant $OPTS build script: #- ant $OPTS -f java/ant.debugger test -- ant $OPTS -f java/ant.freeform test +- hide-logs.sh ant $OPTS -f java/ant.freeform test #- ant $OPTS -f java/ant.grammar test - ant $OPTS -f java/api.debugger.jpda test - ant $OPTS -f java/api.java test @@ -347,12 +347,67 @@ matrix: #- ant $OPTS -f java/beans test - ant $OPTS -f java/classfile test - ant $OPTS -f java/dbschema test -Dtest.config=stable +#- ant $OPTS -f java/debugger.jpda test +- hide-logs.sh ant $OPTS -f java/debugger.jpda.js test +- hide-logs.sh ant $OPTS -f java/debugger.jpda.projects test +- hide-logs.sh ant $OPTS -f java/debugger.jpda.projectsui test +#- ant $OPTS -f java/debugger.jpda.truffle test +#- ant $OPTS -f java/debugger.jpda.ui test +- travis_wait hide-logs.sh ant $OPTS -f java/editor.htmlui test +#- travis_wait 30 hide-logs.sh ant $OPTS -f java/form test - ant $OPTS -f java/hudson.maven test - ant $OPTS -f java/java.completion test -- ant $OPTS -f java/java.hints.declarative test +- hide-logs.sh ant $OPTS -f java/java.hints.declarative test +#- ant $OPTS -f java/java.kit test +#- ant $OPTS -f java/java.lexer test +#- ant $OPTS -f java/java.lexer test +#- ant $OPTS -f java/java.lsp.server test +#- ant $OPTS -f java/java.metrics test +- ant $OPTS -f java/java.module.graph test +- ant $OPTS -f java/java.navigation test +#- ant $OPTS -f java/java.openjdk.project test +- ant $OPTS -f java/java.platform test +- ant $OPTS -f java/java.platform.ui test +- ant $OPTS -f java/java.preprocessorbridge test +- hide-logs.sh ant $OPTS -f java/java.project test +#- ant $OPTS -f java/java.project.ui test +#- ant $OPTS -f java/java.source test +#- ant $OPTS -f java/java.source.ant test - ant $OPTS -f java/java.source.base test +- ant $OPTS -f java/java.source.compat8 test +- ant $OPTS -f java/java.source.nbjavac test +- ant $OPTS -f java/java.source.queriesimpl test +#- ant $OPTS -f java/java.sourceui test +- ant $OPTS -f java/java.testrunner test +- ant $OPTS -f java/java.testrunner.ant test +#- ant $OPTS -f java/javadoc test +- ant $OPTS -f java/javawebstart test +#- ant $OPTS -f java/jellytools.java test +#- ant $OPTS -f java/jshell.support test +#- ant $OPTS -f java/junit test +- ant $OPTS -f java/junit.ant.ui test +- ant $OPTS -f java/lib.nbjavac test +#- ant $OPTS -f java/maven test +#- ant $OPTS -f java/maven.embedder test +- ant $OPTS -f java/maven.grammar test +#- ant $OPTS -f java/maven.hints test +#- ant $OPTS -f java/maven.htmlui test +- ant $OPTS -f java/maven.indexer test +- ant $OPTS -f java/maven.junit test +- ant $OPTS -f java/maven.model test +- ant $OPTS -f java/maven.osgi test +#- ant $OPTS -f java/performance test +#- ant $OPTS -f java/performance.java test +#- ant $OPTS -f java/projectimport.eclipse.core test +#- ant $OPTS -f java/refactoring.java test +- ant $OPTS -f java/spellchecker.bindings.java test #- ant $OPTS -f java/spi.java.hints test - ant $OPTS -f java/spring.beans test +- ant $OPTS -f java/testng test +#- ant $OPTS -f java/testng.ant test +#- ant $OPTS -f java/testng.ui test +- ant $OPTS -f java/whitelist test +- ant $OPTS -f java/xml.jaxb test - name: Test Java modules with nb-javac on Java 11 jdk: openjdk8 - To unsubscribe, e-mail
[netbeans-website] branch upgrade_gradle_version updated (68a3549 -> a3e8ac6)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch upgrade_gradle_version in repository https://gitbox.apache.org/repos/asf/netbeans-website.git. from 68a3549 Upgrade to gradle 6.3 add a3e8ac6 Remove wrapper config No new revisions were added by this update. Summary of changes: netbeans.apache.org/build.gradle | 4 1 file changed, 4 deletions(-) - 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
[netbeans-website] 01/01: Upgrade to gradle 6.3
This is an automated email from the ASF dual-hosted git repository.
hectorespert pushed a commit to branch upgrade_gradle_version
in repository https://gitbox.apache.org/repos/asf/netbeans-website.git
commit 68a35492d80b82c0f4b4e9c5751242cd6ef009d7
Author: Hector Espert
AuthorDate: Tue Mar 31 21:21:01 2020 +0200
Upgrade to gradle 6.3
---
netbeans.apache.org/build.gradle| 8
netbeans.apache.org/gradle/deps.gradle | 2 +-
.../gradle/wrapper/gradle-wrapper.jar | Bin 54783 -> 55741 bytes
.../gradle/wrapper/gradle-wrapper.properties| 3 +--
netbeans.apache.org/gradlew | 8
netbeans.apache.org/gradlew.bat | 2 +-
6 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/netbeans.apache.org/build.gradle b/netbeans.apache.org/build.gradle
index 55f5c97..1c45a2a 100644
--- a/netbeans.apache.org/build.gradle
+++ b/netbeans.apache.org/build.gradle
@@ -206,7 +206,7 @@ task buildSite(dependsOn: ["preprocessContent", "bake"],
}
-task("run", type: JavaExec, group: "Run", overwrite: true) {
+task run(type: JavaExec, group: "Run") {
def wDir = new File(buildDir, "tomcat")
@@ -216,14 +216,14 @@ task("run", type: JavaExec, group: "Run", overwrite:
true) {
}
main "TomcatMain"
-classpath buildscript.configurations.classpath +
files("${rootProject.projectDir}/buildSrc/build/classes/main")
+classpath buildscript.configurations.classpath +
files("${rootProject.projectDir}/buildSrc/build/classes/groovy/main")
args = [bakedDir, 8080, "SHUTDOWN", 8088]
workingDir = wDir
}
-task("stop", type: JavaExec, group: "Run", overwrite: true) {
+task stop(type: JavaExec, group: "Run") {
main "TomcatStopMain"
-classpath buildscript.configurations.classpath +
files("${rootProject.projectDir}/buildSrc/build/classes/main")
+classpath buildscript.configurations.classpath +
files("${rootProject.projectDir}/buildSrc/build/classes/groovy/main")
args = ["SHUTDOWN", 8082]
}
diff --git a/netbeans.apache.org/gradle/deps.gradle
b/netbeans.apache.org/gradle/deps.gradle
index 1e86767..2c1d522 100644
--- a/netbeans.apache.org/gradle/deps.gradle
+++ b/netbeans.apache.org/gradle/deps.gradle
@@ -22,7 +22,7 @@ buildscript {
tomcat
"org.apache.tomcat.embed:tomcat-embed-logging-juli:${libs.tomcatJuli}"
}
libs = [
-groovy: "2.4.11",
+groovy: "2.5.10",
jbake: "2.5.1",
snakeYaml: "1.18",
gradle: "3.5.1",
diff --git a/netbeans.apache.org/gradle/wrapper/gradle-wrapper.jar
b/netbeans.apache.org/gradle/wrapper/gradle-wrapper.jar
index 19c760f..457aad0 100644
Binary files a/netbeans.apache.org/gradle/wrapper/gradle-wrapper.jar and
b/netbeans.apache.org/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/netbeans.apache.org/gradle/wrapper/gradle-wrapper.properties
b/netbeans.apache.org/gradle/wrapper/gradle-wrapper.properties
index d212895..a4b4429 100644
--- a/netbeans.apache.org/gradle/wrapper/gradle-wrapper.properties
+++ b/netbeans.apache.org/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Sun Jun 04 17:14:53 EDT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
diff --git a/netbeans.apache.org/gradlew b/netbeans.apache.org/gradlew
index 4453cce..af6708f 100755
--- a/netbeans.apache.org/gradlew
+++ b/netbeans.apache.org/gradlew
@@ -28,16 +28,16 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to
pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
-warn ( ) {
+warn () {
echo "$*"
}
-die ( ) {
+die () {
echo
echo "$*"
echo
@@ -155,7 +155,7 @@ if $cygwin ; then
fi
# Escape application args
-save ( ) {
+save () {
for i do printf %s\\n "$i" | sed "s/'/'''/g;1s/^/'/;\$s/\$/' /" ;
done
echo " "
}
diff --git a/netbeans.apache.org/gradlew.bat b/netbeans.apache.org/gradlew.bat
index e95643d..0f8d593 100644
--- a/netbeans.apache.org/gradlew.bat
+++ b/netbeans.apache.org/gradlew.bat
@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Add default JVM options here. You can also use JAVA_OPTS and
[netbeans-website] branch upgrade_gradle_version created (now 68a3549)
This is an automated email from the ASF dual-hosted git repository. hectorespert pushed a change to branch upgrade_gradle_version in repository https://gitbox.apache.org/repos/asf/netbeans-website.git. at 68a3549 Upgrade to gradle 6.3 This branch includes the following new commits: new 68a3549 Upgrade to gradle 6.3 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - 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
