From b27b63cf81282cc7f16a157e842a7f1dd7e9aa3f Mon Sep 17 00:00:00 2001
From: Pawel Piech <pawel.piech@windriver.com>
Date: Tue, 24 Nov 2009 19:48:24 +0000
Subject: [PATCH] Bug 296014 - 'Add new expression' can end up in the middle of
 Expression list

---
 .../expression/ExpressionVMProviderModelProxyStrategy.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProviderModelProxyStrategy.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProviderModelProxyStrategy.java
index d6c779ef281..173d90d5c77 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProviderModelProxyStrategy.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/expression/ExpressionVMProviderModelProxyStrategy.java
@@ -155,7 +155,10 @@ public class ExpressionVMProviderModelProxyStrategy extends DefaultVMModelProxyS
     {
         switch (event.getType()) {
         case ADDED:
-            parentDelta.addNode(element, -1, IModelDelta.ADDED);            
+            // New expressions are always added one element before last.  
+            // Last element is the "Add new expression" element.
+            int parentCount = parentDelta.getChildCount();
+            parentDelta.addNode(element, parentCount > 1 ? parentCount - 2 : -1, IModelDelta.ADDED);            
             break;
         case CHANGED:
             parentDelta.setFlags(parentDelta.getFlags() | IModelDelta.CONTENT);