Author: lluis
Date: 2007-05-04 09:46:40 -0400 (Fri, 04 May 2007)
New Revision: 76697
Modified:
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/ChangeLog
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/Makefile.am
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.addin.xml
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.mdp
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/CodeBehindService.cs
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/DesignerSupportService.cs
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxService.cs
Log:
* MonoDevelop.DesignerSupport.addin.xml,
MonoDevelop.DesignerSupport.mdp,
MonoDevelop.DesignerSupport/DesignerSupportService.cs,
MonoDevelop.DesignerSupport/CodeBehindService.cs,
MonoDevelop.DesignerSupport/ToolboxService.cs, Makefile.am:
Migration to Mono.Addins.
Modified: trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/ChangeLog
2007-05-04 13:46:18 UTC (rev 76696)
+++ trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/ChangeLog
2007-05-04 13:46:40 UTC (rev 76697)
@@ -1,3 +1,12 @@
+2007-05-04 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * MonoDevelop.DesignerSupport.addin.xml,
+ MonoDevelop.DesignerSupport.mdp,
+ MonoDevelop.DesignerSupport/DesignerSupportService.cs,
+ MonoDevelop.DesignerSupport/CodeBehindService.cs,
+ MonoDevelop.DesignerSupport/ToolboxService.cs, Makefile.am:
+ Migration to Mono.Addins.
+
2007-04-19 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoDevelop.DesignerSupport.addin.xml,
Modified: trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/Makefile.am
===================================================================
--- trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/Makefile.am
2007-05-04 13:46:18 UTC (rev 76696)
+++ trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/Makefile.am
2007-05-04 13:46:40 UTC (rev 76697)
@@ -9,6 +9,7 @@
-r:$(top_builddir)/build/AddIns/MonoDevelop.Ide.dll \
-r:$(top_builddir)/build/AddIns/MonoDevelop.Projects.dll \
-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+ -r:$(top_builddir)/contrib/Mono.Addins.dll \
-r:System \
-r:System.Design \
-r:System.Drawing \
Modified:
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/CodeBehindService.cs
===================================================================
---
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/CodeBehindService.cs
2007-05-04 13:46:18 UTC (rev 76696)
+++
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/CodeBehindService.cs
2007-05-04 13:46:40 UTC (rev 76697)
@@ -33,7 +33,7 @@
using System.Collections.Generic;
using MonoDevelop.Core;
-using MonoDevelop.Core.AddIns;
+using Mono.Addins;
using MonoDevelop.DesignerSupport.CodeBehind;
using MonoDevelop.Projects;
using MonoDevelop.Projects.Parser;
@@ -55,7 +55,7 @@
internal CodeBehindService ()
{
- Runtime.AddInService.RegisterExtensionItemListener
(codeBehindProviderPath, OnProviderExtensionChanged);
+ AddinManager.AddExtensionNodeHandler
(codeBehindProviderPath, OnProviderExtensionChanged);
}
internal void Initialise ()
@@ -70,16 +70,16 @@
IdeApp.ProjectOperations.ParserDatabase.ClassInformationChanged +=
onClassInformationChanged;
}
- void OnProviderExtensionChanged (ExtensionAction action, object
item)
+ void OnProviderExtensionChanged (object s,
ExtensionNodeEventArgs args)
{
- if (item == null)
+ if (args.ExtensionObject == null)
throw new Exception ("One of the
CodeBehindProvider extension classes is missing");
- if (action == ExtensionAction.Add)
- providers.Add ((ICodeBehindProvider) item);
+ if (args.Change == ExtensionChange.Add)
+ providers.Add ((ICodeBehindProvider)
args.ExtensionObject);
- if (action == ExtensionAction.Remove)
- providers.Remove ((ICodeBehindProvider) item);
+ if (args.Change == ExtensionChange.Remove)
+ providers.Remove ((ICodeBehindProvider)
args.ExtensionObject);
if (IdeApp.ProjectOperations != null &&
IdeApp.ProjectOperations.CurrentOpenCombine != null) {
CombineEventArgs rootCombineArgs = new
CombineEventArgs (IdeApp.ProjectOperations.CurrentOpenCombine);
@@ -93,7 +93,7 @@
~CodeBehindService ()
{
- Runtime.AddInService.UnregisterExtensionItemListener
(codeBehindProviderPath, OnProviderExtensionChanged);
+ AddinManager.RemoveExtensionNodeHandler
(codeBehindProviderPath, OnProviderExtensionChanged);
IdeApp.ProjectOperations.FileAddedToProject -=
onFileEvent;
IdeApp.ProjectOperations.FileChangedInProject -=
onFileEvent;
@@ -157,11 +157,13 @@
codeBehindBindings[update.Key] = newCB;
- if ( !(oldCB is NotFoundClass))
- CodeBehindClassUpdated (oldCB);
-
- if ( !(newCB is NotFoundClass))
- CodeBehindClassUpdated (newCB);
+ if (CodeBehindClassUpdated != null) {
+ if ( !(oldCB is NotFoundClass))
+ CodeBehindClassUpdated (oldCB);
+
+ if ( !(newCB is NotFoundClass))
+ CodeBehindClassUpdated (newCB);
+ }
}
}
@@ -237,12 +239,14 @@
}
this.codeBehindBindings[file] = newCodeBehind;
- CodeBehindClassUpdated (newCodeBehind);
+ if (CodeBehindClassUpdated != null)
+ CodeBehindClassUpdated (newCodeBehind);
}
- CodeBehindFileUpdated (file);
+ if (CodeBehindFileUpdated != null)
+ CodeBehindFileUpdated (file);
- if (oldCodeBehind != null)
+ if (oldCodeBehind != null && CodeBehindClassUpdated !=
null)
CodeBehindClassUpdated (oldCodeBehind);
}
Modified:
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/DesignerSupportService.cs
===================================================================
---
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/DesignerSupportService.cs
2007-05-04 13:46:18 UTC (rev 76696)
+++
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/DesignerSupportService.cs
2007-05-04 13:46:40 UTC (rev 76697)
@@ -38,6 +38,7 @@
using MonoDevelop.Ide.Gui;
using MonoDevelop.Core;
using MonoDevelop.DesignerSupport.PropertyGrid;
+using Mono.Addins;
namespace MonoDevelop.DesignerSupport
{
@@ -144,7 +145,7 @@
internal object[] GetPropertyProvidersForObject (object obj,
object firstProvider)
{
if (providers == null)
- providers = (IPropertyProvider[])
Runtime.AddInService.GetTreeItems
("/MonoDevelop/DesignerSupport/PropertyProviders", typeof(IPropertyProvider));
+ providers = (IPropertyProvider[])
AddinManager.GetExtensionObjects
("/MonoDevelop/DesignerSupport/PropertyProviders", typeof(IPropertyProvider),
true);
ArrayList list = new ArrayList ();
if (firstProvider != null)
@@ -197,7 +198,7 @@
base.InitializeService ();
codeBehindService.Initialise ();
IdeApp.CommandService.CommandManager.RegisterCommandTargetVisitor (new
PropertyPadVisitor ());
- Runtime.AddInService.ExtensionChanged +=
OnExtensionChanged;
+ AddinManager.ExtensionChanged += OnExtensionChanged;
}
public override void UnloadService()
@@ -206,9 +207,9 @@
toolboxService.SaveUserToolbox
(System.IO.Path.Combine (Runtime.Properties.ConfigDirectory, "Toolbox.xml"));
}
- void OnExtensionChanged (string path)
+ void OnExtensionChanged (object s, ExtensionEventArgs args)
{
- if (path.StartsWith
("MonoDevelop/DesignerSupport/PropertyProviders")) {
+ if (args.PathChanged
("MonoDevelop/DesignerSupport/PropertyProviders")) {
providers = null;
ResetPropertyPad ();
}
Modified:
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxService.cs
===================================================================
---
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxService.cs
2007-05-04 13:46:18 UTC (rev 76696)
+++
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxService.cs
2007-05-04 13:46:40 UTC (rev 76697)
@@ -41,7 +41,7 @@
using MonoDevelop.Ide.Gui;
using MonoDevelop.Core;
-using MonoDevelop.Core.AddIns;
+using Mono.Addins;
using MonoDevelop.Projects.Serialization;
using MonoDevelop.DesignerSupport.Toolbox;
@@ -66,38 +66,38 @@
internal ToolboxService ()
{
IdeApp.Workbench.ActiveDocumentChanged += new
EventHandler (onActiveDocChanged);
- Runtime.AddInService.RegisterExtensionItemListener
(toolboxLoaderPath, OnLoaderExtensionChanged);
- Runtime.AddInService.RegisterExtensionItemListener
(toolboxProviderPath, OnProviderExtensionChanged);
+ AddinManager.AddExtensionNodeHandler
(toolboxLoaderPath, OnLoaderExtensionChanged);
+ AddinManager.AddExtensionNodeHandler
(toolboxProviderPath, OnProviderExtensionChanged);
}
#region Extension loading
- void OnLoaderExtensionChanged (ExtensionAction action, object
item)
+ void OnLoaderExtensionChanged (object s, ExtensionNodeEventArgs
args)
{
- if (action == ExtensionAction.Add)
- loaders.Add ((IToolboxLoader) item);
- else if (action == ExtensionAction.Remove)
- loaders.Remove ((IToolboxLoader) item);
+ if (args.Change == ExtensionChange.Add)
+ loaders.Add ((IToolboxLoader)
args.ExtensionObject);
+ else if (args.Change == ExtensionChange.Remove)
+ loaders.Remove ((IToolboxLoader)
args.ExtensionObject);
}
- void OnProviderExtensionChanged (ExtensionAction action, object
item)
+ void OnProviderExtensionChanged (object s,
ExtensionNodeEventArgs args)
{
- if (action == ExtensionAction.Add) {
- IToolboxDynamicProvider dyProv = item as
IToolboxDynamicProvider;
+ if (args.Change == ExtensionChange.Add) {
+ IToolboxDynamicProvider dyProv =
args.ExtensionObject as IToolboxDynamicProvider;
if (dyProv != null) {
- dynamicProviders.Add
((IToolboxDynamicProvider) item);
+ dynamicProviders.Add
((IToolboxDynamicProvider) args.ExtensionObject);
dyProv.ItemsChanged +=
OnProviderItemsChanged;
}
- IToolboxDefaultProvider defProv = item as
IToolboxDefaultProvider;
+ IToolboxDefaultProvider defProv =
args.ExtensionObject as IToolboxDefaultProvider;
if (defProv!= null) {
IList<ItemToolboxNode> newItems =
defProv.GetItems ();
if (newItems != null)
defaultItems.AddRange
(newItems);
}
}
- else if (action == ExtensionAction.Remove) {
- IToolboxDynamicProvider dyProv = item as
IToolboxDynamicProvider;
+ else if (args.Change == ExtensionChange.Remove) {
+ IToolboxDynamicProvider dyProv =
args.ExtensionObject as IToolboxDynamicProvider;
if (dyProv != null) {
dyProv.ItemsChanged -=
OnProviderItemsChanged;
dynamicProviders.Remove (dyProv);
@@ -160,8 +160,8 @@
~ToolboxService ()
{
- Runtime.AddInService.UnregisterExtensionItemListener
(toolboxLoaderPath, OnLoaderExtensionChanged);
- Runtime.AddInService.UnregisterExtensionItemListener
(toolboxProviderPath, OnLoaderExtensionChanged);
+ AddinManager.RemoveExtensionNodeHandler
(toolboxLoaderPath, OnLoaderExtensionChanged);
+ AddinManager.RemoveExtensionNodeHandler
(toolboxProviderPath, OnLoaderExtensionChanged);
}
#endregion
Modified:
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.addin.xml
===================================================================
---
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.addin.xml
2007-05-04 13:46:18 UTC (rev 76696)
+++
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.addin.xml
2007-05-04 13:46:40 UTC (rev 76697)
@@ -1,4 +1,5 @@
-<AddIn id = "MonoDevelop.DesignerSupport"
+<Addin id = "DesignerSupport"
+ namespace = "MonoDevelop"
name = "Visual Designer Support"
author = "Michael Hutchinson"
copyright = "MIT X11"
@@ -12,29 +13,46 @@
</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="MonoDevelop.SourceEditor" 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"/>
+ <Addin id="SourceEditor" version="0.13.0"/>
</Dependencies>
+
+ <!-- Extension points -->
+ <ExtensionPoint path = "/MonoDevelop/DesignerSupport/ToolboxProviders"
name = "Toolbox item providers">
+ <Description>Provides items to the toolbox. Must implement
MonoDevelop.DesignerSupport.Toolbox.IToolboxDefaultProvider and/or
IToolboxDynamicProvider</Description>
+ <ExtensionNode name="Class" />
+ </ExtensionPoint>
+
+ <ExtensionPoint path = "/MonoDevelop/DesignerSupport/ToolboxLoaders"
name = "Toolbox loaders">
+ <Description>Used to load ItemToolboxNodesToolbox into the
Toolbox</Description>
+ <ExtensionNode name="Class" />
+ </ExtensionPoint>
+
+ <ExtensionPoint path =
"/MonoDevelop/DesignerSupport/CodeBehindProviders" name = "Code-behind
providers">
+ <Description>Used to load bind CodeBehind files to their
associated files.</Description>
+ <ExtensionNode name="Class" />
+ </ExtensionPoint>
+
+ <ExtensionPoint path = "/MonoDevelop/DesignerSupport/PropertyProviders"
name = "Providers for the property grid">
+ <ExtensionNode name="Class" />
+ </ExtensionPoint>
+
+ <!-- Extensions -->
+
<Extension path = "/Workspace/Services">
<Class id = "DesignerSupportService"
class =
"MonoDevelop.DesignerSupport.DesignerSupportService"/>
</Extension>
- <Extension path = "/MonoDevelop/DesignerSupport/ToolboxLoaders"
extension-nodes="Class" description="Used to load ItemToolboxNodesToolbox into
the Toolbox.">
+ <Extension path = "/MonoDevelop/DesignerSupport/ToolboxLoaders">
<Class id="ToolboxItemLoader"
class="MonoDevelop.DesignerSupport.Toolbox.ToolboxItemToolboxLoader"/>
</Extension>
- <Extension path = "/MonoDevelop/DesignerSupport/CodeBehindProviders"
extension-nodes="Class" description="Used to load bind CodeBehind files to
their associated files.">
- </Extension>
-
- <Extension path = "/MonoDevelop/DesignerSupport/ToolboxProviders"
extension-nodes="Class" description="Provides items to the toolbox. Must
implement MonoDevelop.DesignerSupport.Toolbox.IToolboxDefaultProvider and/or
IToolboxDynamicProvider.">
- </Extension>
-
<Extension path = "/MonoDevelop/DesignerSupport/PropertyProviders"
extension-nodes="Class">
<Class class =
"MonoDevelop.DesignerSupport.Projects.ProjectsPropertyProvider"/>
</Extension>
@@ -72,7 +90,7 @@
<Extension path = "/SharpDevelop/Workbench/StockIcons">
<StockIcon stockid = "md-design-categorise" resource =
"group-by-category.png" />
</Extension>
-
+
<Extension path =
"/SharpDevelop/Workbench/Pads/MonoDevelop.Ide.Gui.Pads.ProjectPad">
<NodeBuilder class =
"MonoDevelop.DesignerSupport.Projects.ComponentNodeBuilder"/>
</Extension>
@@ -80,5 +98,4 @@
<Extension path =
"/SharpDevelop/Workbench/Pads/MonoDevelop.Ide.Gui.Pads.ClassPad">
<NodeBuilder class =
"MonoDevelop.DesignerSupport.Projects.ComponentNodeBuilder"/>
</Extension>
-
-</AddIn>
+</Addin>
Modified:
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.mdp
===================================================================
---
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.mdp
2007-05-04 13:46:18 UTC (rev 76696)
+++
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.mdp
2007-05-04 13:46:40 UTC (rev 76697)
@@ -95,6 +95,7 @@
<ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Ide"
/>
<ProjectReference type="Project" localcopy="False"
refto="MonoDevelop.Core.Gui" />
<ProjectReference type="Project" localcopy="False"
refto="MonoDevelop.Projects" />
+ <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" />
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
