Author: lluis
Date: 2007-07-18 12:54:04 -0400 (Wed, 18 Jul 2007)
New Revision: 82227

Removed:
   
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Codons/FileTemplateCodon.cs
Modified:
   trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
   trunk/monodevelop/Core/src/MonoDevelop.Ide/Makefile.am
   
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Codons/ProjectTemplateCodon.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/FileTemplate.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectTemplate.cs
   trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml
   trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp
Log:
* MonoDevelop.Ide.Templates/FileTemplate.cs,
  MonoDevelop.Ide.Templates/ProjectTemplate.cs: Support reading
  templates from files, not only from resources.
* MonoDevelop.Ide.addin.xml: Removed use of FileTemplateCodon. Removed
  a bunch of obsolete attributes.
* MonoDevelop.Ide.mdp, Makefile.am,
  MonoDevelop.Ide.Codons/FileTemplateCodon.cs: Removed unused file.
* MonoDevelop.Ide.Codons/ProjectTemplateCodon.cs: Rewritten to support
  templates stored in files.

Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog        2007-07-18 
16:51:53 UTC (rev 82226)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog        2007-07-18 
16:54:04 UTC (rev 82227)
@@ -1,5 +1,17 @@
 2007-07-18  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
 
+       * MonoDevelop.Ide.Templates/FileTemplate.cs,
+         MonoDevelop.Ide.Templates/ProjectTemplate.cs: Support reading
+         templates from files, not only from resources.
+       * MonoDevelop.Ide.addin.xml: Removed use of FileTemplateCodon. Removed
+         a bunch of obsolete attributes.
+       * MonoDevelop.Ide.mdp, Makefile.am,
+         MonoDevelop.Ide.Codons/FileTemplateCodon.cs: Removed unused file.
+       * MonoDevelop.Ide.Codons/ProjectTemplateCodon.cs: Rewritten to support
+         templates stored in files.
+
+2007-07-18  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
+
        * MonoDevelop.Ide.Commands/TextEditorCommands.cs,
          MonoDevelop.Ide.addin.xml,
          MonoDevelop.Ide.Gui/ViewCommandHandlers.cs: Added new editor

Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/Makefile.am
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/Makefile.am      2007-07-18 
16:51:53 UTC (rev 82226)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/Makefile.am      2007-07-18 
16:54:04 UTC (rev 82227)
@@ -54,7 +54,6 @@
        MonoDevelop.Ide.Codons/CombineOpenCondition.cs \
        MonoDevelop.Ide.Codons/ContextPadCodon.cs \
        MonoDevelop.Ide.Codons/DisplayBindingCodon.cs \
-       MonoDevelop.Ide.Codons/FileTemplateCodon.cs \
        MonoDevelop.Ide.Codons/FileTemplateTypeCodon.cs \
        MonoDevelop.Ide.Codons/IDisplayBinding.cs \
        MonoDevelop.Ide.Codons/ISubDisplayBinding.cs \

Deleted: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Codons/FileTemplateCodon.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Codons/FileTemplateCodon.cs
      2007-07-18 16:51:53 UTC (rev 82226)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Codons/FileTemplateCodon.cs
      2007-07-18 16:54:04 UTC (rev 82227)
@@ -1,32 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Mike Krüger" email="[EMAIL PROTECTED]"/>
-//     <version value="$version"/>
-// </file>
-
-using System;
-using System.Collections;
-using System.Diagnostics;
-using System.ComponentModel;
-
-using Mono.Addins;
-
-namespace MonoDevelop.Ide.Codons
-{
-       [ExtensionNode (Description="A file template.")]
-       internal class FileTemplateCodon : ExtensionNode
-       {
-               [NodeAttribute("resource", true, "Resource name where the 
template is stored.")]
-               string resource;
-               
-               public string Resource {
-                       get {
-                               return resource;
-                       }
-                       set {
-                               resource = value;
-                       }
-               }
-       }
-}

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Codons/ProjectTemplateCodon.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Codons/ProjectTemplateCodon.cs
   2007-07-18 16:51:53 UTC (rev 82226)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Codons/ProjectTemplateCodon.cs
   2007-07-18 16:54:04 UTC (rev 82227)
@@ -1,14 +1,36 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Mike Krüger" email="[EMAIL PROTECTED]"/>
-//     <version value="$version"/>
-// </file>
+//
+// ProjectTemplateCodon.cs
+//
+// Author:
+//   Lluis Sanchez Gual
+//
 
+//
+// Copyright (C) 2007 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System;
-using System.Collections;
-using System.Diagnostics;
-using System.ComponentModel;
+using System.IO;
+using System.Xml;
 
 using Mono.Addins;
 
@@ -17,15 +39,29 @@
        [ExtensionNode (Description="A project template.")]
        internal class ProjectTemplateCodon : ExtensionNode
        {
-               [NodeAttribute("resource", true, "Name of the resource where 
the template is stored.")]
+               [NodeAttribute("resource", "Name of the resource where the 
template is stored.")]
                string resource;
                
-               public string Resource {
-                       get {
-                               return resource;
+               [NodeAttribute("file", "Name of the file where the template is 
stored.")]
+               string file;
+               
+               public XmlDocument GetTemplate ()
+               {
+                       Stream stream;
+                       if (file != null)
+                               stream = File.OpenRead (Addin.GetFilePath 
(file));
+                       else if (resource != null) {
+                               stream = Addin.GetResource (resource);
+                               if (stream == null)
+                                       throw new ApplicationException 
("Template " + resource + " not found");
                        }
-                       set {
-                               resource = value;
+                       else
+                               throw new InvalidOperationException ("Template 
file or resource not provided");
+                       
+                       using (stream) {
+                               XmlDocument doc = new XmlDocument();
+                               doc.Load(stream);
+                               return doc;
                        }
                }
        }

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/FileTemplate.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/FileTemplate.cs
        2007-07-18 16:51:53 UTC (rev 82226)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/FileTemplate.cs
        2007-07-18 16:54:04 UTC (rev 82227)
@@ -127,18 +127,9 @@
                        }
                }
                
-               static FileTemplate LoadFileTemplate (RuntimeAddin addin, 
string filename)
+               static FileTemplate LoadFileTemplate (RuntimeAddin addin, 
ProjectTemplateCodon codon)
                {
-                       Stream stream = addin.GetResource (filename);
-                       if (stream == null)
-                               throw new ApplicationException ("Template " + 
filename + " not found");
-
-                       XmlDocument doc = new XmlDocument();
-                       try {
-                               doc.Load(stream);
-                       } finally {
-                               stream.Close ();
-                       }
+                       XmlDocument doc = codon.GetTemplate ();
                        
                        XmlElement config = 
doc.DocumentElement["TemplateConfiguration"];
                        
@@ -161,12 +152,12 @@
                        if (config["_Name"] != null)
                                fileTemplate.name = GettextCatalog.GetString 
(config["_Name"].InnerText);
                        else
-                               throw new InvalidOperationException ("Missing 
element '_Name' in file template: " + filename);
+                               throw new InvalidOperationException ("Missing 
element '_Name' in file template: " + codon.Id);
                        
                        if (config["Category"] != null)
                                fileTemplate.category = 
config["Category"].InnerText;
                        else
-                               throw new InvalidOperationException ("Missing 
element 'Category' in file template: " + filename);
+                               throw new InvalidOperationException ("Missing 
element 'Category' in file template: " + codon.Id);
                        
                        if (config["LanguageName"] != null)
                                fileTemplate.languagename = 
config["LanguageName"].InnerText;
@@ -209,17 +200,17 @@
                static void OnExtensionChanged (object s, 
ExtensionNodeEventArgs args)
                {
                        if (args.Change == ExtensionChange.Add) {
-                               FileTemplateCodon codon = (FileTemplateCodon) 
args.ExtensionNode;
+                               ProjectTemplateCodon codon = 
(ProjectTemplateCodon) args.ExtensionNode;
                                try {
-                                       FileTemplate t = LoadFileTemplate 
(codon.Addin, codon.Resource);
+                                       FileTemplate t = LoadFileTemplate 
(codon.Addin, codon);
                                        t.id = codon.Id;
                                        fileTemplates.Add (t);
                                } catch (Exception e) {
-                                       Services.MessageService.ShowError (e, 
GettextCatalog.GetString ("Error loading template from resource {0}", 
codon.Resource));
+                                       Runtime.LoggingService.Fatal 
((object)GettextCatalog.GetString ("Error loading template: {0}", codon.Id), e);
                                }
                        }
                        else {
-                               FileTemplateCodon codon = (FileTemplateCodon) 
args.ExtensionNode;
+                               ProjectTemplateCodon codon = 
(ProjectTemplateCodon) args.ExtensionNode;
                                foreach (FileTemplate t in fileTemplates) {
                                        if (t.Id == codon.Id) {
                                                fileTemplates.Remove (t);

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectTemplate.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectTemplate.cs
     2007-07-18 16:51:53 UTC (rev 82226)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectTemplate.cs
     2007-07-18 16:54:04 UTC (rev 82227)
@@ -132,18 +132,9 @@
                }
 #endregion
                
-               protected ProjectTemplate (RuntimeAddin addin, string id, 
string fileName)
+               protected ProjectTemplate (RuntimeAddin addin, string id, 
ProjectTemplateCodon codon)
                {
-                       Stream stream = addin.GetResource (fileName);
-                       if (stream == null)
-                               throw new ApplicationException ("Template " + 
fileName + " not found");
-
-                       XmlDocument doc = new XmlDocument();
-                       try {
-                               doc.Load(stream);
-                       } finally {
-                               stream.Close ();
-                       }
+                       XmlDocument doc = codon.GetTemplate ();
                                                
                        XmlElement config = 
doc.DocumentElement["TemplateConfiguration"];
                        string category = config["Category"].InnerText;
@@ -173,7 +164,7 @@
                                                // per-language template 
instances should not share the XmlDocument
                                                ProjectTemplates.Add (new 
ProjectTemplate (addin, id, (XmlDocument) doc.Clone (), language, 
language+"/"+category));
                                        } catch (Exception e) {
-                                               
Services.MessageService.ShowError (e, GettextCatalog.GetString ("Error loading 
template from resource {0}", fileName));
+                                               Runtime.LoggingService.Fatal 
((object)GettextCatalog.GetString ("Error loading template {0}", codon.Id), e);
                                        }
                                }
                        } else {
@@ -285,9 +276,9 @@
                        if (args.Change == ExtensionChange.Add) {
                                ProjectTemplateCodon codon = 
(ProjectTemplateCodon) args.ExtensionNode;
                                try {
-                                       ProjectTemplates.Add (new 
ProjectTemplate (codon.Addin, codon.Id, codon.Resource));
+                                       ProjectTemplates.Add (new 
ProjectTemplate (codon.Addin, codon.Id, codon));
                                } catch (Exception e) {
-                                       Services.MessageService.ShowError (e, 
GettextCatalog.GetString ("Error loading template from resource {0}", 
codon.Resource));
+                                       Runtime.LoggingService.Fatal (e);
                                }
                        }
                        else {

Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml        
2007-07-18 16:51:53 UTC (rev 82226)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml        
2007-07-18 16:54:04 UTC (rev 82227)
@@ -148,7 +148,7 @@
        
        <ExtensionPoint path = "/MonoDevelop/FileTemplates" name = "File 
templates">
                <Description>File templates to be shown in the New File 
dialog.</Description>
-               <ExtensionNode name="FileTemplate" 
type="MonoDevelop.Ide.Codons.FileTemplateCodon"/>
+               <ExtensionNode name="FileTemplate" 
type="MonoDevelop.Ide.Codons.ProjectTemplateCodon"/>
        </ExtensionPoint>
        
        <ExtensionPoint path = "/MonoDevelop/FileTemplateTypes" name = "File 
template types">
@@ -190,7 +190,7 @@
                       class = "MonoDevelop.Ide.Gui.NavigationService"/>-->
        </Extension>
        
-       <Extension path = "/SharpDevelop/Workbench/DisplayBindings" 
extension-nodes="DisplayBinding" description="Display bindings.">
+       <Extension path = "/SharpDevelop/Workbench/DisplayBindings">
                <DisplayBinding id    = "DefaultDisplayBinding"
                                class = 
"MonoDevelop.Ide.Gui.DefaultDisplayBinding"/>
                <DisplayBinding id    = "Browser"
@@ -759,7 +759,7 @@
                </Category>
        </Extension>
        
-       <Extension path = 
"/SharpDevelop/Views/ProjectBrowser/ContextMenu/CombineBrowserNode" 
extension-nodes="CommandItem, SeparatorItem, ItemSet, LinkItem, 
LocalCommandItem" description="Context menu for solutions in the solution pad.">
+       <Extension path = 
"/SharpDevelop/Views/ProjectBrowser/ContextMenu/CombineBrowserNode">
                <CommandItem id = 
"MonoDevelop.Ide.Commands.ProjectCommands.Build" />
                <CommandItem id = 
"MonoDevelop.Ide.Commands.ProjectCommands.Rebuild" />
                <CommandItem id = 
"MonoDevelop.Ide.Commands.ProjectCommands.Clean" />
@@ -789,23 +789,23 @@
                <CommandItem id = 
"MonoDevelop.Ide.Commands.ProjectCommands.Options" />
        </Extension>
        
-       <Extension path = 
"/SharpDevelop/Views/ProjectBrowser/ContextMenu/ResourceFolderNode" 
extension-nodes="CommandItem, SeparatorItem, ItemSet, LinkItem, 
LocalCommandItem" description="Context menu for the resource folder in the 
solution pad.">
+       <Extension path = 
"/SharpDevelop/Views/ProjectBrowser/ContextMenu/ResourceFolderNode">
                <CommandItem id = 
"MonoDevelop.Ide.Commands.ProjectCommands.AddResource" />
        </Extension>
 
-       <Extension path = 
"/SharpDevelop/Views/ProjectBrowser/ContextMenu/ReferenceFolderNode" 
extension-nodes="CommandItem, SeparatorItem, ItemSet, LinkItem, 
LocalCommandItem" description="Context menu for the references folder in the 
solution pad.">
+       <Extension path = 
"/SharpDevelop/Views/ProjectBrowser/ContextMenu/ReferenceFolderNode">
                <CommandItem id = 
"MonoDevelop.Ide.Commands.ProjectCommands.AddReference" />
                <CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.Paste" 
/>
        </Extension>
        
-       <Extension path = 
"/SharpDevelop/Views/ProjectBrowser/ContextMenu/ReferenceNode" 
extension-nodes="CommandItem, SeparatorItem, ItemSet, LinkItem, 
LocalCommandItem" description="Context menu for a reference in the solution 
pad.">
+       <Extension path = 
"/SharpDevelop/Views/ProjectBrowser/ContextMenu/ReferenceNode">
                <CommandItem id = 
"MonoDevelop.Ide.Commands.ProjectCommands.LocalCopyReference" />
                <SeparatorItem id = "CopySeparator" />
                <CommandItem id = "MonoDevelop.Ide.Commands.EditCommands.Copy" 
/>
                <CommandItem id = 
"MonoDevelop.Ide.Commands.EditCommands.Delete" />
        </Extension>
         
-       <Extension path = 
"/SharpDevelop/Views/ProjectBrowser/ContextMenu/ProjectFileNode" 
extension-nodes="CommandItem, SeparatorItem, ItemSet, LinkItem, 
LocalCommandItem" description="Context menu for a project file in the solution 
pad.">
+       <Extension path = 
"/SharpDevelop/Views/ProjectBrowser/ContextMenu/ProjectFileNode">
                <CommandItem id = "MonoDevelop.Ide.Commands.ViewCommands.Open" 
/>
                <ItemSet id = "OpenWith" _label = "Open With">
                        <CommandItem id = 
"MonoDevelop.Ide.Commands.ViewCommands.OpenWithList" />
@@ -823,7 +823,7 @@
                <CommandItem id = 
"MonoDevelop.Ide.Commands.EditCommands.Rename" />
        </Extension>
                
-       <Extension path = 
"/SharpDevelop/Views/ProjectBrowser/ContextMenu/SystemFileNode"  
extension-nodes="CommandItem, SeparatorItem, ItemSet, LinkItem, 
LocalCommandItem" description="Context menu for a file (not belonging to a 
project) in the solution pad.">
+       <Extension path = 
"/SharpDevelop/Views/ProjectBrowser/ContextMenu/SystemFileNode">
                <CommandItem id = "MonoDevelop.Ide.Commands.ViewCommands.Open" 
/>
                <ItemSet id = "OpenWith" _label = "Open With">
                        <CommandItem id = 
"MonoDevelop.Ide.Commands.ViewCommands.OpenWithList" />
@@ -837,7 +837,7 @@
                <CommandItem id = 
"MonoDevelop.Ide.Commands.EditCommands.Rename" />
        </Extension>
 
-       <Extension path = 
"/SharpDevelop/Views/ProjectBrowser/ContextMenu/DefaultDirectoryNode"  
extension-nodes="CommandItem, SeparatorItem, ItemSet, LinkItem, 
LocalCommandItem" description="Context menu for a folder in the solution pad.">
+       <Extension path = 
"/SharpDevelop/Views/ProjectBrowser/ContextMenu/DefaultDirectoryNode">
                <ItemSet id = "Add" _label = "Add">
                        <CommandItem id = 
"MonoDevelop.Ide.Commands.ProjectCommands.AddNewFiles" />
                        <CommandItem id = 
"MonoDevelop.Ide.Commands.ProjectCommands.AddFiles" />
@@ -855,7 +855,7 @@
                <CommandItem id = 
"MonoDevelop.Ide.Commands.SearchCommands.FindInFiles" />
        </Extension>
 
-       <Extension path = 
"/SharpDevelop/Views/ProjectBrowser/ContextMenu/ProjectBrowserNode" 
extension-nodes="CommandItem, SeparatorItem, ItemSet, LinkItem, 
LocalCommandItem" description="Context menu for a project in the solution pad.">
+       <Extension path = 
"/SharpDevelop/Views/ProjectBrowser/ContextMenu/ProjectBrowserNode">
                <CommandItem id = 
"MonoDevelop.Ide.Commands.ProjectCommands.Build" />
                <CommandItem id = 
"MonoDevelop.Ide.Commands.ProjectCommands.Rebuild"/>
                <CommandItem id = 
"MonoDevelop.Ide.Commands.ProjectCommands.Clean" />
@@ -892,23 +892,23 @@
                <CommandItem id = 
"MonoDevelop.Ide.Commands.ProjectCommands.Options" />
        </Extension>
        
-       <Extension path = 
"/SharpDevelop/Views/ProjectBrowser/ContextMenu/UnknownEntryNode" 
extension-nodes="CommandItem, SeparatorItem, ItemSet, LinkItem, 
LocalCommandItem" description="Context menu for a project in the solution pad.">
+       <Extension path = 
"/SharpDevelop/Views/ProjectBrowser/ContextMenu/UnknownEntryNode">
                <CommandItem id = 
"MonoDevelop.Ide.Commands.ProjectCommands.Reload" />
                <CommandItem id = 
"MonoDevelop.Ide.Commands.EditCommands.Delete" />
        </Extension>
 
-       <!--<Extension path = "/SharpDevelop/Workbench/FileFilter" 
extension-nodes="FileFilter" description="File filters for the Open File 
dialog.">
+       <!--<Extension path = "/SharpDevelop/Workbench/FileFilter">
                <FileFilter id = "AllFiles"
                            _label = "All Files"
                            extensions = "*.*"/>
        </Extension>-->
        
-       <Extension path = "/MonoDevelop/TaskList/View" extension-nodes = 
"TaskListView">
+       <Extension path = "/MonoDevelop/TaskList/View">
                <TaskListView _label = "Comments" class = 
"MonoDevelop.Ide.Tasks.CommentTasksView" />
                <TaskListView _label = "User Tasks" class = 
"MonoDevelop.Ide.Tasks.UserTasksView" />
        </Extension>
        
-       <Extension path = "/SharpDevelop/Workbench/Pads" extension-nodes="Pad, 
SolutionPad" description="Pads shown in the workbench.">
+       <Extension path = "/SharpDevelop/Workbench/Pads">
                <Pad id = "MonoDevelop.Ide.Gui.Pads.FileScout" _label = "Files" 
class = "MonoDevelop.Ide.Gui.Pads.FileScout"/>
                <Pad id = "MonoDevelop.Ide.Gui.Pads.ErrorListPad" 
defaultPlacement = "Bottom" _label = "Error List" class = 
"MonoDevelop.Ide.Gui.Pads.ErrorListPad"/>
                <Pad id = "MonoDevelop.Ide.Gui.Pads.InternalLogPad" 
defaultPlacement = "Bottom" _label = "Message Log" class = 
"MonoDevelop.Ide.Gui.Pads.InternalLogPad"/>
@@ -974,7 +974,7 @@
                </WorkbenchContext>
        </Extension>
        
-       <Extension path = "/SharpDevelop/Dialogs/OptionsDialog" 
extension-nodes="DialogPanel" description="Dialog panels for global MonoDevelop 
options.">
+       <Extension path = "/SharpDevelop/Dialogs/OptionsDialog">
                <DialogPanel id    = "UIOptions"
                             _label = "MonoDevelop Preferences">
 <!--                   <DialogPanel id = "SelectCulture"
@@ -1035,7 +1035,7 @@
        
        <!-- Main Toolbar -->
        
-       <Extension path = "/SharpDevelop/Workbench/ToolBar"  
extension-nodes="CommandItem, SeparatorItem, ItemSet, LinkItem, 
LocalCommandItem" description="Main toolbar items">
+       <Extension path = "/SharpDevelop/Workbench/ToolBar">
                <ItemSet id = "Standard" _label = "Standard">
                        <CommandItem id = 
"MonoDevelop.Ide.Commands.FileCommands.NewFile" />
                        <CommandItem id = 
"MonoDevelop.Ide.Commands.FileCommands.OpenFile" />
@@ -1071,7 +1071,7 @@
 
        <!-- Main Menu -->
 
-       <Extension path = "/SharpDevelop/Workbench/MainMenu"  
extension-nodes="CommandItem, SeparatorItem, ItemSet, LinkItem, 
LocalCommandItem" description="Main menu items">
+       <Extension path = "/SharpDevelop/Workbench/MainMenu">
                <ItemSet id = "File" _label = "_File">
                        <CommandItem id = 
"MonoDevelop.Ide.Commands.FileCommands.NewFile" />
                        <CommandItem id = 
"MonoDevelop.Ide.Commands.FileCommands.NewProject" />
@@ -1222,7 +1222,7 @@
                </ItemSet>
        </Extension>
 
-       <Extension path = "/MonoDevelop/FileTemplates" 
extension-nodes="FileTemplate" description="File templates to be shown in the 
New File dialog.">
+       <Extension path = "/MonoDevelop/FileTemplates">
                <FileTemplate resource = "EmptyClass.xft.xml"/>
                <FileTemplate resource = "EmptyEnum.xft.xml"/>
                <FileTemplate resource = "EmptyInterface.xft.xml"/>
@@ -1234,19 +1234,19 @@
                <FileTemplate id = "EmptyXMLFile" resource = 
"EmptyXMLFile.xft.xml"/>
        </Extension>
 
-       <Extension path = "/MonoDevelop/FileTemplateTypes"  
extension-nodes="FileTemplateType" description="Template types which can be 
used to create file templates.">
+       <Extension path = "/MonoDevelop/FileTemplateTypes">
                <FileTemplateType name = "File" class = 
"MonoDevelop.Ide.Templates.TextFileDescriptionTemplate"/>
                <FileTemplateType name = "CodeDomFile" class = 
"MonoDevelop.Ide.Templates.CodeDomFileDescriptionTemplate"/>
                <FileTemplateType name = "ProjectResource" class = 
"MonoDevelop.Ide.Templates.ResourceFileDescriptionTemplate"/>
                <FileTemplateType name = "CodeTranslationFile" class = 
"MonoDevelop.Ide.Templates.CodeTranslationFileDescriptionTemplate"/>
        </Extension>
 
-       <Extension path = "/MonoDevelop/ProjectTemplates" 
extension-nodes="ProjectTemplate" description="Project templates to be shown in 
the New Project dialog.">
+       <Extension path = "/MonoDevelop/ProjectTemplates">
                <ProjectTemplate id = "MonoDevelop.BlankSolution" resource = 
"BlankCombine.xpt.xml"/>
                <ProjectTemplate id = "MonoDevelop.GenericProject" resource = 
"GenericProject.xpt.xml"/>
        </Extension>
        
-       <Extension path = "/MonoDevelop/Workbench/TextEditorExtensions" 
extension-nodes="Class" description="Extensions to the text editor. Classes 
must be a subclass of TextEditorExtension.">
+       <Extension path = "/MonoDevelop/Workbench/TextEditorExtensions">
                <Class id="InitialStep" class = 
"MonoDevelop.Ide.Gui.Content.TextEditorExtensionMarker" />
                <Class id="MidStep" class = 
"MonoDevelop.Ide.Gui.Content.TextEditorExtensionMarker" />
                <Class id="FinalStep" class = 
"MonoDevelop.Ide.Gui.Content.TextEditorExtensionMarker" />

Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp      
2007-07-18 16:51:53 UTC (rev 82226)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp      
2007-07-18 16:54:04 UTC (rev 82227)
@@ -198,7 +198,6 @@
     <File name="./MonoDevelop.Ide.Codons/DisplayBindingCodon.cs" 
subtype="Code" buildaction="Compile" />
     <File name="./MonoDevelop.Ide.Codons/IDisplayBinding.cs" subtype="Code" 
buildaction="Compile" />
     <File name="./MonoDevelop.Ide.Codons/ISubDisplayBinding.cs" subtype="Code" 
buildaction="Compile" />
-    <File name="./MonoDevelop.Ide.Codons/FileTemplateCodon.cs" subtype="Code" 
buildaction="Compile" />
     <File name="./MonoDevelop.Ide.Codons/FileTemplateTypeCodon.cs" 
subtype="Code" buildaction="Compile" />
     <File name="./MonoDevelop.Ide.Codons/ProjectTemplateCodon.cs" 
subtype="Code" buildaction="Compile" />
     <File name="./MonoDevelop.Ide.Codons/NodeBuilderCodon.cs" subtype="Code" 
buildaction="Compile" />

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to