Skip to content

Commit

Permalink
Merge pull request #5348 from apache/delivery
Browse files Browse the repository at this point in the history 
Sync delivery to release170 for 17-rc2
  • Loading branch information
@neilcsmith-net
neilcsmith-net authored Jan 25, 2023
2 parents ad297ed + 366e0de commit 6d082ad
Show file tree
Hide file tree
Showing 23 changed files with 532 additions and 94 deletions.
53 changes: 26 additions & 27 deletions extide/gradle/src/org/netbeans/modules/gradle/options/SettingsPanel.form
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,32 +181,14 @@
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Component id="lblGradleUserHome" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="9" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace min="-2" pref="231" max="-2" attributes="0"/>
<Component id="lbVersionInfo" pref="2" max="32767" attributes="0"/>
<EmptySpace min="-2" pref="78" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="1" attributes="0">
<Component id="tfGradleUserHome" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="btGradleUserHome" linkSize="3" min="-2" pref="105" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="btDefaultHome" min="-2" pref="105" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="lblGradleDistribution" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Component id="rbUseStandardGradle" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="cbGradleVersion" max="32767" attributes="0"/>
<Component id="cbGradleVersion" pref="107" max="32767" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="rbUseCustomGradle" min="-2" max="-2" attributes="0"/>
Expand All @@ -225,6 +207,23 @@
</Group>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="lblGradleUserHome" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="9" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace min="6" pref="6" max="-2" attributes="0"/>
<Component id="lbVersionInfo" max="32767" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="tfGradleUserHome" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="btGradleUserHome" linkSize="3" min="-2" pref="105" max="-2" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="btDefaultHome" min="-2" pref="105" max="-2" attributes="0"/>
</Group>
</Group>
</Group>
</Group>
<EmptySpace min="2" pref="2" max="-2" attributes="0"/>
</Group>
Expand All @@ -233,32 +232,32 @@
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="32767" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="lblGradleUserHome" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="tfGradleUserHome" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="btGradleUserHome" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="btDefaultHome" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Component id="lbVersionInfo" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="lbVersionInfo" max="32767" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="lblGradleDistribution" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="cbGradleVersion" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="rbUseStandardGradle" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="rbUseCustomGradle" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="tfUseCustomGradle" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="btUseCustomGradle" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<EmptySpace type="unrelated" min="-2" max="-2" attributes="0"/>
<Component id="cbPreferWrapper" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="cbStartDaemonOnStart" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="cbSilentInstall" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
Expand Down
35 changes: 17 additions & 18 deletions extide/gradle/src/org/netbeans/modules/gradle/options/SettingsPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,28 +265,14 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
.addGroup(jPanel1Layout.createSequentialGroup()
.addContainerGap()
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel1Layout.createSequentialGroup()
.addComponent(lblGradleUserHome)
.addGap(9, 9, 9)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel1Layout.createSequentialGroup()
.addGap(231, 231, 231)
.addComponent(lbVersionInfo, javax.swing.GroupLayout.DEFAULT_SIZE, 2, Short.MAX_VALUE)
.addGap(78, 78, 78))
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel1Layout.createSequentialGroup()
.addComponent(tfGradleUserHome)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(btGradleUserHome, javax.swing.GroupLayout.PREFERRED_SIZE, 105, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(btDefaultHome, javax.swing.GroupLayout.PREFERRED_SIZE, 105, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGroup(jPanel1Layout.createSequentialGroup()
.addComponent(lblGradleDistribution)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel1Layout.createSequentialGroup()
.addComponent(rbUseStandardGradle)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(cbGradleVersion, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addComponent(cbGradleVersion, 0, 107, Short.MAX_VALUE))
.addGroup(jPanel1Layout.createSequentialGroup()
.addComponent(rbUseCustomGradle)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
Expand All @@ -298,7 +284,20 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
.addComponent(cbSilentInstall)
.addComponent(cbStartDaemonOnStart)
.addComponent(cbPreferWrapper))
.addGap(0, 0, Short.MAX_VALUE)))
.addGap(0, 0, Short.MAX_VALUE))
.addGroup(jPanel1Layout.createSequentialGroup()
.addComponent(lblGradleUserHome)
.addGap(9, 9, 9)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel1Layout.createSequentialGroup()
.addGap(6, 6, 6)
.addComponent(lbVersionInfo, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addGroup(jPanel1Layout.createSequentialGroup()
.addComponent(tfGradleUserHome)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(btGradleUserHome, javax.swing.GroupLayout.PREFERRED_SIZE, 105, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(btDefaultHome, javax.swing.GroupLayout.PREFERRED_SIZE, 105, javax.swing.GroupLayout.PREFERRED_SIZE)))))
.addGap(2, 2, 2))
);

Expand All @@ -307,14 +306,14 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
jPanel1Layout.setVerticalGroup(
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel1Layout.createSequentialGroup()
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addContainerGap()
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(lblGradleUserHome)
.addComponent(tfGradleUserHome, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(btGradleUserHome)
.addComponent(btDefaultHome))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(lbVersionInfo)
.addComponent(lbVersionInfo, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(lblGradleDistribution)
Expand Down
11 changes: 7 additions & 4 deletions java/java.editor/src/org/netbeans/modules/java/editor/javadoc/JavadocCompletionTask.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,10 @@ public static interface ItemFactory<T> {
T createPackageItem(String pkgFQN, int startOffset);
}

private static final Set<ElementKind> EXECUTABLE = EnumSet.of(ElementKind.METHOD, ElementKind.CONSTRUCTOR);
private static final EnumSet<ElementKind> EXECUTABLE = EnumSet.of(ElementKind.METHOD, ElementKind.CONSTRUCTOR);
private static final EnumSet<ElementKind> TYPE_KINDS = EnumSet.of(
ElementKind.CLASS, ElementKind.INTERFACE, ElementKind.ENUM, ElementKind.RECORD, ElementKind.ANNOTATION_TYPE);

private static final String CLASS_KEYWORD = "class"; //NOI18N

private final List<T> items = new ArrayList<>();
Expand Down Expand Up @@ -588,17 +591,17 @@ private void completeClassOrPkg(String fqn, String prefix, int substitutionOffse
String pkgPrefix;
if (fqn == null) {
pkgPrefix = prefix;
addTypes(EnumSet.<ElementKind>of(ElementKind.CLASS, ElementKind.INTERFACE, ElementKind.ENUM, ElementKind.ANNOTATION_TYPE), null, null, prefix, substitutionOffset, jdctx);
addTypes(TYPE_KINDS, null, null, prefix, substitutionOffset, jdctx);
} else {
pkgPrefix = fqn + '.' + prefix;
PackageElement pkgElm = jdctx.javac.getElements().getPackageElement(fqn);
if (pkgElm != null) {
addPackageContent(pkgElm, EnumSet.<ElementKind>of(ElementKind.CLASS, ElementKind.INTERFACE, ElementKind.ENUM, ElementKind.ANNOTATION_TYPE), null, null, prefix, substitutionOffset, jdctx);
addPackageContent(pkgElm, TYPE_KINDS, null, null, prefix, substitutionOffset, jdctx);
}
TypeElement typeElm = jdctx.javac.getElements().getTypeElement(fqn);
if (typeElm != null) {
// inner classes
addInnerClasses(typeElm, EnumSet.<ElementKind>of(ElementKind.CLASS, ElementKind.INTERFACE, ElementKind.ENUM, ElementKind.ANNOTATION_TYPE), null, null, prefix, substitutionOffset, jdctx);
addInnerClasses(typeElm, TYPE_KINDS, null, null, prefix, substitutionOffset, jdctx);
}
}
for (String pkgName : jdctx.javac.getClasspathInfo().getClassIndex().getPackageNames(pkgPrefix, true, EnumSet.allOf(ClassIndex.SearchScope.class))) {
Expand Down
24 changes: 12 additions & 12 deletions java/java.editor/src/org/netbeans/modules/java/editor/javadoc/TagRegistery.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
*/
final class TagRegistery {

private static final Set<ElementKind> ALL_KINDS = EnumSet.<ElementKind>of(
private static final Set<ElementKind> ALL_KINDS = EnumSet.of(
ElementKind.ANNOTATION_TYPE, ElementKind.CLASS,
ElementKind.CONSTRUCTOR, ElementKind.ENUM,
ElementKind.ENUM_CONSTANT, ElementKind.FIELD,
ElementKind.INTERFACE, ElementKind.METHOD,
ElementKind.INTERFACE, ElementKind.RECORD, ElementKind.METHOD,
// OTHER stands for Overview here
ElementKind.OTHER, ElementKind.MODULE,
ElementKind.PACKAGE);
Expand All @@ -62,38 +62,38 @@ private TagRegistery() {
this.tags = new ArrayList<TagEntry>(20);
addTag("@author", false, EnumSet.of(
ElementKind.ANNOTATION_TYPE, ElementKind.CLASS,
ElementKind.ENUM, ElementKind.INTERFACE,
ElementKind.ENUM, ElementKind.INTERFACE, ElementKind.RECORD,
ElementKind.OTHER, ElementKind.MODULE,
ElementKind.PACKAGE));
addTag("@exception", false, EnumSet.of(ElementKind.METHOD, ElementKind.CONSTRUCTOR));
// deprecated: not in PACKAGE and OVERVIEW!
addTag("@deprecated", false, EnumSet.<ElementKind>of(
addTag("@deprecated", false, EnumSet.of(
ElementKind.ANNOTATION_TYPE, ElementKind.CLASS,
ElementKind.CONSTRUCTOR, ElementKind.ENUM,
ElementKind.ENUM_CONSTANT, ElementKind.FIELD,
ElementKind.INTERFACE, ElementKind.METHOD));
ElementKind.INTERFACE, ElementKind.METHOD, ElementKind.RECORD));

addTag("@param", false, EnumSet.of(
ElementKind.METHOD, ElementKind.CONSTRUCTOR, ElementKind.CLASS,
ElementKind.INTERFACE));
ElementKind.INTERFACE, ElementKind.RECORD));
addTag("@return", false, EnumSet.of(ElementKind.METHOD));
addTag("@see", false, ALL_KINDS);
addTag("@serial", false, EnumSet.<ElementKind>of(
addTag("@serial", false, EnumSet.of(
ElementKind.ANNOTATION_TYPE, ElementKind.CLASS,
ElementKind.ENUM,
ElementKind.ENUM_CONSTANT, ElementKind.FIELD,
ElementKind.INTERFACE,
ElementKind.INTERFACE, ElementKind.RECORD,
ElementKind.PACKAGE));

// serialData can be used just for writeObject, readObject, writeExternal, readExternal, writeReplace, and readResolve methods
addTag("@serialData", false, EnumSet.of(ElementKind.METHOD));
addTag("@serialField", false, EnumSet.of(ElementKind.FIELD));
addTag("@since", false, ALL_KINDS);
addTag("@throws", false, EnumSet.of(ElementKind.METHOD, ElementKind.CONSTRUCTOR));
addTag("@version", false, EnumSet.<ElementKind>of(
addTag("@version", false, EnumSet.of(
ElementKind.ANNOTATION_TYPE, ElementKind.CLASS,
ElementKind.ENUM,
ElementKind.INTERFACE,
ElementKind.INTERFACE, ElementKind.RECORD,
ElementKind.OTHER, ElementKind.PACKAGE));
addTag("@hidden", false, ALL_KINDS);
addTag("@provides", false, EnumSet.of(ElementKind.MODULE));
Expand All @@ -102,11 +102,11 @@ private TagRegistery() {
addTag("@code", true, ALL_KINDS);
addTag("@snippet", true, ALL_KINDS);
addTag("@summary", true, ALL_KINDS);
addTag("@systemProperty", true, EnumSet.<ElementKind>of(
addTag("@systemProperty", true, EnumSet.of(
ElementKind.ANNOTATION_TYPE, ElementKind.CLASS,
ElementKind.CONSTRUCTOR, ElementKind.ENUM,
ElementKind.ENUM_CONSTANT, ElementKind.FIELD,
ElementKind.INTERFACE, ElementKind.METHOD,
ElementKind.INTERFACE, ElementKind.METHOD, ElementKind.RECORD,
ElementKind.MODULE, ElementKind.PACKAGE));
addTag("@docRoot", true, ALL_KINDS);
addTag("@index", true, ALL_KINDS);
Expand Down
Loading

0 comments on commit 6d082ad

Please sign in to comment.