← Back to branch summary

~ubuntu-branches/ubuntu/raring/monodevelop/raring

« back to all changes in this revision

Viewing changes to src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/DirectoryTemplate.cs

  • Committer: Bazaar Package Importer
  • Author(s): Andrew Mitchell
  • Date: 2011-06-29 06:56:25 UTC
  • mfrom: (1.8.1 upstream) (1.3.11 experimental)
  • Revision ID: james.westby@ubuntu.com-20110629065625-7xx19c4vb95j65pl
Tags: 2.5.92+dfsg-1ubuntu1
* Merge from Debian experimental:
 - Dropped patches & changes to debian/control for Moonlight
   + debian/patches/remove_support_for_moonlight.patch,
   + debian/patches/dont_add_moonlight_to_core_addins.patch,
 - Remaining patches:
   + debian/patches/no_appmenu:

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/DirectoryTemplate.cs
44
44
                        get { return dirName; } 
45
45
                }
46
46
                
47
 
                public override void Load (System.Xml.XmlElement filenode)
 
47
                public override void Load (XmlElement filenode, FilePath baseDirectory)
48
48
                {
49
49
                        dirName = filenode.GetAttribute ("name");
50
50
                        if (string.IsNullOrEmpty (dirName) || !FileService.IsValidFileName (dirName))
54
54
                                if (!(node is XmlElement))
55
55
                                        continue;
56
56
                                
57
 
                                FileDescriptionTemplate t = FileDescriptionTemplate.CreateTemplate ((XmlElement)node);
 
57
                                FileDescriptionTemplate t = FileDescriptionTemplate.CreateTemplate ((XmlElement)node, baseDirectory);
58
58
                                if (t == null)
59
59
                                        throw new InvalidOperationException ("Invalid file template in directory template");
60
60