Author: lluis
Date: 2007-05-04 09:48:29 -0400 (Fri, 04 May 2007)
New Revision: 76702
Modified:
trunk/monodevelop/Extras/NUnit/ChangeLog
trunk/monodevelop/Extras/NUnit/Gui/UnitTestOptionsDialog.cs
trunk/monodevelop/Extras/NUnit/Makefile.am
trunk/monodevelop/Extras/NUnit/MonoDevelop.NUnit.mdp
trunk/monodevelop/Extras/NUnit/MonoDevelopNUnit.addin.xml
trunk/monodevelop/Extras/NUnit/Services/NUnitService.cs
Log:
* MonoDevelop.NUnit.mdp, MonoDevelopNUnit.addin.xml,
Services/NUnitService.cs, Gui/UnitTestOptionsDialog.cs,
Makefile.am: Migration to Mono.Addins.
Modified: trunk/monodevelop/Extras/NUnit/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/NUnit/ChangeLog 2007-05-04 13:48:11 UTC (rev
76701)
+++ trunk/monodevelop/Extras/NUnit/ChangeLog 2007-05-04 13:48:29 UTC (rev
76702)
@@ -1,3 +1,9 @@
+2007-05-04 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * MonoDevelop.NUnit.mdp, MonoDevelopNUnit.addin.xml,
+ Services/NUnitService.cs, Gui/UnitTestOptionsDialog.cs,
+ Makefile.am: Migration to Mono.Addins.
+
2007-05-03 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoDevelop.Projects/Combine.cs,
Modified: trunk/monodevelop/Extras/NUnit/Gui/UnitTestOptionsDialog.cs
===================================================================
--- trunk/monodevelop/Extras/NUnit/Gui/UnitTestOptionsDialog.cs 2007-05-04
13:48:11 UTC (rev 76701)
+++ trunk/monodevelop/Extras/NUnit/Gui/UnitTestOptionsDialog.cs 2007-05-04
13:48:29 UTC (rev 76702)
@@ -30,7 +30,7 @@
using System;
using System.Collections;
-using MonoDevelop.Core.AddIns;
+using Mono.Addins;
using MonoDevelop.Core;
using MonoDevelop.Core.Properties;
using MonoDevelop.Core.Gui.Dialogs;
@@ -41,19 +41,19 @@
{
UnitTest test;
- IAddInTreeNode configurationNode;
+ ExtensionNode configurationNode;
public UnitTestOptionsDialog (Gtk.Window parent, UnitTest test)
: base (parent, null, null)
{
- IAddInTreeNode node =
Runtime.AddInService.GetTreeNode("/SharpDevelop/Workbench/UnitTestOptions/GeneralOptions");
- configurationNode =
Runtime.AddInService.GetTreeNode("/SharpDevelop/Workbench/UnitTestOptions/ConfigurationProperties");
+ ExtensionNode node = AddinManager.GetExtensionNode
("/SharpDevelop/Workbench/UnitTestOptions/GeneralOptions");
+ configurationNode =
AddinManager.GetExtensionNode("/SharpDevelop/Workbench/UnitTestOptions/ConfigurationProperties");
this.test = test;
this.Title = GettextCatalog.GetString ("Unit Test
Options");
properties = new DefaultProperties();
properties.SetProperty ("UnitTest", test);
- AddNodes (properties, Gtk.TreeIter.Zero,
node.BuildChildItems (this));
+ AddNodes (properties, Gtk.TreeIter.Zero,
node.GetChildObjects ());
SelectFirstNode ();
}
@@ -64,8 +64,8 @@
configNodeProperties.SetProperty("UnitTest",
test);
configNodeProperties.SetProperty("Config",
name);
- ArrayList list =
configurationNode.BuildChildItems (this);
- if (list.Count > 1) {
+ object[] list =
configurationNode.GetChildObjects ();
+ if (list.Length > 1) {
Gtk.TreeIter newNode = AddPath (name,
configIter);
AddNodes (configNodeProperties,
newNode, list);
} else {
Modified: trunk/monodevelop/Extras/NUnit/Makefile.am
===================================================================
--- trunk/monodevelop/Extras/NUnit/Makefile.am 2007-05-04 13:48:11 UTC (rev
76701)
+++ trunk/monodevelop/Extras/NUnit/Makefile.am 2007-05-04 13:48:29 UTC (rev
76702)
@@ -10,6 +10,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:./lib/nunit.core.dll \
-r:./lib/nunit.framework.dll \
-r:System \
Modified: trunk/monodevelop/Extras/NUnit/MonoDevelop.NUnit.mdp
===================================================================
--- trunk/monodevelop/Extras/NUnit/MonoDevelop.NUnit.mdp 2007-05-04
13:48:11 UTC (rev 76701)
+++ trunk/monodevelop/Extras/NUnit/MonoDevelop.NUnit.mdp 2007-05-04
13:48:29 UTC (rev 76702)
@@ -78,6 +78,7 @@
<ProjectReference type="Assembly" localcopy="False"
refto="./lib/nunit.framework.dll" />
<ProjectReference type="Gac" localcopy="False" refto="System,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<ProjectReference type="Gac" localcopy="False" refto="System.Xml,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <ProjectReference type="Assembly" localcopy="True"
refto="../../contrib/Mono.Addins.dll" />
<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" />
<ProjectReference type="Gac" localcopy="True" refto="gdk-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
Modified: trunk/monodevelop/Extras/NUnit/MonoDevelopNUnit.addin.xml
===================================================================
--- trunk/monodevelop/Extras/NUnit/MonoDevelopNUnit.addin.xml 2007-05-04
13:48:11 UTC (rev 76701)
+++ trunk/monodevelop/Extras/NUnit/MonoDevelopNUnit.addin.xml 2007-05-04
13:48:29 UTC (rev 76702)
@@ -1,4 +1,5 @@
-<AddIn id = "MonoDevelop.NUnit"
+<Addin id = "NUnit"
+ namespace = "MonoDevelop"
name = "NUnit support"
author = "Lluis Sanchez, John Luke"
copyright = "GPL"
@@ -14,13 +15,55 @@
</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 = "/Services/NUnit/TestProviders" name = "Test
providers">
+ <Description>Test providers. Specified classes must implement
ITestProvider.</Description>
+ <ExtensionNode name ="Class" />
+ </ExtensionPoint>
+
+ <ExtensionPoint path = "/SharpDevelop/Views/TestChart/ContextMenu">
+ <ExtensionNodeSet id="MonoDevelop.Core.Gui.ItemSet"/>
+ </ExtensionPoint>
+
+ <ExtensionPoint path = "/SharpDevelop/Views/TestPad/ContextMenu">
+ <ExtensionNodeSet id="MonoDevelop.Core.Gui.ItemSet"/>
+ </ExtensionPoint>
+
+ <ExtensionPoint path = "/SharpDevelop/Views/TestResultsPad/ContextMenu">
+ <ExtensionNodeSet id="MonoDevelop.Core.Gui.ItemSet"/>
+ </ExtensionPoint>
+
+ <ExtensionPoint path =
"/SharpDevelop/Views/ProjectBrowser/ContextMenu/NUnitAssemblyGroup">
+ <ExtensionNodeSet id="MonoDevelop.Core.Gui.ItemSet"/>
+ </ExtensionPoint>
+
+ <ExtensionPoint path =
"/SharpDevelop/Views/ProjectBrowser/ContextMenu/TestAssembly">
+ <ExtensionNodeSet id="MonoDevelop.Core.Gui.ItemSet"/>
+ </ExtensionPoint>
+
+ <ExtensionPoint path =
"/SharpDevelop/Views/ProjectBrowser/ContextMenu/NUnitAssemblyGroupConfiguration">
+ <ExtensionNodeSet id="MonoDevelop.Core.Gui.ItemSet"/>
+ </ExtensionPoint>
+
+ <ExtensionPoint path =
"/SharpDevelop/Workbench/UnitTestOptions/GeneralOptions">
+ <ExtensionNodeSet id="MonoDevelop.Core.Gui.DialogPanel" />
+ </ExtensionPoint>
+
+ <ExtensionPoint path =
"/SharpDevelop/Workbench/UnitTestOptions/ConfigurationProperties">
+ <ExtensionNodeSet id="MonoDevelop.Core.Gui.DialogPanel" />
+ </ExtensionPoint>
+
+
+ <!-- Extensions -->
+
<Extension path="/Workspace/Services">
<Class id = "NUnitService" class =
"MonoDevelop.NUnit.NUnitService" insertafter = "CommandService"/>
</Extension>
@@ -95,12 +138,6 @@
<CommandItem id =
"MonoDevelop.NUnit.Commands.TestChartCommands.SingleDayResult" />
</Extension>
- <Extension path = "/SharpDevelop/Workbench/UnitTestOptions">
- <DialogPanel id = "NUnitOptionsPanel"
- _label = "NUnit options"
- class =
"MonoDevelop.NUnit.NUnitOptionsDialog"/>
- </Extension>
-
<Extension path =
"/SharpDevelop/Workbench/UnitTestOptions/GeneralOptions">
<DialogPanel id = "Configurations"
_label = "Configurations" />
@@ -126,10 +163,5 @@
class="MonoDevelop.NUnit.NUnitAssemblyGroupFileFormat, MonoDevelop.NUnit"/>
</Extension>
- <!-- New extension points -->
- <Extension path = "/Services/NUnit/TestProviders"
extension-nodes="Class" description="Test providers.|Specified classes must
implement ITestProvider.">
- <Class id = "SystemTestProvider" class =
"MonoDevelop.NUnit.SystemTestProvider"/>
- </Extension>
-
-</AddIn>
+</Addin>
Modified: trunk/monodevelop/Extras/NUnit/Services/NUnitService.cs
===================================================================
--- trunk/monodevelop/Extras/NUnit/Services/NUnitService.cs 2007-05-04
13:48:11 UTC (rev 76701)
+++ trunk/monodevelop/Extras/NUnit/Services/NUnitService.cs 2007-05-04
13:48:29 UTC (rev 76702)
@@ -34,7 +34,7 @@
using MonoDevelop.Core;
using MonoDevelop.Core.Gui;
using MonoDevelop.Core.Gui.Dialogs;
-using MonoDevelop.Core.AddIns;
+using Mono.Addins;
using MonoDevelop.Projects;
using NUnit.Core;
using MonoDevelop.Ide.Gui;
@@ -70,14 +70,14 @@
ps.DataContext.IncludeType (typeof(UnitTestOptionsSet));
ps.DataContext.RegisterProperty
(typeof(AbstractConfiguration), "UnitTestInformation",
typeof(UnitTestOptionsSet));
- Runtime.AddInService.RegisterExtensionItemListener
("/Services/NUnit/TestProviders", OnExtensionChange);
+ Mono.Addins.AddinManager.AddExtensionNodeHandler
("/Services/NUnit/TestProviders", OnExtensionChange);
}
- void OnExtensionChange (ExtensionAction action, object item)
+ void OnExtensionChange (object s, ExtensionNodeEventArgs args)
{
- if (action == ExtensionAction.Add) {
+ if (args.Change == ExtensionChange.Add) {
IProjectService ps =
MonoDevelop.Projects.Services.ProjectService;
- ITestProvider provider = item as ITestProvider;
+ ITestProvider provider = args.ExtensionObject
as ITestProvider;
providers.Add (provider);
Type[] types = provider.GetOptionTypes ();
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
