← Back to branch summary

~ubuntu-branches/ubuntu/lucid/monodevelop/lucid

« back to all changes in this revision

Viewing changes to src/core/Mono.Debugging/Mono.Debugging.Client/ObjectValue.cs

  • Committer: Bazaar Package Importer
  • Author(s): Jo Shields
  • Date: 2010-02-02 11:39:59 UTC
  • mfrom: (1.2.6 upstream) (1.3.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100202113959-s4exdz7er7igylz2
Tags: 2.2.1+dfsg-1
* New upstream release
* debian/control:
  + Standards version 3.8.4 (no changes needed)
* debian/patches/remove_support_for_non_debian_functionality.patch,
  debian/patches/remove_support_for_soft_debugger.patch,
  debian/patches/remove_support_for_moonlight.patch,
  debian/rules:
  + Split patch into two pieces, to make it easier to enable either
    SDB or Moonlight support with a rebuild
* debian/monodevelop-moonlight.install,
  debian/monodevelop-debugger-sdb.install,
  debian/control:
  + Create packaging data for the Soft Debugger addin and Moonlight addin -
    and comment them out of debian/control as we can't provide them on
    Debian for now

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/Mono.Debugging/Mono.Debugging.Client/ObjectValue.cs
40
40
                string name;
41
41
                string value;
42
42
                string typeName;
 
43
                string displayValue;
43
44
                ObjectValueFlags flags;
44
45
                IObjectValueSource source;
45
46
                IObjectValueUpdater updater;
62
63
                
63
64
                public static ObjectValue CreateObject (IObjectValueSource source, ObjectPath path, string typeName, string value, ObjectValueFlags flags, ObjectValue[] children)
64
65
                {
 
66
                        return CreateObject (source, path, typeName, new EvaluationResult (value), flags, children);
 
67
                }
 
68
                
 
69
                public static ObjectValue CreateObject (IObjectValueSource source, ObjectPath path, string typeName, EvaluationResult value, ObjectValueFlags flags, ObjectValue[] children)
 
70
                {
65
71
                        ObjectValue ob = Create (source, path, typeName);
66
72
                        ob.path = path;
67
73
                        ob.flags = flags | ObjectValueFlags.Object;
68
 
                        ob.value = value;
 
74
                        ob.value = value.Value;
 
75
                        ob.displayValue = value.DisplayValue;
69
76
                        if (children != null) {
70
77
                                ob.children = new List<ObjectValue> ();
71
78
                                ob.children.AddRange (children);
81
88
                        return ob;
82
89
                }
83
90
                
84
 
                public static ObjectValue CreatePrimitive (IObjectValueSource source, ObjectPath path, string typeName, string value, ObjectValueFlags flags)
 
91
                public static ObjectValue CreatePrimitive (IObjectValueSource source, ObjectPath path, string typeName, EvaluationResult value, ObjectValueFlags flags)
85
92
                {
86
93
                        ObjectValue ob = Create (source, path, typeName);
87
94
                        ob.flags = flags | ObjectValueFlags.Primitive;
88
 
                        ob.value = value;
 
95
                        ob.value = value.Value;
 
96
                        ob.displayValue = value.DisplayValue;
89
97
                        return ob;
90
98
                }
91
99
                
176
184
                        set {
177
185
                                if (IsReadOnly || source == null)
178
186
                                        throw new InvalidOperationException ("Value is not editable");
179
 
                                this.value = source.SetValue (path, value);
 
187
                                EvaluationResult res = source.SetValue (path, value);
 
188
                                if (res != null) {
 
189
                                        this.value = res.Value;
 
190
                                        displayValue = res.DisplayValue;
 
191
                                }
180
192
                        }
181
193
                }
182
194
                
 
195
                public string DisplayValue {
 
196
                        get { return displayValue ?? Value; }
 
197
                        set { displayValue = value; }
 
198
                }
 
199
                
183
200
                public string TypeName {
184
201
                        get { return typeName; }
185
202
                        set { typeName = value; }
364
381
                                if (val.name != null)
365
382
                                        name = val.name;
366
383
                                value = val.value;
 
384
                                displayValue = val.displayValue;
367
385
                                typeName = val.typeName;
368
386
                                flags = val.flags;
369
387
                                source = val.source;