Skip to content

Commit b1012b0

Browse files
authored
Merge pull request #456 from sid-srini/update-to-nb27
Update to NetBeans 27
2 parents 00659e3 + 73871e0 commit b1012b0

31 files changed

+1644
-3138
lines changed

THIRD_PARTY_LICENSES.txt

Lines changed: 1361 additions & 524 deletions
Large diffs are not rendered by default.

build.xml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -48,22 +48,10 @@
4848
<string>
4949
patches/6330.diff
5050
patches/7610.diff
51-
patches/8036-draft.diff
5251
patches/8038-draft.diff
53-
patches/8210.diff
54-
patches/8237.diff
55-
patches/8242.diff
56-
patches/8245.diff
57-
patches/8255.diff
58-
patches/8260.diff
59-
patches/8280.diff
60-
patches/8289.diff
6152
patches/8690.diff
6253
patches/7893-draft.diff
63-
patches/8442-draft.diff
6454
patches/8460-draft.diff
65-
patches/8470.diff
66-
patches/8484.diff
6755
patches/8745-draft.diff
6856
patches/disable-error-notification.diff
6957
patches/mvn-sh.diff
@@ -76,7 +64,6 @@
7664
patches/dev-dependency-licenses.diff
7765
patches/nb-telemetry.diff
7866
patches/change-method-parameters-refactoring-qualified-names.diff
79-
patches/javavscode-375.diff
8067
</string>
8168
<filterchain>
8269
<tokenfilter delimoutput=" ">
Lines changed: 91 additions & 0 deletions
Loading
Lines changed: 37 additions & 0 deletions
Loading
Lines changed: 37 additions & 0 deletions
Loading
Lines changed: 43 additions & 0 deletions
Loading

netbeans

Submodule netbeans updated 5242 files

patches/6330.diff

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ConnectionSpec.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ConnectionSpec.java
2-
index bb8a4e8183..b9662fe6cd 100644
2+
index 6a64eb01f7..c994ac0c39 100644
33
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ConnectionSpec.java
44
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ConnectionSpec.java
5-
@@ -25,7 +25,7 @@ import java.io.OutputStream;
5+
@@ -25,6 +25,7 @@ import java.io.OutputStream;
66
import java.net.Inet4Address;
77
import java.net.ServerSocket;
88
import java.net.Socket;
9-
-import java.net.SocketException;
109
+import java.security.SecureRandom;
1110
import java.util.ArrayList;
1211
import java.util.List;
13-
import java.util.concurrent.ExecutionException;
14-
@@ -45,31 +45,39 @@ import org.openide.util.Pair;
12+
import java.util.concurrent.CopyOnWriteArrayList;
13+
@@ -45,31 +46,39 @@ import org.openide.util.Pair;
1514
"MSG_PortParseError=Cannot parse '{1}' as port in '{0}'"
1615
})
1716
final class ConnectionSpec implements Closeable {
@@ -20,7 +19,7 @@ index bb8a4e8183..b9662fe6cd 100644
2019
+ private final boolean hash;
2120
private final int port;
2221
// @GuardedBy (this)
23-
private final List<Closeable> close = new ArrayList<>();
22+
private final List<Closeable> close = new CopyOnWriteArrayList<>();
2423
// @GuardedBy (this)
2524
private final List<Closeable> closed = new ArrayList<>();
2625

@@ -55,7 +54,7 @@ index bb8a4e8183..b9662fe6cd 100644
5554

5655
}
5756
throw new CommandException(555, Bundle.MSG_ConnectionSpecError(spec));
58-
@@ -109,6 +117,21 @@ final class ConnectionSpec implements Closeable {
57+
@@ -109,6 +118,21 @@ final class ConnectionSpec implements Closeable {
5958
// listen on TCP
6059
ServerSocket server = new ServerSocket(port, 1, Inet4Address.getLoopbackAddress());
6160
close.add(server);
@@ -77,7 +76,7 @@ index bb8a4e8183..b9662fe6cd 100644
7776
int localPort = server.getLocalPort();
7877
Thread listeningThread = new Thread(prefix + " listening at port " + localPort) {
7978
@Override
80-
@@ -118,7 +141,7 @@ final class ConnectionSpec implements Closeable {
79+
@@ -118,7 +142,7 @@ final class ConnectionSpec implements Closeable {
8180
try {
8281
socket = server.accept();
8382
close.add(socket);
@@ -86,7 +85,7 @@ index bb8a4e8183..b9662fe6cd 100644
8685
} catch (IOException ex) {
8786
if (isClosed(server)) {
8887
break;
89-
@@ -130,25 +153,53 @@ final class ConnectionSpec implements Closeable {
88+
@@ -130,25 +154,53 @@ final class ConnectionSpec implements Closeable {
9089
};
9190
listeningThread.start();
9291
out.write((prefix + " listening at port " + localPort + "\n").getBytes());

patches/7893-draft.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ index 891bfa328d..ed80b903a5 100644
124124
+ boolean isJavaTemplate = "text/x-java".equals(FileUtil.getMIMEType(template));
125125
+ CompletionStage<String> userInput = client.showInputBox(new ShowInputBoxParams(Bundle.CTL_TemplateUI_SelectName(), desc.getProposedName()));
126126
+ if(isJavaTemplate) userInput = userInput.thenCompose(new ValidateJavaObjectName());
127-
+ return userInput.thenApply(name -> {return name != null ? builder.name(name) : null;});
127+
+ return userInput.thenApply(name -> {return name != null ? builder.name(name) : null;});
128128
}
129129
return CompletableFuture.completedFuture(builder);
130130
}

0 commit comments

Comments
 (0)