(netbeans) branch master updated: Update to JGit 6.8 and Bouncy Castle 1.77
This is an automated email from the ASF dual-hosted git repository.
mbien 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 ea28c84d29 Update to JGit 6.8 and Bouncy Castle 1.77
new f5719ec986 Merge pull request #6887 from mbien/jgit680
ea28c84d29 is described below
commit ea28c84d2944687dee73168fc1e8f5e9f34fc241
Author: Michael Bien
AuthorDate: Wed Dec 27 21:08:43 2023 +0100
Update to JGit 6.8 and Bouncy Castle 1.77
- jgit 6.7 to 6.8
- bc 1.76 to 1.77
---
.../{bcpg-jdk18on-1.76-license.txt => bcpg-jdk18on-1.77-license.txt}| 2 +-
ide/bcpg/external/binaries-list | 2 +-
ide/bcpg/nbproject/project.properties | 2 +-
ide/bcpg/nbproject/project.xml | 2 +-
...{bcpkix-jdk18on-1.76-license.txt => bcpkix-jdk18on-1.77-license.txt} | 2 +-
ide/bcpkix/external/binaries-list | 2 +-
ide/bcpkix/nbproject/project.properties | 2 +-
ide/bcpkix/nbproject/project.xml| 2 +-
...{bcprov-jdk18on-1.76-license.txt => bcprov-jdk18on-1.77-license.txt} | 2 +-
ide/bcprov/external/binaries-list | 2 +-
ide/bcprov/nbproject/project.properties | 2 +-
ide/bcprov/nbproject/project.xml| 2 +-
...{bcutil-jdk18on-1.76-license.txt => bcutil-jdk18on-1.77-license.txt} | 2 +-
ide/bcutil/external/binaries-list | 2 +-
ide/bcutil/nbproject/project.properties | 2 +-
ide/bcutil/nbproject/project.xml| 2 +-
ide/o.eclipse.jgit.gpg.bc/external/binaries-list| 2 +-
...nse.txt => org.eclipse.jgit.gpg.bc-6.8.0.202311291450-r-license.txt} | 2 +-
ide/o.eclipse.jgit.gpg.bc/nbproject/project.properties | 2 +-
ide/o.eclipse.jgit.gpg.bc/nbproject/project.xml | 2 +-
ide/o.eclipse.jgit.lfs/external/binaries-list | 2 +-
.../external/org.eclipse.jgit.lfs-6.8.0.202311291450-r-license.txt} | 2 +-
ide/o.eclipse.jgit.lfs/nbproject/project.properties | 2 +-
ide/o.eclipse.jgit.lfs/nbproject/project.xml| 2 +-
ide/o.eclipse.jgit.ssh.jsch/external/binaries-list | 2 +-
.../org.eclipse.jgit.ssh.jsch-6.8.0.202311291450-r-license.txt} | 2 +-
ide/o.eclipse.jgit.ssh.jsch/nbproject/project.properties| 2 +-
ide/o.eclipse.jgit.ssh.jsch/nbproject/project.xml | 2 +-
ide/o.eclipse.jgit/external/binaries-list | 2 +-
...-r-license.txt => org.eclipse.jgit-6.8.0.202311291450-r-license.txt} | 2 +-
ide/o.eclipse.jgit/nbproject/project.properties | 2 +-
ide/o.eclipse.jgit/nbproject/project.xml| 2 +-
32 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/ide/bcpg/external/bcpg-jdk18on-1.76-license.txt
b/ide/bcpg/external/bcpg-jdk18on-1.77-license.txt
similarity index 98%
rename from ide/bcpg/external/bcpg-jdk18on-1.76-license.txt
rename to ide/bcpg/external/bcpg-jdk18on-1.77-license.txt
index 3dfa1d25cc..b83486e8c0 100644
--- a/ide/bcpg/external/bcpg-jdk18on-1.76-license.txt
+++ b/ide/bcpg/external/bcpg-jdk18on-1.77-license.txt
@@ -1,5 +1,5 @@
Name: Bouncy Castle Java OpenPGP/BCPG
-Version: 1.76
+Version: 1.77
License: MIT-bouncycastle
Origin: https://www.bouncycastle.org/latest_releases.html
Description: Legion of the Bouncy Castle Java cryptography APIs
diff --git a/ide/bcpg/external/binaries-list b/ide/bcpg/external/binaries-list
index c96cca50a6..ffaf541174 100644
--- a/ide/bcpg/external/binaries-list
+++ b/ide/bcpg/external/binaries-list
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-D5C23D0470261254D0E84DDE1D4237D228540298 org.bouncycastle:bcpg-jdk18on:1.76
+BB0BE51E8B378BAAE6E0D86F5282CD3887066539 org.bouncycastle:bcpg-jdk18on:1.77
diff --git a/ide/bcpg/nbproject/project.properties
b/ide/bcpg/nbproject/project.properties
index 56161ba129..5f7ec92ab2 100644
--- a/ide/bcpg/nbproject/project.properties
+++ b/ide/bcpg/nbproject/project.properties
@@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-release.external/bcpg-jdk18on-1.76.jar=modules/bcpg.jar
+release.external/bcpg-jdk18on-1.77.jar=modules/bcpg.jar
is.autoload=true
diff --git a/ide/bcpg/nbproject/project.xml b/ide/bcpg/nbproject/project.xml
index 53b6351772..c541a48d11 100644
--- a/ide/bcp
(netbeans) branch master updated: PHP: New way to set the current breakpoint
This is an automated email from the ASF dual-hosted git repository.
junichi11 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 b006691903 PHP: New way to set the current breakpoint
new a34e57050b Merge pull request #6891 from
troizet/php_improve_set_current_breakpoint
b006691903 is described below
commit b006691903e5d6188a9a176861782e12a305efb2
Author: Alexey Borokhvostov
AuthorDate: Thu Dec 28 00:36:44 2023 +0700
PHP: New way to set the current breakpoint
---
.../php/dbgp/breakpoints/BreakpointModel.java | 53 +++
.../php/dbgp/packets/FeatureGetCommand.java| 5 ++
.../php/dbgp/packets/FeatureSetResponse.java | 19 +++
.../modules/php/dbgp/packets/InitMessage.java | 5 ++
.../modules/php/dbgp/packets/MessageBuilder.java | 5 +-
.../modules/php/dbgp/packets/RunResponse.java | 60 ++
.../modules/php/dbgp/packets/StackGetResponse.java | 2 +-
7 files changed, 137 insertions(+), 12 deletions(-)
diff --git
a/php/php.dbgp/src/org/netbeans/modules/php/dbgp/breakpoints/BreakpointModel.java
b/php/php.dbgp/src/org/netbeans/modules/php/dbgp/breakpoints/BreakpointModel.java
index e147d393f8..2125444d93 100644
---
a/php/php.dbgp/src/org/netbeans/modules/php/dbgp/breakpoints/BreakpointModel.java
+++
b/php/php.dbgp/src/org/netbeans/modules/php/dbgp/breakpoints/BreakpointModel.java
@@ -54,6 +54,7 @@ public class BreakpointModel extends ViewModelSupport
implements NodeModel {
private static final String EXCEPTION = "TXT_Exception"; // NOI18N
private static final String PARENS = "()"; // NOI18N
private final Map myCurrentBreakpoints;
+private volatile boolean searchCurrentBreakpointById = false;
public BreakpointModel() {
myCurrentBreakpoints = new WeakHashMap<>();
@@ -179,21 +180,55 @@ public class BreakpointModel extends ViewModelSupport
implements NodeModel {
continue;
}
if (acceptor.accept(breakpoint)) {
-AbstractBreakpoint abpnt = (AbstractBreakpoint) breakpoint;
-synchronized (myCurrentBreakpoints) {
-AbstractBreakpoint bpnt =
myCurrentBreakpoints.get(session);
-myCurrentBreakpoints.put(session, abpnt);
-fireChangeEvents(new ModelEvent[]{
-new ModelEvent.NodeChanged(this, bpnt),
-new ModelEvent.NodeChanged(this, abpnt)
-});
-}
+updateCurrentBreakpoint(session, breakpoint);
return true;
}
}
return false;
}
+public void setCurrentBreakpoint(DebugSession session, String id) {
+Breakpoint[] breakpoints =
DebuggerManager.getDebuggerManager().getBreakpoints();
+for (Breakpoint breakpoint : breakpoints) {
+if (canSetCurrentBreakPoint(session, breakpoint, id)) {
+updateCurrentBreakpoint(session, breakpoint);
+break;
+}
+}
+}
+
+private boolean canSetCurrentBreakPoint(DebugSession session, Breakpoint
breakpoint, String id) {
+if (Utils.isValid(breakpoint) && breakpoint instanceof
AbstractBreakpoint) {
+AbstractBreakpoint abstractBreakpoint = (AbstractBreakpoint)
breakpoint;
+if (abstractBreakpoint.isSessionRelated(session)
+&& abstractBreakpoint.isEnabled()
+&& abstractBreakpoint.getBreakpointId().equals(id)) {
+return true;
+}
+}
+return false;
+}
+
+private void updateCurrentBreakpoint(DebugSession session, Breakpoint
breakpoint) {
+AbstractBreakpoint abpnt = (AbstractBreakpoint) breakpoint;
+synchronized (myCurrentBreakpoints) {
+AbstractBreakpoint bpnt = myCurrentBreakpoints.get(session);
+myCurrentBreakpoints.put(session, abpnt);
+fireChangeEvents(new ModelEvent[]{
+new ModelEvent.NodeChanged(this, bpnt),
+new ModelEvent.NodeChanged(this, abpnt)
+});
+}
+}
+
+public void setSearchCurrentBreakpointById(boolean flag) {
+searchCurrentBreakpointById = flag;
+}
+
+public boolean isSearchCurrentBreakpointById() {
+return searchCurrentBreakpointById;
+}
+
private interface Acceptor {
boolean accept(Breakpoint breakpoint);
diff --git
a/php/php.dbgp/src/org/netbeans/modules/php/dbgp/packets/FeatureGetCommand.java
b/php/php.dbgp/src/org/netbeans/modules/php/dbgp/packets/FeatureGetCommand.java
index a88c3f3daf..0fc28483c1 100644
---
a/php/php.dbgp/src/org/netbeans/modules/php/dbgp/packets/FeatureGetCommand.java
+++
b/php/php.dbgp/src/org/netbeans/modules/php/dbgp/packets/FeatureGetCommand.java
@@ -36,6 +36,7 @@ public
