[jboss-svn-commits] JBL Code SVN: r26202 - in labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse: debug/core and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Apr 22 08:23:06 EDT 2009
Author: KrisVerlaenen
Date: 2009-04-22 08:23:05 -0400 (Wed, 22 Apr 2009)
New Revision: 26202
Modified:
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/ObjectWrapper.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/core/DroolsDebugTarget.java
labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/launching/DroolsVMDebugger.java
Log:
JBIDE-4164: Migrate Drools API debug
- added impl. for new Eclipse 3.5 methods
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/ObjectWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/ObjectWrapper.java 2009-04-22 11:36:50 UTC (rev 26201)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/ObjectWrapper.java 2009-04-22 12:23:05 UTC (rev 26202)
@@ -117,4 +117,8 @@
public long getUniqueId() throws DebugException {
return object.getUniqueId();
}
+
+ public boolean isNull() {
+ return false;
+ }
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/core/DroolsDebugTarget.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/core/DroolsDebugTarget.java 2009-04-22 11:36:50 UTC (rev 26201)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/core/DroolsDebugTarget.java 2009-04-22 12:23:05 UTC (rev 26202)
@@ -85,21 +85,25 @@
req.addClassFilter( "org.drools.base.mvel.MVELDebugHandler" );
req.setSuspendPolicy( EventRequest.SUSPEND_ALL );
- addJDIEventListener( new IJDIEventListener() {
+ addJDIEventListener(new IJDIEventListener() {
+ public boolean handleEvent(Event event, JDIDebugTarget target) {
+ addRemoteBreakpoint(d);
+ return true;
+ }
- public boolean handleEvent(Event event,
- JDIDebugTarget target) {
- addRemoteBreakpoint( d );
- return true;
- }
+ public void wonSuspendVote(Event event, JDIDebugTarget target) {
+ }
- public void wonSuspendVote(Event event,
- JDIDebugTarget target) {
- }
+ public void eventSetComplete(Event event, JDIDebugTarget target, boolean suspend) {
+ wonSuspendVote(event, target);
+ }
- },
- req );
+ public boolean handleEvent(Event event, JDIDebugTarget target, boolean suspendVote) {
+ return handleEvent(event, target);
+ }
+ }, req);
+
req.enable();
return;
}
@@ -277,14 +281,18 @@
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.jdt.internal.debug.core.IJDIEventListener#wonSuspendVote(com.sun.jdi.event.Event, org.eclipse.jdt.internal.debug.core.model.JDIDebugTarget)
- */
- public void wonSuspendVote(Event event,
- JDIDebugTarget target) {
+ public void wonSuspendVote(Event event, JDIDebugTarget target) {
// do nothing
}
+ public void eventSetComplete(Event event, JDIDebugTarget target, boolean suspend) {
+ wonSuspendVote(event, target);
+ }
+
+ public boolean handleEvent(Event event, JDIDebugTarget target, boolean suspendVote) {
+ return handleEvent(event, target);
+ }
+
}
class ThreadStartHandler
@@ -382,6 +390,15 @@
protected void setRequest(EventRequest request) {
fRequest = request;
}
+
+ public void eventSetComplete(Event event, JDIDebugTarget target, boolean suspend) {
+ wonSuspendVote(event, target);
+
+ }
+
+ public boolean handleEvent(Event event, JDIDebugTarget target, boolean suspendVote) {
+ return handleEvent(event, target);
+ }
}
private void disposeThreadHandler() {
@@ -679,55 +696,52 @@
EventRequest req= manager.createModificationWatchpointRequest(field);
*/
req.setSuspendPolicy( EventRequest.SUSPEND_EVENT_THREAD );
- addJDIEventListener( new IJDIEventListener() {
+ addJDIEventListener(new IJDIEventListener() {
- public boolean handleEvent(Event event,
- JDIDebugTarget target) {
- MethodEntryEvent entryEvent = (MethodEntryEvent) event;
+ public boolean handleEvent(Event event, JDIDebugTarget target) {
+ MethodEntryEvent entryEvent = (MethodEntryEvent) event;
+ String name2 = entryEvent.method().name();
+ if (!name2.equals("onBreak")
+ && !name2.equals("receiveBreakpoints")) {
+ // event.virtualMachine().resume();
+ return true;
+ }
+ try {
+ IThread[] tharr = getThreads();
+ ThreadReference t = null;
+ DroolsThread t2 = null;
+ for (int i = 0; i < tharr.length; i++) {
+ DroolsThread th2 = (DroolsThread) tharr[i];
+ ThreadReference th2real = ((DroolsThread) tharr[i]).getUnderlyingThread();
+ if (th2real.suspendCount() == 1 && th2.getName().equals("main")) {
+ t = th2real;
+ t2 = (DroolsThread) th2;
+ th2real.suspend();
+ th2.setRunning(false);
+ th2.fireSuspendEvent(DebugEvent.CLIENT_REQUEST);
+ return true;
+ }
+ }
+ } catch (Exception t) {
+ logError(t);
+ }
+ return true;
+ }
- String name2 = entryEvent.method().name();
+ public void wonSuspendVote(Event event, JDIDebugTarget target) {
+ // do nothing
+ }
- if ( !name2.equals( "onBreak" ) && !name2.equals( "receiveBreakpoints" ) ) {
- //event.virtualMachine().resume();
- return true;
- }
+ public void eventSetComplete(Event event, JDIDebugTarget target, boolean suspend) {
+ wonSuspendVote(event, target);
+ }
- try {
- IThread[] tharr = getThreads();
+ public boolean handleEvent(Event event, JDIDebugTarget target, boolean suspendVote) {
+ return handleEvent(event, target);
+ }
- ThreadReference t = null;
- DroolsThread t2 = null;
+ }, req);
- for ( int i = 0; i < tharr.length; i++ ) {
- DroolsThread th2 = (DroolsThread) tharr[i];
- ThreadReference th2real = ((DroolsThread) tharr[i]).getUnderlyingThread();
-
- if ( th2real.suspendCount() == 1 && th2.getName().equals( "main" ) ) {
- t = th2real;
- t2 = (DroolsThread) th2;
-
- th2real.suspend();
- th2.setRunning( false );
- th2.fireSuspendEvent( DebugEvent.CLIENT_REQUEST );
-
- return true;
- }
- }
- } catch ( Exception t ) {
- logError( t );
- }
- return true;
-
- }
-
- public void wonSuspendVote(Event event,
- JDIDebugTarget target) {
-
- }
-
- },
- req );
-
req.enable();
return true;
@@ -741,6 +755,14 @@
// do nothing
}
+ public void eventSetComplete(Event event, JDIDebugTarget target, boolean suspend) {
+ wonSuspendVote(event, target);
+ }
+
+ public boolean handleEvent(Event event, JDIDebugTarget target, boolean suspendVote) {
+ return handleEvent(event, target);
+ }
+
}
/**
Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/launching/DroolsVMDebugger.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/launching/DroolsVMDebugger.java 2009-04-22 11:36:50 UTC (rev 26201)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/launching/DroolsVMDebugger.java 2009-04-22 12:23:05 UTC (rev 26202)
@@ -25,6 +25,7 @@
import org.eclipse.jdt.internal.launching.LaunchingPlugin;
import org.eclipse.jdt.internal.launching.LibraryInfo;
import org.eclipse.jdt.internal.launching.StandardVMDebugger;
+import org.eclipse.jdt.internal.launching.StandardVMRunner;
import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
import org.eclipse.jdt.launching.IVMInstall;
import org.eclipse.jdt.launching.JavaRuntime;
@@ -178,7 +179,7 @@
}
IProcess process= newProcess(launch, p, renderProcessLabel(cmdLine), getDefaultProcessMap());
- process.setAttribute(IProcess.ATTR_CMDLINE, renderCommandLine(cmdLine));
+ process.setAttribute(IProcess.ATTR_CMDLINE, StandardVMRunner.renderCommandLine(cmdLine));
subMonitor.worked(1);
subMonitor.subTask(LaunchingMessages.StandardVMDebugger_Establishing_debug_connection____5);
boolean retry= false;
More information about the jboss-svn-commits
mailing list