[cdt-patch] Use 'equals' to compare variables instead of names

["Mikhail Khodjaiants" <mikhailk@xxxxxxx>]

Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.core/ChangeLog,v
retrieving revision 1.109
diff -u -r1.109 ChangeLog
--- ChangeLog 27 Jan 2003 16:16:11 -0000 1.109
+++ ChangeLog 27 Jan 2003 18:30:17 -0000
@@ -1,3 +1,7 @@
+2003-01-27 Mikhail Khodjaiants
+ Use 'equals' to compare CDI variables instead of names.
+ * CStackFrame.java
+
 2003-01-27 Alain Magloire
 
  * src/org/eclipse/cdt/debug/core/cdi/model/ICDIVariableObject.java:

Index: CStackFrame.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java,v
retrieving revision 1.14
diff -u -r1.14 CStackFrame.java
--- CStackFrame.java 10 Jan 2003 19:36:42 -0000 1.14
+++ CStackFrame.java 27 Jan 2003 18:30:35 -0000
@@ -130,11 +130,6 @@
    ICDIVariable var = findVariable( locals, local.getCDIVariable() );
    if ( var != null )
    {
-    // update variable with new underling CDI LocalVariable
-    if ( !var.equals( local.getCDIVariable() ) )
-    {
-     local.setCDIVariable( var );
-    }
     locals.remove( var );
     index++;
    }
@@ -718,21 +713,14 @@
   }
  }
  
- // temporary solution
  protected ICDIVariable findVariable( List list, ICDIVariable var )
  {
   Iterator it = list.iterator();
   while( it.hasNext() )
   {
    ICDIVariable newVar = (ICDIVariable)it.next();
-   try
-   {
-    if ( newVar.getName().equals( var.getName() ) )
-     return newVar;
-   }
-   catch( CDIException e )
-   {
-   }
+   if ( newVar.equals( var ) )
+    return newVar;
   }
   return null;
  }