Author: lluis
Date: 2006-06-14 20:52:15 -0400 (Wed, 14 Jun 2006)
New Revision: 61725
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Core/ChangeLog
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core.AddIns.Setup/SetupService.cs
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core.AddIns/AddInService.cs
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core.AddIns/DefaultAddInTree.cs
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core.AddIns/DefaultAddInTreeNode.cs
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core.AddIns/IAddInTreeNode.cs
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core.Execution/ProcessService.cs
Log:
2006-06-15 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoDevelop.Core.AddIns/DefaultAddInTreeNode.cs:
* MonoDevelop.Core.AddIns/IAddInTreeNode.cs: Added Build method,
which builds the tree node.
* MonoDevelop.Core.AddIns/DefaultAddInTree.cs:
* MonoDevelop.Core.AddIns/AddInService.cs: Added new methods for
registering listeners on extension items. Listeners are notified
when new items are available in an extension, as a result of
loading new add-ins.
* MonoDevelop.Core.AddIns.Setup/SetupService.cs: When enabling an
add-in, make sure all required add-ins are also enabled. When
disabling,
make sure all dependent add-ins are disabled.
* MonoDevelop.Core.Execution/ProcessService.cs: Use the new extension
listeners to read extensions.
Modified: trunk/monodevelop/Core/src/MonoDevelop.Core/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Core/ChangeLog 2006-06-15
00:26:17 UTC (rev 61724)
+++ trunk/monodevelop/Core/src/MonoDevelop.Core/ChangeLog 2006-06-15
00:52:15 UTC (rev 61725)
@@ -1,3 +1,22 @@
+2006-06-15 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Core.AddIns/DefaultAddInTreeNode.cs:
+ * MonoDevelop.Core.AddIns/IAddInTreeNode.cs: Added Build method,
+ which builds the tree node.
+
+ * MonoDevelop.Core.AddIns/DefaultAddInTree.cs:
+ * MonoDevelop.Core.AddIns/AddInService.cs: Added new methods for
+ registering listeners on extension items. Listeners are notified
+ when new items are available in an extension, as a result of
+ loading new add-ins.
+
+ * MonoDevelop.Core.AddIns.Setup/SetupService.cs: When enabling an
+ add-in, make sure all required add-ins are also enabled. When
disabling,
+ make sure all dependent add-ins are disabled.
+
+ * MonoDevelop.Core.Execution/ProcessService.cs: Use the new extension
+ listeners to read extensions.
+
2006-06-12 John Luke <[EMAIL PROTECTED]>
* MonoDevelop.Core.AddIns/DefaultAddInTree.cs:
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core.AddIns/AddInService.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core.AddIns/AddInService.cs
2006-06-15 00:26:17 UTC (rev 61724)
+++
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core.AddIns/AddInService.cs
2006-06-15 00:52:15 UTC (rev 61725)
@@ -36,7 +36,10 @@
public class AddInService
{
ArrayList addInLoadErrors = new ArrayList ();
+ Hashtable listeners = new Hashtable ();
+ public event ExtensionEventHandler ExtensionChanged;
+
internal void Initialize ()
{
try {
@@ -68,6 +71,11 @@
get { return (AddinError[]) addInLoadErrors.ToArray
(typeof(AddinError)); }
}
+ public void DiscardAddInLoadErrors ()
+ {
+ addInLoadErrors.Clear ();
+ }
+
string[] GetAddInDirectories (out bool ignoreDefaultPath)
{
ArrayList addInDirs =
System.Configuration.ConfigurationSettings.GetConfig("AddInDirectories") as
ArrayList;
@@ -298,6 +306,61 @@
PreloadAddins (null, path);
return AddInTreeSingleton.AddInTree.GetTreeNode (path);
}
+
+ public void RegisterExtensionItemListener (string path,
ExtensionItemListener listener)
+ {
+ RegisterExtensionItemListener (path, listener, true);
+ }
+
+ public void RegisterExtensionItemListener (string path,
ExtensionItemListener listener, bool notifyCurrentNodes)
+ {
+ ArrayList list = (ArrayList) listeners [path];
+ if (list == null) {
+ list = new ArrayList ();
+ listeners [path] = list;
+ }
+ list.Add (listener);
+ if (notifyCurrentNodes) {
+ foreach (object ob in GetTreeItems (path))
+ listener (ExtensionAction.Add, ob);
+ }
+ }
+
+ public void UnregisterExtensionItemListener (string path,
ExtensionItemListener listener)
+ {
+ ArrayList list = (ArrayList) listeners [path];
+ if (list == null)
+ return;
+ list.Remove (listener);
+ }
+
+ internal void NotifyNodeAdded (string path, IAddInTreeNode node)
+ {
+ ArrayList list = (ArrayList) listeners [path];
+ if (list == null)
+ return;
+
+ object item = node.Build (null);
+ foreach (ExtensionItemListener listener in list)
+ listener (ExtensionAction.Add, item);
+ }
+
+ internal void NotifyExtensionsAdded (string path)
+ {
+ if (ExtensionChanged != null)
+ ExtensionChanged (path);
+ }
+
+ internal void NotifyNodeRemoved (string path, IAddInTreeNode
node)
+ {
+ ArrayList list = (ArrayList) listeners [path];
+ if (list == null)
+ return;
+
+ object item = node.Build (null);
+ foreach (ExtensionItemListener listener in list)
+ listener (ExtensionAction.Remove, item);
+ }
}
@@ -306,4 +369,14 @@
string Id { get; }
string Description { get; }
}
+
+ public delegate void ExtensionEventHandler (string path);
+
+ public delegate void ExtensionItemListener (ExtensionAction action,
object item);
+
+ public enum ExtensionAction
+ {
+ Add,
+ Remove
+ }
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core.AddIns/DefaultAddInTree.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core.AddIns/DefaultAddInTree.cs
2006-06-15 00:26:17 UTC (rev 61724)
+++
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core.AddIns/DefaultAddInTree.cs
2006-06-15 00:52:15 UTC (rev 61725)
@@ -123,8 +123,10 @@
localPath.Codon = codon;
localPath.ConditionCollection =
(ConditionCollection)extension.Conditions[codon.ID];
localPath.AllowedChildNodes =
CodonBuilder.GetAllowedChildNodes (codon.GetType ());
+ Runtime.AddInService.NotifyNodeAdded
(extension.Path, localPath);
// localPath.Description =
CodonBuilder.GetDescription (codon.GetType ());
}
+ Runtime.AddInService.NotifyExtensionsAdded
(extension.Path);
}
/// <summary>
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core.AddIns/DefaultAddInTreeNode.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core.AddIns/DefaultAddInTreeNode.cs
2006-06-15 00:26:17 UTC (rev 61724)
+++
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core.AddIns/DefaultAddInTreeNode.cs
2006-06-15 00:52:15 UTC (rev 61725)
@@ -164,6 +164,12 @@
return (IAddInTreeNode[]) sorted.ToArray
(typeof(IAddInTreeNode));
}
+ public object Build (object caller)
+ {
+ ArrayList subItems = BuildChildItems (caller);
+ return Codon.BuildItem (caller, subItems, null);
+ }
+
/// <summary>
/// Builds one child item of this node using the
<code>BuildItem</code>
/// method of the codon in the child tree. The sub item with
the <code>ID</code>
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core.AddIns/IAddInTreeNode.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core.AddIns/IAddInTreeNode.cs
2006-06-15 00:26:17 UTC (rev 61724)
+++
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core.AddIns/IAddInTreeNode.cs
2006-06-15 00:52:15 UTC (rev 61725)
@@ -62,8 +62,10 @@
/// method of the codon in the child tree. The sub item with
the <code>ID</code>
/// <code>childItemID</code> will be build.
/// </remarks>
- object BuildChildItem(string childItemID, object caller);
+ object BuildChildItem(string childItemID, object caller);
+ object Build (object caller);
+
string[] AllowedChildNodes { get; }
string Description { get; }
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core.AddIns.Setup/SetupService.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core.AddIns.Setup/SetupService.cs
2006-06-15 00:26:17 UTC (rev 61724)
+++
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core.AddIns.Setup/SetupService.cs
2006-06-15 00:52:15 UTC (rev 61725)
@@ -627,15 +627,39 @@
internal void EnableAddin (string id)
{
+ if (IsAddinEnabled (id))
+ return;
+
Configuration.DisabledAddins.Remove (id);
SaveConfiguration ();
+
+ // Enable required add-ins
+
+ AddinSetupInfo ainfo = GetInstalledAddin (id);
+
+ foreach (PackageDependency dep in
ainfo.Addin.Dependencies) {
+ if (dep is AddinDependency)
+ EnableAddin
(((AddinDependency)dep).AddinId);
+ }
}
internal void DisableAddin (string id)
{
- if (IsAddinEnabled (id)) {
- Configuration.DisabledAddins.Add (id);
- SaveConfiguration ();
+ if (!IsAddinEnabled (id))
+ return;
+
+ Configuration.DisabledAddins.Add (id);
+ SaveConfiguration ();
+
+ // Disable all add-ins which depend on it
+
+ foreach (AddinSetupInfo ainfo in
InternalGetInstalledAddins ()) {
+ foreach (PackageDependency dep in
ainfo.Addin.Dependencies) {
+ if (dep is AddinDependency &&
((AddinDependency)dep).AddinId == id) {
+ DisableAddin (ainfo.Addin.Id);
+ break;
+ }
+ }
}
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core.Execution/ProcessService.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core.Execution/ProcessService.cs
2006-06-15 00:26:17 UTC (rev 61724)
+++
trunk/monodevelop/Core/src/MonoDevelop.Core/MonoDevelop.Core.Execution/ProcessService.cs
2006-06-15 00:52:15 UTC (rev 61725)
@@ -17,7 +17,7 @@
public class ProcessService : AbstractService
{
ProcessHostController externalProcess;
- ExecutionHandlerCodon[] executionHandlers;
+ ArrayList executionHandlers;
string remotingChannel = "unix";
string unixRemotingFile;
@@ -112,14 +112,22 @@
public IExecutionHandler GetDefaultExecutionHandler (string
platformId)
{
- if (executionHandlers == null)
- executionHandlers = (ExecutionHandlerCodon[])
Runtime.AddInService.GetTreeItems ("/SharpDevelop/Workbench/ExecutionHandlers",
typeof(ExecutionHandlerCodon));
+ if (executionHandlers == null) {
+ executionHandlers = new ArrayList ();
+
Runtime.AddInService.RegisterExtensionItemListener
("/SharpDevelop/Workbench/ExecutionHandlers", OnExtensionChange);
+ }
foreach (ExecutionHandlerCodon codon in
executionHandlers)
if (codon.Platform == platformId) return
codon.ExecutionHandler;
return null;
}
+ void OnExtensionChange (ExtensionAction action, object item)
+ {
+ if (action == ExtensionAction.Add)
+ executionHandlers.Add (item);
+ }
+
ProcessHostController GetHost (string id, bool shared)
{
if (!shared)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches