Author: lluis
Date: 2007-05-04 09:47:20 -0400 (Fri, 04 May 2007)
New Revision: 76699
Modified:
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/ChangeLog
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/Makefile.am
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Codons/EditActionCodon.cs
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorBuffer.cs
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorDisplayBinding.cs
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorView.cs
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.addin.xml
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.mdp
Log:
* MonoDevelop.SourceEditor.Gui/SourceEditorBuffer.cs,
MonoDevelop.SourceEditor.Gui/SourceEditorView.cs,
MonoDevelop.SourceEditor.Gui/SourceEditorDisplayBinding.cs,
MonoDevelop.SourceEditor.Codons/EditActionCodon.cs, Makefile.am,
MonoDevelop.SourceEditor.addin.xml, MonoDevelop.SourceEditor.mdp:
Migration to Mono.Addins.
Modified: trunk/monodevelop/Extras/MonoDevelop.SourceEditor/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/MonoDevelop.SourceEditor/ChangeLog 2007-05-04
13:47:03 UTC (rev 76698)
+++ trunk/monodevelop/Extras/MonoDevelop.SourceEditor/ChangeLog 2007-05-04
13:47:20 UTC (rev 76699)
@@ -1,3 +1,12 @@
+2007-05-04 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * MonoDevelop.SourceEditor.Gui/SourceEditorBuffer.cs,
+ MonoDevelop.SourceEditor.Gui/SourceEditorView.cs,
+ MonoDevelop.SourceEditor.Gui/SourceEditorDisplayBinding.cs,
+ MonoDevelop.SourceEditor.Codons/EditActionCodon.cs, Makefile.am,
+ MonoDevelop.SourceEditor.addin.xml, MonoDevelop.SourceEditor.mdp:
+ Migration to Mono.Addins.
+
2007-03-03 James Fitzsimons <[EMAIL PROTECTED]>
* MonoDevelop.SourceEditor.Gui/SourceEditorDisplayBinding.cs: Added new
Modified: trunk/monodevelop/Extras/MonoDevelop.SourceEditor/Makefile.am
===================================================================
--- trunk/monodevelop/Extras/MonoDevelop.SourceEditor/Makefile.am
2007-05-04 13:47:03 UTC (rev 76698)
+++ trunk/monodevelop/Extras/MonoDevelop.SourceEditor/Makefile.am
2007-05-04 13:47:20 UTC (rev 76699)
@@ -49,6 +49,7 @@
-r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.dll \
-r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.Gui.dll \
-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+ -r:$(top_builddir)/contrib/Mono.Addins.dll \
-r:Mono.Cairo \
-r:System \
-r:System.Drawing \
Modified:
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Codons/EditActionCodon.cs
===================================================================
---
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Codons/EditActionCodon.cs
2007-05-04 13:47:03 UTC (rev 76698)
+++
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Codons/EditActionCodon.cs
2007-05-04 13:47:20 UTC (rev 76699)
@@ -10,19 +10,18 @@
using System.Reflection;
using System.ComponentModel;
-using MonoDevelop.Core.AddIns;
+using Mono.Addins;
using MonoDevelop.Core.Properties;
using MonoDevelop.Core.Gui.Components;
using MonoDevelop.SourceEditor.Actions;
namespace MonoDevelop.SourceEditor.Codons
{
- [CodonNameAttribute("EditAction")]
[Description ("A custom editor action. The provided class must
implement IEditAction.")]
- public class EditActionCodon : ClassCodon
+ public class EditActionCodon : TypeExtensionNode
{
[Description ("Key combinations that trigger the edit action
(for example Control|k).")]
- [XmlMemberArrayAttribute("keys", IsRequired=true)]
+ [NodeAttribute("keys", true)]
string[] keys = null;
public string[] Keys {
@@ -34,12 +33,9 @@
/// Creates an item with the specified sub items. And the
current
/// Condition status for this item.
/// </summary>
- public override object BuildItem (object owner, ArrayList
subItems, ConditionCollection conditions)
+ public override object CreateInstance ()
{
- if (subItems.Count > 0)
- throw new ApplicationException ("more than one
level of edit actions don't make sense!");
-
- IEditAction editAction = (IEditAction)
AddIn.CreateObject (Class);
+ IEditAction editAction = (IEditAction)
base.CreateInstance ();
if (editAction == null)
return null;
Modified:
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorBuffer.cs
===================================================================
---
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorBuffer.cs
2007-05-04 13:47:03 UTC (rev 76698)
+++
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorBuffer.cs
2007-05-04 13:47:20 UTC (rev 76699)
@@ -5,7 +5,7 @@
using MonoDevelop.Ide.Gui.Content;
using MonoDevelop.Core;
using MonoDevelop.Core.Properties;
-using MonoDevelop.Core.AddIns;
+using Mono.Addins;
using MonoDevelop.Projects;
using MonoDevelop.Projects.Parser;
using MonoDevelop.Projects.Text;
Modified:
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorDisplayBinding.cs
===================================================================
---
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorDisplayBinding.cs
2007-05-04 13:47:03 UTC (rev 76698)
+++
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorDisplayBinding.cs
2007-05-04 13:47:20 UTC (rev 76699)
@@ -11,7 +11,7 @@
using MonoDevelop.Projects;
using MonoDevelop.Projects.Gui.Completion;
using MonoDevelop.Core.Properties;
-using MonoDevelop.Core.AddIns;
+using Mono.Addins;
using MonoDevelop.Core;
using MonoDevelop.Core.Gui.Utils;
using MonoDevelop.SourceEditor.Properties;
@@ -773,31 +773,15 @@
public void InitializeFormatter()
{
- string ext = Path.GetExtension (ContentName).ToUpper ();
+ string ext = Path.GetExtension (ContentName).ToLower ();
if (ext.Length > 0) {
- string path;
- switch (ext) {
- case ".CS":
- path =
"/AddIns/DefaultTextEditor/Formatter/C#";
- break;
- case ".VB":
- path =
"/AddIns/DefaultTextEditor/Formatter/VBNET";
- break;
- default:
- // we fall back to the
uppercase extension without the .
- // ex. BOO, XML
- path = String.Format
("/AddIns/DefaultTextEditor/Formatter/{0}", ext.Substring (1));
- break;
+ string id = ext.Substring (1);
+ TypeExtensionNode node =
AddinManager.GetExtensionNode ("/AddIns/DefaultTextEditor/Formatters/" + id) as
TypeExtensionNode;
+ if (node != null) {
+ se.View.fmtr = (IFormattingStrategy)
node.CreateInstance (typeof(IFormattingStrategy));
+ return;
}
-
- if (AddInTreeSingleton.AddInTree.TreeNodeExists
(path)) {
- IFormattingStrategy[] formatter =
(IFormattingStrategy[])(AddInTreeSingleton.AddInTree.GetTreeNode(path).BuildChildItems(this)).ToArray(typeof(IFormattingStrategy));
- if (formatter != null &&
formatter.Length > 0) {
- se.View.fmtr = formatter[0];
- return;
- }
- }
}
// if the above specific formatter is not found
Modified:
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorView.cs
===================================================================
---
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorView.cs
2007-05-04 13:47:03 UTC (rev 76698)
+++
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.Gui/SourceEditorView.cs
2007-05-04 13:47:20 UTC (rev 76699)
@@ -10,7 +10,7 @@
using MonoDevelop.Components.Commands;
using MonoDevelop.Core;
-using MonoDevelop.Core.AddIns;
+using Mono.Addins;
using MonoDevelop.Core.Gui;
using MonoDevelop.Core.Gui.Utils;
using MonoDevelop.Ide.CodeTemplates;
@@ -226,13 +226,9 @@
void LoadEditActions ()
{
string editactionsPath =
"/AddIns/DefaultTextEditor/EditActions";
- if (AddInTreeSingleton.AddInTree.TreeNodeExists
(editactionsPath)) {
- IEditAction[] actions = (IEditAction[])
(AddInTreeSingleton.AddInTree.GetTreeNode (editactionsPath).BuildChildItems
(this)).ToArray (typeof(IEditAction));
- foreach (IEditAction action in actions)
- editactions.Add (action);
- } else {
- Console.WriteLine
("/AddIns/DefaultTextEditor/EditActions addin path not found");
- }
+ IEditAction[] actions = (IEditAction[])
AddinManager.GetExtensionObjects (editactionsPath, typeof(IEditAction));
+ foreach (IEditAction action in actions)
+ editactions.Add (action);
}
protected override bool OnFocusOutEvent (EventFocus e)
Modified:
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.addin.xml
===================================================================
---
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.addin.xml
2007-05-04 13:47:03 UTC (rev 76698)
+++
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.addin.xml
2007-05-04 13:47:20 UTC (rev 76699)
@@ -1,4 +1,5 @@
-<AddIn id = "MonoDevelop.SourceEditor"
+<Addin id = "SourceEditor"
+ namespace = "MonoDevelop"
name = "MonoDevelop Text Editor"
author = "Ben Maurer, Lluis Sanchez, Todd Berman"
copyright = ""
@@ -14,13 +15,33 @@
</Runtime>
<Dependencies>
- <AddIn id="MonoDevelop.Core" version="0.13.0"/>
- <AddIn id="MonoDevelop.Core.Gui" version="0.13.0"/>
- <AddIn id="MonoDevelop.Projects" version="0.13.0"/>
- <AddIn id="MonoDevelop.Projects.Gui" version="0.13.0"/>
- <AddIn id="MonoDevelop.Ide" version="0.13.0"/>
+ <Addin id="Core" version="0.13.0"/>
+ <Addin id="Core.Gui" version="0.13.0"/>
+ <Addin id="Projects" version="0.13.0"/>
+ <Addin id="Projects.Gui" version="0.13.0"/>
+ <Addin id="Ide" version="0.13.0"/>
</Dependencies>
+
+ <!-- Extension points -->
+ <ExtensionPoint path =
"/SharpDevelop/ViewContent/DefaultTextEditor/ContextMenu" name = "Editor
context menu">
+ <Description>Context menu for the editor.</Description>
+ <ExtensionNodeSet id="MonoDevelop.Core.Gui.ItemSet" />
+ </ExtensionPoint>
+
+ <ExtensionPoint path = "/AddIns/DefaultTextEditor/EditActions" name =
"Custom edit actions">
+ <Description>Custom edit actions for the editor.</Description>
+ <ExtensionNode name="EditAction"
type="MonoDevelop.SourceEditor.Codons.EditActionCodon"/>
+ </ExtensionPoint>
+
+ <ExtensionPoint path = "/AddIns/DefaultTextEditor/Formatters" name =
"Formatters">
+ <Description>Custom edit actions for the editor.</Description>
+ <ExtensionNode name="Class" />
+ </ExtensionPoint>
+
+
+ <!-- Extensions -->
+
<Extension path = "/Workspace/Services">
<Class id = "SourceViewService"
class="MonoDevelop.SourceEditor.SourceViewService" />
</Extension>
@@ -78,7 +99,7 @@
shortcut = "Shift|Control|P" />
</Extension>
- <Extension path =
"/SharpDevelop/ViewContent/DefaultTextEditor/ContextMenu"
extension-nodes="CommandItem, SeparatorItem, ItemSet, LinkItem,
LocalCommandItem" description="Context menu for the editor">
+ <Extension path =
"/SharpDevelop/ViewContent/DefaultTextEditor/ContextMenu">
<CommandItem id =
"MonoDevelop.Ide.Commands.RefactoryCommands.CurrentRefactoryOperations" />
<CommandItem id = "MonoDevelop.Ide.Commands.FileCommands.Save"
/>
<CommandItem id =
"MonoDevelop.Ide.Commands.FileCommands.SaveAs" />
@@ -108,29 +129,27 @@
</Extension>
- <Extension path = "/SharpDevelop/Workbench/MainMenu">
- <ItemSet id = "Search" insertafter ="View" insertbefore
="Tools" _label = "_Search">
- <CommandItem id =
"MonoDevelop.Ide.Commands.SearchCommands.Find" />
- <CommandItem id =
"MonoDevelop.Ide.Commands.SearchCommands.FindPrevious" />
- <CommandItem id =
"MonoDevelop.Ide.Commands.SearchCommands.FindNext" />
- <CommandItem id =
"MonoDevelop.Ide.Commands.SearchCommands.FindNextSelection" />
- <CommandItem id =
"MonoDevelop.Ide.Commands.SearchCommands.Replace" />
+ <Extension path = "/SharpDevelop/Workbench/MainMenu/Search">
+ <CommandItem id =
"MonoDevelop.Ide.Commands.SearchCommands.Find" />
+ <CommandItem id =
"MonoDevelop.Ide.Commands.SearchCommands.FindPrevious" />
+ <CommandItem id =
"MonoDevelop.Ide.Commands.SearchCommands.FindNext" />
+ <CommandItem id =
"MonoDevelop.Ide.Commands.SearchCommands.FindNextSelection" />
+ <CommandItem id =
"MonoDevelop.Ide.Commands.SearchCommands.Replace" />
+
+ <SeparatorItem id = "SearchSeparator" />
+ <CommandItem id =
"MonoDevelop.Ide.Commands.SearchCommands.FindInFiles" />
+ <CommandItem id =
"MonoDevelop.Ide.Commands.SearchCommands.ReplaceInFiles" />
- <SeparatorItem id = "SearchSeparator" />
- <CommandItem id =
"MonoDevelop.Ide.Commands.SearchCommands.FindInFiles" />
- <CommandItem id =
"MonoDevelop.Ide.Commands.SearchCommands.ReplaceInFiles" />
-
- <SeparatorItem id = "SearchInFilesSeparator" />
- <CommandItem id =
"MonoDevelop.SourceEditor.EditorCommands.ToggleBookmark" />
- <CommandItem id =
"MonoDevelop.SourceEditor.EditorCommands.PrevBookmark" />
- <CommandItem id =
"MonoDevelop.SourceEditor.EditorCommands.NextBookmark" />
- <CommandItem id =
"MonoDevelop.SourceEditor.EditorCommands.ClearBookmarks" />
+ <SeparatorItem id = "SearchInFilesSeparator" />
+ <CommandItem id =
"MonoDevelop.SourceEditor.EditorCommands.ToggleBookmark" />
+ <CommandItem id =
"MonoDevelop.SourceEditor.EditorCommands.PrevBookmark" />
+ <CommandItem id =
"MonoDevelop.SourceEditor.EditorCommands.NextBookmark" />
+ <CommandItem id =
"MonoDevelop.SourceEditor.EditorCommands.ClearBookmarks" />
- <SeparatorItem id = "Separator2" />
- <CommandItem id =
"MonoDevelop.SourceEditor.EditorCommands.GotoLineNumber" />
- <SeparatorItem id = "Separator3" />
- <CommandItem id =
"MonoDevelop.SourceEditor.EditorCommands.GotoMatchingBrace" />
- </ItemSet>
+ <SeparatorItem id = "Separator2" />
+ <CommandItem id =
"MonoDevelop.SourceEditor.EditorCommands.GotoLineNumber" />
+ <SeparatorItem id = "Separator3" />
+ <CommandItem id =
"MonoDevelop.SourceEditor.EditorCommands.GotoMatchingBrace" />
</Extension>
<Extension path = "/SharpDevelop/Workbench/MainMenu/File">
@@ -147,21 +166,6 @@
insertafter =
"MonoDevelop.Ide.Commands.FileCommands.SaveAll" />
</Extension>
- <Extension path =
"/SharpDevelop/ViewContent/DefaultTextEditor/OptionsDialog">
- <DialogPanel id = "General"
- _label = "General"
- class =
"MonoDevelop.SourceEditor.Gui.OptionPanels.GeneralTextEditorPanel"/>
- <DialogPanel id = "Markers"
- _label = "Markers and Rulers"
- class =
"MonoDevelop.SourceEditor.Gui.OptionPanels.MarkersTextEditorPanel"/>
- <DialogPanel id = "Behavior"
- _label = "Behavior"
- class =
"MonoDevelop.SourceEditor.Gui.OptionPanels.BehaviorTextEditorPanel"/>
- <DialogPanel id = "SyntaxHighlighting"
- _label = "Syntax Highlighting"
- class =
"MonoDevelop.SourceEditor.Gui.OptionPanels.SyntaxHighlightingPanel"/>
- </Extension>
-
<Extension path = "/SharpDevelop/Dialogs/OptionsDialog">
<DialogPanel id = "TextEditorOptions"
insertafter = "CodingOptions"
@@ -203,4 +207,4 @@
class =
"MonoDevelop.SourceEditor.Gui.SourceEditorDisplayBinding" />
</Extension>
-</AddIn>
+</Addin>
Modified:
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.mdp
===================================================================
---
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.mdp
2007-05-04 13:47:03 UTC (rev 76698)
+++
trunk/monodevelop/Extras/MonoDevelop.SourceEditor/MonoDevelop.SourceEditor.mdp
2007-05-04 13:47:20 UTC (rev 76699)
@@ -61,6 +61,7 @@
<ProjectReference type="Gac" localcopy="True" refto="System.Drawing,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<ProjectReference type="Gac" localcopy="True" refto="System.Xml,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<ProjectReference type="Gac" localcopy="True" refto="gconf-sharp-peditors,
Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <ProjectReference type="Assembly" localcopy="True"
refto="../../contrib/Mono.Addins.dll" />
<ProjectReference type="Gac" localcopy="True" refto="glib-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<ProjectReference type="Gac" localcopy="True" refto="pango-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<ProjectReference type="Gac" localcopy="True" refto="atk-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
@@ -83,4 +84,4 @@
<DeploymentInformation strategy="File">
<excludeFiles />
</DeploymentInformation>
-</Project>
+</Project>
\ No newline at end of file
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
