Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,885 changes: 1,361 additions & 524 deletions THIRD_PARTY_LICENSES.txt

Large diffs are not rendered by default.

13 changes: 0 additions & 13 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,22 +48,10 @@
<string>
patches/6330.diff
patches/7610.diff
patches/8036-draft.diff
patches/8038-draft.diff
patches/8210.diff
patches/8237.diff
patches/8242.diff
patches/8245.diff
patches/8255.diff
patches/8260.diff
patches/8280.diff
patches/8289.diff
patches/8690.diff
patches/7893-draft.diff
patches/8442-draft.diff
patches/8460-draft.diff
patches/8470.diff
patches/8484.diff
patches/8745-draft.diff
patches/disable-error-notification.diff
patches/mvn-sh.diff
Expand All @@ -76,7 +64,6 @@
patches/dev-dependency-licenses.diff
patches/nb-telemetry.diff
patches/change-method-parameters-refactoring-qualified-names.diff
patches/javavscode-375.diff
</string>
<filterchain>
<tokenfilter delimoutput=" ">
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion netbeans
Submodule netbeans updated 5242 files
17 changes: 8 additions & 9 deletions patches/6330.diff
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
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
index bb8a4e8183..b9662fe6cd 100644
index 6a64eb01f7..c994ac0c39 100644
--- 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
@@ -25,7 +25,7 @@ import java.io.OutputStream;
@@ -25,6 +25,7 @@ import java.io.OutputStream;
import java.net.Inet4Address;
import java.net.ServerSocket;
import java.net.Socket;
-import java.net.SocketException;
+import java.security.SecureRandom;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutionException;
@@ -45,31 +45,39 @@ import org.openide.util.Pair;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -45,31 +46,39 @@ import org.openide.util.Pair;
"MSG_PortParseError=Cannot parse '{1}' as port in '{0}'"
})
final class ConnectionSpec implements Closeable {
Expand All @@ -20,7 +19,7 @@ index bb8a4e8183..b9662fe6cd 100644
+ private final boolean hash;
private final int port;
// @GuardedBy (this)
private final List<Closeable> close = new ArrayList<>();
private final List<Closeable> close = new CopyOnWriteArrayList<>();
// @GuardedBy (this)
private final List<Closeable> closed = new ArrayList<>();

Expand Down Expand Up @@ -55,7 +54,7 @@ index bb8a4e8183..b9662fe6cd 100644

}
throw new CommandException(555, Bundle.MSG_ConnectionSpecError(spec));
@@ -109,6 +117,21 @@ final class ConnectionSpec implements Closeable {
@@ -109,6 +118,21 @@ final class ConnectionSpec implements Closeable {
// listen on TCP
ServerSocket server = new ServerSocket(port, 1, Inet4Address.getLoopbackAddress());
close.add(server);
Expand All @@ -77,7 +76,7 @@ index bb8a4e8183..b9662fe6cd 100644
int localPort = server.getLocalPort();
Thread listeningThread = new Thread(prefix + " listening at port " + localPort) {
@Override
@@ -118,7 +141,7 @@ final class ConnectionSpec implements Closeable {
@@ -118,7 +142,7 @@ final class ConnectionSpec implements Closeable {
try {
socket = server.accept();
close.add(socket);
Expand All @@ -86,7 +85,7 @@ index bb8a4e8183..b9662fe6cd 100644
} catch (IOException ex) {
if (isClosed(server)) {
break;
@@ -130,25 +153,53 @@ final class ConnectionSpec implements Closeable {
@@ -130,25 +154,53 @@ final class ConnectionSpec implements Closeable {
};
listeningThread.start();
out.write((prefix + " listening at port " + localPort + "\n").getBytes());
Expand Down
2 changes: 1 addition & 1 deletion patches/7893-draft.diff
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ index 891bfa328d..ed80b903a5 100644
+ boolean isJavaTemplate = "text/x-java".equals(FileUtil.getMIMEType(template));
+ CompletionStage<String> userInput = client.showInputBox(new ShowInputBoxParams(Bundle.CTL_TemplateUI_SelectName(), desc.getProposedName()));
+ if(isJavaTemplate) userInput = userInput.thenCompose(new ValidateJavaObjectName());
+ return userInput.thenApply(name -> {return name != null ? builder.name(name) : null;});
+ return userInput.thenApply(name -> {return name != null ? builder.name(name) : null;});
}
return CompletableFuture.completedFuture(builder);
}
Expand Down
Loading