Author: lluis
Date: 2007-05-14 10:13:35 -0400 (Mon, 14 May 2007)
New Revision: 77351

Modified:
   trunk/mono-addins/Mono.Addins/ChangeLog
   trunk/mono-addins/Mono.Addins/Mono.Addins.Description/Extension.cs
   trunk/mono-addins/Mono.Addins/Mono.Addins/RuntimeAddin.cs
Log:
* Mono.Addins/RuntimeAddin.cs: Use the full add-in id when checking for
  optional add-in dependencies.
* Mono.Addins.Description/Extension.cs: Added method for getting a list
  of node types allowed in an extension.

Modified: trunk/mono-addins/Mono.Addins/ChangeLog
===================================================================
--- trunk/mono-addins/Mono.Addins/ChangeLog     2007-05-14 14:06:46 UTC (rev 
77350)
+++ trunk/mono-addins/Mono.Addins/ChangeLog     2007-05-14 14:13:35 UTC (rev 
77351)
@@ -1,3 +1,10 @@
+2007-05-14  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
+
+       * Mono.Addins/RuntimeAddin.cs: Use the full add-in id when checking for
+         optional add-in dependencies.
+       * Mono.Addins.Description/Extension.cs: Added method for getting a list
+         of node types allowed in an extension.
+
 2007-05-09  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
 
        * Mono.Addins/ExtensionNode.cs: Added some null checks.

Modified: trunk/mono-addins/Mono.Addins/Mono.Addins/RuntimeAddin.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins/RuntimeAddin.cs   2007-05-14 
14:06:46 UTC (rev 77350)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins/RuntimeAddin.cs   2007-05-14 
14:13:35 UTC (rev 77351)
@@ -189,7 +189,7 @@
                {
                        foreach (Dependency dep in module.Dependencies) {
                                AddinDependency pdep = dep as AddinDependency;
-                               if (pdep != null && 
!AddinManager.SessionService.IsAddinLoaded (pdep.AddinId))
+                               if (pdep != null && 
!AddinManager.SessionService.IsAddinLoaded (pdep.FullAddinId))
                                        return false;
                        }
                        return true;

Modified: trunk/mono-addins/Mono.Addins/Mono.Addins.Description/Extension.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins.Description/Extension.cs  
2007-05-14 14:06:46 UTC (rev 77350)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins.Description/Extension.cs  
2007-05-14 14:13:35 UTC (rev 77351)
@@ -79,7 +79,23 @@
                        }
                        return null;
                }
-       
+               
+               public ExtensionNodeTypeCollection GetAllowedNodeTypes ()
+               {
+                       ObjectDescription ob = GetExtendedObject ();
+                       ExtensionPoint ep = ob as ExtensionPoint;
+                       if (ep != null)
+                               return ep.NodeSet.GetAllowedNodeTypes ();
+                       
+                       ExtensionNodeDescription node = ob as 
ExtensionNodeDescription;
+                       if (node != null) {
+                               ExtensionNodeType nt = node.GetNodeType ();
+                               if (nt != null)
+                                       return nt.GetAllowedNodeTypes ();
+                       }
+                       return new ExtensionNodeTypeCollection ();
+               }
+               
                ExtensionPoint FindExtensionPoint (AddinDescription desc, 
string path)
                {
                        foreach (ExtensionPoint ep in desc.ExtensionPoints) {

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

Reply via email to