[jboss-svn-commits] JBL Code SVN: r26491 - labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/core.

[jboss-svn-commits at lists.jboss.org]

Author: mark.proctor at jboss.com
Date: 2009-05-13 00:46:39 -0400 (Wed, 13 May 2009)
New Revision: 26491

Modified:
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/core/DroolsStackFrame.java
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/core/MVELStackFrame.java
Log:
-jigged cache a little for more reliability.

Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/core/DroolsStackFrame.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/core/DroolsStackFrame.java	2009-05-13 04:26:48 UTC (rev 26490)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/core/DroolsStackFrame.java	2009-05-13 04:46:39 UTC (rev 26491)
@@ -82,21 +82,21 @@
             }
         }
         variables = (IVariable[]) result.toArray( new IVariable[result.size()] );
-        System.out.print( "vars" );
-        for ( IVariable var : variables ) {
-            System.out.print( var.getName()  + " " );
-        }
-        System.out.println( );        
+//        System.out.print( "vars" );
+//        for ( IVariable var : variables ) {
+//            System.out.print( var.getName()  + " " );
+//        }
+//        System.out.println( );        
         return variables;
     }
     
     public IJavaVariable[] getLocalVariables() throws DebugException {
         IJavaVariable[] localVars = super.getLocalVariables();
-        System.out.print( "local vars" );
-        for ( IJavaVariable var : localVars ) {
-            System.out.print( var.getName() + " " );
-        }
-        System.out.println( );
+//        System.out.print( "local vars" );
+//        for ( IJavaVariable var : localVars ) {
+//            System.out.print( var.getName() + " " );
+//        }
+//        System.out.println( );
         
         return localVars;
     }
@@ -127,9 +127,6 @@
     
     @Override
     public void stepOver() throws DebugException {
-        List frames = ((JDIThread) getThread()).computeStackFrames();
-        int index = frames.indexOf(this);
-        System.out.println( "frames " + frames.size() + " : " + index );
         super.stepOver();
     }
 

Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/core/MVELStackFrame.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/core/MVELStackFrame.java	2009-05-13 04:26:48 UTC (rev 26490)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/debug/core/MVELStackFrame.java	2009-05-13 04:46:39 UTC (rev 26491)
@@ -150,13 +150,6 @@
     }
     public int getLineNumber() throws DebugException {
         synchronized ( getThread() ) {
-        int i = x();
-        System.out.println( i );
-        return i;
-        }
-    }
-
-    private int x() throws DebugException {
             int cache = ctxCache.getCacheLineNumber();
             if ( cache != -1 ) {
                 return cache;
@@ -166,7 +159,6 @@
             String sourceName = getMVELName();
             DroolsLineBreakpoint bpoint = (DroolsLineBreakpoint) t.getDroolsBreakpoint( sourceName );
             if ( bpoint == null ) {
-                System.out.println( "1Unable to retrieve fragment line!" );
                 return -1;
             }
 
@@ -175,22 +167,18 @@
                 line = Integer.parseInt( bpoint.getFileRuleMappings().get( sourceName ).toString() );
             } catch ( Throwable t2 ) {
                 DroolsEclipsePlugin.log( t2 );
-                System.out.println( "2Unable to retrieve fragment line!" );
                 return -1;
             }
 
             int fragmentLine = getBreakpointLineNumber(); // 4->5 for step over
             int res = line + fragmentLine;
 
-            // System.out.println("Resolved line to line:"+line+"; fragment:"+fragmentLine);
-
             if ( fragmentLine == -1 ) {
-                System.out.println( "3Unable to retrieve fragment line!" );
                 return -1;
             }
             ctxCache.setCacheLineNumber( res );
             return res;
-        //}
+        }
     }
 
     private int getBreakpointLineNumber() {
@@ -242,14 +230,14 @@
 
     public String getMVELName() {
         synchronized ( getThread() ) {
-            if ( !isSuspended() ) {
-                return null;
-            }
-
             String cache = ctxCache.getCacheMVELName();
             if ( cache != null ) {
                 return cache;
             }
+            
+            if ( !isSuspended() ) {
+                return null;
+            }
 
             // Drools 4
             try {