← Back to branch summary

~ubuntu-branches/ubuntu/trusty/monodevelop/trusty-proposed

« back to all changes in this revision

Viewing changes to src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/PolicySetNode.cs

  • Committer: Package Import Robot
  • Author(s): Jo Shields
  • Date: 2013-05-12 09:46:03 UTC
  • mto: This revision was merged to the branch mainline in revision 29.
  • Revision ID: package-import@ubuntu.com-20130512094603-mad323bzcxvmcam0
Tags: upstream-4.0.5+dfsg
Import upstream version 4.0.5+dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/MonoDevelop.Core/MonoDevelop.Projects.Extensions/PolicySetNode.cs
54
54
                {
55
55
                        PolicyResourceNode res = (PolicyResourceNode) node;
56
56
                        using (System.IO.StreamReader reader = res.GetStream ())
57
 
                                polSet.AddSerializedPolicies (reader);
 
57
                                res.AddedKeys = polSet.AddSerializedPolicies (reader);
58
58
                        base.OnChildNodeAdded (node);
59
59
                }
60
60
                
61
61
                protected override void OnChildNodeRemoved (ExtensionNode node)
62
62
                {
63
63
                        PolicyResourceNode res = (PolicyResourceNode) node;
64
 
                        using (System.IO.StreamReader reader = res.GetStream ())
65
 
                                polSet.RemoveSerializedPolicies (reader);
 
64
                        polSet.RemoveAll (res.AddedKeys);
66
65
                        base.OnChildNodeRemoved (node);
67
66
                }
68
67
                
75
74
                                        foreach (PolicyResourceNode res in ChildNodes) {
76
75
                                                try {
77
76
                                                using (System.IO.StreamReader reader = res.GetStream ())
78
 
                                                        polSet.AddSerializedPolicies (reader);
 
77
                                                        res.AddedKeys = polSet.AddSerializedPolicies (reader);
79
78
                                                } catch (Exception ex) {
80
79
                                                        MonoDevelop.Core.LoggingService.LogError ("Error deserialising policies for {0}@{1}:\n{2}", res.Addin, res.Path, ex);
81
80
                                                }