~ubuntu-branches/ubuntu/oneiric/monodevelop/oneiric

« back to all changes in this revision

Viewing changes to src/core/MonoDevelop.Core/MonoDevelop.Core.Serialization/ClassDataType.cs

  • Committer: Bazaar Package Importer
  • Author(s): Jo Shields
  • Date: 2011-06-27 17:03:13 UTC
  • mto: (1.8.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 54.
  • Revision ID: james.westby@ubuntu.com-20110627170313-6cvz3s19x6e9hqe9
ImportĀ upstreamĀ versionĀ 2.5.92+dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
50
50
                
51
51
                protected override void Initialize ()
52
52
                {
53
 
                        DataItemAttribute atd = (DataItemAttribute) Context.AttributeProvider.GetCustomAttribute (ValueType, typeof(DataItemAttribute), false);
 
53
                        IDataItemAttribute atd = (IDataItemAttribute) Context.AttributeProvider.GetCustomAttribute (ValueType, typeof(IDataItemAttribute), false);
54
54
                        if (atd != null) {
55
55
                                if (!string.IsNullOrEmpty (atd.Name)) {
56
56
                                        Name = atd.Name;
316
316
                                object val = prop.GetValue (obj);
317
317
                                if (val == null)
318
318
                                        continue;
319
 
                                if (!serCtx.Serializer.IncludeDefaultValues && val.Equals (prop.DefaultValue))
 
319
                                if (!serCtx.IsDefaultValueSerializationForced (prop) && val.Equals (prop.DefaultValue))
320
320
                                        continue;
321
321
                                
322
322
                                DataCollection col = itemCol;