[jboss-svn-commits] JBL Code SVN: r6800 - labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/debug

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

Author: KrisVerlaenen
Date: 2006-10-13 19:34:51 -0400 (Fri, 13 Oct 2006)
New Revision: 6800

Modified:
   labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/debug/AgendaView.java
   labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/debug/DroolsDebugEventHandlerView.java
Log:
JBRULES-492: Debug views should remember if they are + or 1
 - agenda view now always expands first level elements
 - remembering expanded nodes
 - fixed an error when same working memory stayed selected (no refresh)

Modified: labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/debug/AgendaView.java
===================================================================
--- labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/debug/AgendaView.java	2006-10-13 21:58:46 UTC (rev 6799)
+++ labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/debug/AgendaView.java	2006-10-13 23:34:51 UTC (rev 6800)
@@ -10,7 +10,10 @@
 public class AgendaView extends DroolsDebugEventHandlerView {
 
     protected IContentProvider createContentProvider() {
-        AgendaViewContentProvider contentProvider = new AgendaViewContentProvider(this);
-        return contentProvider;
+        return new AgendaViewContentProvider(this);
     }
+    
+    protected int getAutoExpandLevel() {
+    	return 2;
+    }
 }

Modified: labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/debug/DroolsDebugEventHandlerView.java
===================================================================
--- labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/debug/DroolsDebugEventHandlerView.java	2006-10-13 21:58:46 UTC (rev 6799)
+++ labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/debug/DroolsDebugEventHandlerView.java	2006-10-13 23:34:51 UTC (rev 6800)
@@ -109,15 +109,15 @@
 			return;
 		}
 
-		if (current != null && current.equals(input)) {
-			return;
+		Object[] expandedElements = ((TreeViewer) getViewer()).getExpandedElements();
+		getViewer().setInput(input);
+		if (input != null) {
+			((TreeViewer) getViewer()).setExpandedElements(expandedElements);
+			((TreeViewer) getViewer()).expandToLevel(getAutoExpandLevel());
 		}
-		
-		showViewer();
-		getViewer().setInput(input);
     }
 
-    public Viewer createViewer(Composite parent) {
+    protected Viewer createViewer(Composite parent) {
 		TreeViewer variablesViewer = new TreeViewer(parent);
 		variablesViewer.setContentProvider(createContentProvider());
         variablesViewer.setLabelProvider(new VariablesViewLabelProvider(
@@ -128,6 +128,10 @@
 		return variablesViewer;
     }
     
+    protected int getAutoExpandLevel() {
+    	return 0;
+    }
+    
     protected abstract IContentProvider createContentProvider();
 
     protected String getHelpContextId() {