github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#1472] Add a Settings.executeDebugging property, and move server-side

Browse Source 
Console logic to core - Fixed wrong breakpoint ID comparisons
This commit is contained in:
Lukas Eder 2012-09-11 22:05:47 +02:00
parent 92b8bbd3e4
commit 7d3b83a97d
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jOOQ-console/src/main/java/org/jooq/debug/console/DebuggerPane.java
View File

@ -381,14 +381,18 @@ public class DebuggerPane extends JPanel {
void modifyBreakpoint(Breakpoint breakpoint) {
int childCount = rootNode.getChildCount();
for (int i = 0; i < childCount; i++) {
CheckBoxNode checkBoxNode = (CheckBoxNode) rootNode.getChildAt(i);
Breakpoint b = (Breakpoint) checkBoxNode.getUserObject();
if (b.getID() == breakpoint.getID()) {
if (b.equals(breakpoint)) {
checkBoxNode.setUserObject(breakpoint);
if (checkBoxNode.isSelected()) {
debugger.addBreakpoint(breakpoint);
}
break;
}
}

13
jOOQ-console/src/main/java/org/jooq/tools/debug/impl/ClientDebugger.java
View File

@ -111,7 +111,7 @@ class ClientDebugger implements Debugger {
}
for (int i = 0; i < breakpoints.length; i++) {
if (breakpoints[i].getID() == breakpoint.getID()) {
if (breakpoints[i].equals(breakpoint)) {
breakpoints[i] = breakpoint;
comm.asyncSend(new CMS_addBreakpoint(breakpoint));
return;
@ -130,14 +130,15 @@ class ClientDebugger implements Debugger {
@Override
public void removeBreakpoint(Breakpoint breakpoint) {
synchronized (BREAKPOINT_LOCK) {
if(this.breakpoints == null) {
if (this.breakpoints == null) {
return;
}
for(int i=0; i<breakpoints.length; i++) {
if(breakpoints[i].getID() == breakpoint.getID()) {
if(breakpoints.length == 1) {
for (int i = 0; i < breakpoints.length; i++) {
if (breakpoints[i].equals(breakpoint)) {
if (breakpoints.length == 1) {
breakpoints = null;
} else {
}
else {
Breakpoint[] newBreakpoints = new Breakpoint[breakpoints.length - 1];
System.arraycopy(breakpoints, 0, newBreakpoints, 0, i);
System.arraycopy(breakpoints, i + 1, newBreakpoints, i, newBreakpoints.length - i);

13
jOOQ-console/src/main/java/org/jooq/tools/debug/impl/LocalDebugger.java
View File

@ -106,7 +106,7 @@ class LocalDebugger implements Debugger {
}
for (int i = 0; i < breakpoints.length; i++) {
if (breakpoints[i].getID() == breakpoint.getID()) {
if (breakpoints[i].equals(breakpoint)) {
breakpoints[i] = breakpoint;
return;
}
@ -122,14 +122,15 @@ class LocalDebugger implements Debugger {
@Override
public void removeBreakpoint(Breakpoint breakpoint) {
synchronized (BREAKPOINT_LOCK) {
if(this.breakpoints == null) {
if (this.breakpoints == null) {
return;
}
for(int i=0; i<breakpoints.length; i++) {
if(breakpoints[i].getID() == breakpoint.getID()) {
if(breakpoints.length == 1) {
for (int i = 0; i < breakpoints.length; i++) {
if (breakpoints[i].equals(breakpoint)) {
if (breakpoints.length == 1) {
breakpoints = null;
} else {
}
else {
Breakpoint[] newBreakpoints = new Breakpoint[breakpoints.length - 1];
System.arraycopy(breakpoints, 0, newBreakpoints, 0, i);
System.arraycopy(breakpoints, i + 1, newBreakpoints, i, newBreakpoints.length - i);