From 7d9261861d96a6e7973fb2f364067438ec647d6b Mon Sep 17 00:00:00 2001
From: Randy Rohrbach <Randy.Rohrbach@Windriver.com>
Date: Thu, 12 Jul 2007 20:47:39 +0000
Subject: [PATCH] Bugzilla 196336

   RegisterBitFieldLayoutNode.java
   RegisterGroupLayoutNode.java
   RegisterLayoutNode.java
   VariableLocalsLayoutNode.java

Bugzilla 196373

   VariableLocalsLayoutNode.java

Bugzilla 196381

   VariableSubExpressionsLayoutNode.java

Also removed odds and ends comments and warnings in these files - general cleanup.
---
 .../register/RegisterBitFieldLayoutNode.java  |  2 +-
 .../register/RegisterGroupLayoutNode.java     |  9 ++++++
 .../register/RegisterLayoutNode.java          |  2 +-
 .../variable/VariableLocalsLayoutNode.java    | 17 ++++++-----
 .../VariableSubExpressionsLayoutNode.java     | 29 +++++++++++++------
 5 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterBitFieldLayoutNode.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterBitFieldLayoutNode.java
index ff4fbcac72e..ff4e6c98588 100644
--- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterBitFieldLayoutNode.java
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterBitFieldLayoutNode.java
@@ -313,7 +313,7 @@ public class RegisterBitFieldLayoutNode extends AbstractExpressionLayoutNode<IBi
                          * loops.
                          */
                         String[] localColumns = update.getPresentationContext().getColumns();
-                        if (localColumns == null) localColumns = new String[] { null };
+                        if (localColumns == null) localColumns = new String[] { IDebugVMConstants.COLUMN_ID__NAME };
                         
                         boolean weAreExtractingFormattedData = false;
                         
diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterGroupLayoutNode.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterGroupLayoutNode.java
index 39838e16ee2..bd98e1cbcf1 100644
--- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterGroupLayoutNode.java
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterGroupLayoutNode.java
@@ -200,6 +200,15 @@ public class RegisterGroupLayoutNode extends AbstractExpressionLayoutNode<IRegis
                 update.setLabel(dmData.getName(), idx);
             }
         }
+        else if ( columnId == null ) {
+            /*
+             *  If the Column ID comes in as "null" then this is the case where the user has decided
+             *  to not have any columns. So we need a default action which makes the most sense  and
+             *  is doable. In this case we elect to simply display the name.
+             */
+            update.setLabel(dmData.getName(), idx);
+            update.setImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_OBJS_REGISTER_GROUP), idx);
+        }
     }
     
     @Override
diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterLayoutNode.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterLayoutNode.java
index 75e500242cd..59722361120 100644
--- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterLayoutNode.java
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterLayoutNode.java
@@ -314,7 +314,7 @@ public class RegisterLayoutNode extends AbstractExpressionLayoutNode<IRegisterDM
                          * loops.
                          */
                         String[] localColumns = update.getPresentationContext().getColumns();
-                        if (localColumns == null) localColumns = new String[] { null };
+                        if (localColumns == null) localColumns = new String[] { IDebugVMConstants.COLUMN_ID__NAME }; 
                         
                         boolean weAreExtractingFormattedData = false;
                         
diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/variable/VariableLocalsLayoutNode.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/variable/VariableLocalsLayoutNode.java
index 0f966c84671..316e862dc90 100644
--- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/variable/VariableLocalsLayoutNode.java
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/variable/VariableLocalsLayoutNode.java
@@ -195,7 +195,7 @@ public class VariableLocalsLayoutNode extends AbstractExpressionLayoutNode<IExpr
 
                         String[] localColumns = update.getPresentationContext().getColumns();
                         if (localColumns == null)
-                            localColumns = new String[] { null };
+                            localColumns = new String[] { IDebugVMConstants.COLUMN_ID__NAME };
                         
                         boolean weAreExtractingFormattedData = false;
                         
@@ -370,6 +370,12 @@ public class VariableLocalsLayoutNode extends AbstractExpressionLayoutNode<IExpr
                         return;
                     }
                     
+                    if ( localsDMCs.length == 0 ) {
+                        // There are no locals so just complete the request
+                        update.done();
+                        return;
+                    }
+                    
                     // Create a List in which we store the DM data objects for the local variables.  This is
                     // necessary because there is no MultiDataRequestMonitor. :)
                     
@@ -440,9 +446,8 @@ public class VariableLocalsLayoutNode extends AbstractExpressionLayoutNode<IExpr
     protected int getNodeDeltaFlagsForDMEvent(IDMEvent<?> e) {
         if (e instanceof IRunControl.ISuspendedDMEvent) {
             return IModelDelta.CONTENT;
-            // } else if (e instanceof IRegisters.IRegisterChangedDMEvent) {
-            // return IModelDelta.STATE;
         }
+        
         return IModelDelta.NO_CHANGE;
     }
 
@@ -453,11 +458,7 @@ public class VariableLocalsLayoutNode extends AbstractExpressionLayoutNode<IExpr
             // Create a delta that the whole register group has changed.
             parent.addFlags(IModelDelta.CONTENT);
         }
-        // if (e instanceof IRegisters.IRegisterChangedDMEvent) {
-        // parent.addNode(new
-        // DMVMContext(((IRegisters.IRegisterChangedDMEvent)e).getDMContext()),
-        // IModelDelta.STATE);
-        // }
+
         super.buildDeltaForDMEvent(e, parent, nodeOffset, requestMonitor);
     }
 
diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/variable/VariableSubExpressionsLayoutNode.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/variable/VariableSubExpressionsLayoutNode.java
index 73f7c150f88..7331c7eac31 100644
--- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/variable/VariableSubExpressionsLayoutNode.java
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/variable/VariableSubExpressionsLayoutNode.java
@@ -42,6 +42,7 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta;
 @SuppressWarnings("restriction")
 public class VariableSubExpressionsLayoutNode extends AbstractDMVMLayoutNode<IExpressionDMData> {
     
+    @SuppressWarnings("unused")
     private SyncVariableDataAccess fSyncVariableDataAccess;
 
     public VariableSubExpressionsLayoutNode(AbstractVMProvider provider, DsfSession session, SyncVariableDataAccess syncVariableDataAccess) {
@@ -59,7 +60,6 @@ public class VariableSubExpressionsLayoutNode extends AbstractDMVMLayoutNode<IEx
     public IVMLayoutNode[] getChildLayoutNodes() {
         return fChildLayoutNodes;
     }
-
     
     /**
      * We override this method because we now need to perform an extra level of data fetch to get the
@@ -99,7 +99,7 @@ public class VariableSubExpressionsLayoutNode extends AbstractDMVMLayoutNode<IEx
 
                         String[] localColumns = update.getPresentationContext().getColumns();
                         if (localColumns == null)
-                            localColumns = new String[] { null };
+                            localColumns = new String[] { IDebugVMConstants.COLUMN_ID__NAME };
                         
                         boolean weAreExtractingFormattedData = false;
                         
@@ -130,7 +130,6 @@ public class VariableSubExpressionsLayoutNode extends AbstractDMVMLayoutNode<IEx
             );
         }
     }
-
     
     /**
      *  Private data access routine which performs the extra level of data access needed to
@@ -223,7 +222,6 @@ public class VariableSubExpressionsLayoutNode extends AbstractDMVMLayoutNode<IEx
         );
     }
     
-    
     @Override
     protected void updateElementsInSessionThread(final IChildrenUpdate update) {
         // Get the data model context object for the current node in the hierarchy.
@@ -287,9 +285,21 @@ public class VariableSubExpressionsLayoutNode extends AbstractDMVMLayoutNode<IEx
     protected int getNodeDeltaFlagsForDMEvent(IDMEvent<?> e) {
         if (e instanceof IRunControl.ISuspendedDMEvent) {
             return IModelDelta.CONTENT;
-//        } else if (e instanceof IRegisters.IExpressionsChangedDMEvent) {
-//            return IModelDelta.STATE;
         } 
+        else if (e instanceof IExpressions.IExpressionChangedDMEvent) {
+            /*
+             * Flush the cache.
+             */
+            VMCacheManager.getVMCacheManager().flush(super.getVMProvider().getPresentationContext());
+            
+            /*
+             *  Logically one would think that STATE should be specified here. But we specifiy CONTENT
+             *  as well so that if there sub expressions which are affected in some way ( such as with
+             *  an expanded union then they will show the changes also.
+             */
+            return IModelDelta.CONTENT | IModelDelta.STATE;
+        }
+        
         return IModelDelta.NO_CHANGE;
     }
 
@@ -299,9 +309,10 @@ public class VariableSubExpressionsLayoutNode extends AbstractDMVMLayoutNode<IEx
             // Create a delta that the whole register group has changed.
             parent.addFlags(IModelDelta.CONTENT);
         } 
-//        if (e instanceof IRegisters.IRegisterChangedDMEvent) {
-//            parent.addNode( new DMVMContext(((IRegisters.IRegisterChangedDMEvent)e).getDMContext()), IModelDelta.STATE );
-//        } 
+        else if (e instanceof IExpressions.IExpressionChangedDMEvent) {
+            parent.addNode( createVMContext(((IExpressions.IExpressionChangedDMEvent)e).getDMContext()), IModelDelta.CONTENT | IModelDelta.STATE );
+        }
+        
         super.buildDeltaForDMEvent(e, parent, nodeOffset, requestMonitor);
     }
 }