This is an automated email from the ASF dual-hosted git repository.
tmysik 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 e10580d [NETBEANS-5228] Enable 'return' breakpoint in PHP debugger
new e5e861a Merge pull request #2659 from
KacerCZ/netbeans-5228-enable-return-breakpoint
e10580d is described below
commit e10580d58407a1728316183380f5bbde25d8d843
Author: Tomas Prochazka <[email protected]>
AuthorDate: Sat Jan 9 22:09:00 2021 +0100
[NETBEANS-5228] Enable 'return' breakpoint in PHP debugger
https://issues.apache.org/jira/browse/NETBEANS-5228
Enables support for breakpoint on return from function in PHP debugger.
Originally disabled in 2008 because of bug in Xdebug, the bug was fixed in
2009.
---
.../modules/php/dbgp/ui/DbgpMethodBreakpointPanel.form | 13 ++++---------
.../modules/php/dbgp/ui/DbgpMethodBreakpointPanel.java | 13 ++++---------
2 files changed, 8 insertions(+), 18 deletions(-)
diff --git
a/php/php.dbgp/src/org/netbeans/modules/php/dbgp/ui/DbgpMethodBreakpointPanel.form
b/php/php.dbgp/src/org/netbeans/modules/php/dbgp/ui/DbgpMethodBreakpointPanel.form
index 171019b..98c616a 100644
---
a/php/php.dbgp/src/org/netbeans/modules/php/dbgp/ui/DbgpMethodBreakpointPanel.form
+++
b/php/php.dbgp/src/org/netbeans/modules/php/dbgp/ui/DbgpMethodBreakpointPanel.form
@@ -53,16 +53,11 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
- <Group type="103" groupAlignment="1" attributes="0">
- <Group type="102" attributes="0">
- <Component id="myStopOnLbl" min="-2" max="-2"
attributes="0"/>
- <EmptySpace min="-2" pref="31" max="-2" attributes="0"/>
- </Group>
- <Group type="102" alignment="1" attributes="0">
- <Component id="myMethodLbl" min="-2" max="-2"
attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
- </Group>
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Component id="myMethodLbl" min="-2" max="-2"
attributes="0"/>
+ <Component id="myStopOnLbl" alignment="0" min="-2" max="-2"
attributes="0"/>
</Group>
+ <EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="myStopType" min="-2" max="-2" attributes="0"/>
<Component id="myMethodName" pref="189" max="32767"
attributes="0"/>
diff --git
a/php/php.dbgp/src/org/netbeans/modules/php/dbgp/ui/DbgpMethodBreakpointPanel.java
b/php/php.dbgp/src/org/netbeans/modules/php/dbgp/ui/DbgpMethodBreakpointPanel.java
index 841efb6..4299edf 100644
---
a/php/php.dbgp/src/org/netbeans/modules/php/dbgp/ui/DbgpMethodBreakpointPanel.java
+++
b/php/php.dbgp/src/org/netbeans/modules/php/dbgp/ui/DbgpMethodBreakpointPanel.java
@@ -41,8 +41,6 @@ public class DbgpMethodBreakpointPanel extends JPanel
implements Controller {
public DbgpMethodBreakpointPanel() {
initComponents();
- myStopOnLbl.setVisible(false);
- myStopType.setVisible(false);
}
@Override
@@ -106,13 +104,10 @@ public class DbgpMethodBreakpointPanel extends JPanel
implements Controller {
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addContainerGap()
-
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
- .addGroup(layout.createSequentialGroup()
- .addComponent(myStopOnLbl)
- .addGap(31, 31, 31))
- .addGroup(layout.createSequentialGroup()
- .addComponent(myMethodLbl)
-
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)))
+
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(myMethodLbl)
+ .addComponent(myStopOnLbl))
+
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(myStopType,
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(myMethodName,
javax.swing.GroupLayout.DEFAULT_SIZE, 189, Short.MAX_VALUE))
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
