Author: lluis
Date: 2007-03-30 10:34:16 -0500 (Fri, 30 Mar 2007)
New Revision: 75206

Modified:
   trunk/mono-addins/Mono.Addins/ChangeLog
   trunk/mono-addins/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs
   trunk/mono-addins/Mono.Addins/Mono.Addins.Database/AddinScanFolderInfo.cs
   trunk/mono-addins/Mono.Addins/Mono.Addins.Database/AddinScanner.cs
   trunk/mono-addins/Mono.Addins/Mono.Addins/Addin.cs
   trunk/mono-addins/Mono.Addins/Mono.Addins/AddinRegistry.cs
   trunk/mono-addins/Mono.Addins/Mono.Addins/ExtensionContext.cs
   trunk/mono-addins/Mono.Addins/Mono.Addins/ExtensionNode.cs
   trunk/mono-addins/Mono.Addins/Mono.Addins/ExtensionTree.cs
   trunk/mono-addins/Mono.Addins/Mono.Addins/TreeNode.cs
Log:
* Mono.Addins/Addin.cs: Added support for global add-in names.
* Mono.Addins/ExtensionContext.cs: Make sure extensions of recently
  installed add-ins are properly loaded. Don't call OnAddinLoaded on
  nodes until all nodes of the extension point have been loaded,
  since OnAddinLoaded implementations may try to access to children
  which have not yet been loaded.
* Mono.Addins/ExtensionNode.cs: Added some null checks.
* Mono.Addins/ExtensionTree.cs: Fixed order when the insertafer
  attribute is specified.
* Mono.Addins/TreeNode.cs: Added method for getting an extension point
  from a path.
* Mono.Addins/AddinRegistry.cs: Added new env var for specifying the
  global add-in registry.
* Mono.Addins.Database/AddinScanFolderInfo.cs: Only include add-in
  files in the list of missing files.
* Mono.Addins.Database/AddinDatabase.cs: Properly remove add-in
  manifests from add-in folders that have been deleted.
* Mono.Addins.Database/AddinScanner.cs: Moved code that removes
  manifests from deleted add-ins to a new method, which is called
  from AddinDatabase as well.

Modified: trunk/mono-addins/Mono.Addins/ChangeLog
===================================================================
--- trunk/mono-addins/Mono.Addins/ChangeLog     2007-03-30 15:27:53 UTC (rev 
75205)
+++ trunk/mono-addins/Mono.Addins/ChangeLog     2007-03-30 15:34:16 UTC (rev 
75206)
@@ -1,3 +1,26 @@
+2007-03-30  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
+
+       * Mono.Addins/Addin.cs: Added support for global add-in names.
+       * Mono.Addins/ExtensionContext.cs: Make sure extensions of recently
+         installed add-ins are properly loaded. Don't call OnAddinLoaded on
+         nodes until all nodes of the extension point have been loaded,
+         since OnAddinLoaded implementations may try to access to children
+         which have not yet been loaded.
+       * Mono.Addins/ExtensionNode.cs: Added some null checks.
+       * Mono.Addins/ExtensionTree.cs: Fixed order when the insertafer
+         attribute is specified.
+       * Mono.Addins/TreeNode.cs: Added method for getting an extension point
+         from a path.
+       * Mono.Addins/AddinRegistry.cs: Added new env var for specifying the
+         global add-in registry.
+       * Mono.Addins.Database/AddinScanFolderInfo.cs: Only include add-in
+         files in the list of missing files.
+       * Mono.Addins.Database/AddinDatabase.cs: Properly remove add-in
+         manifests from add-in folders that have been deleted.
+       * Mono.Addins.Database/AddinScanner.cs: Moved code that removes
+         manifests from deleted add-ins to a new method, which is called
+         from AddinDatabase as well.
+
 2007-03-28  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
 
        * Mono.Addins.mdp: Generate a winexe, to avoid showing a console in

Modified: trunk/mono-addins/Mono.Addins/Mono.Addins/Addin.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins/Addin.cs  2007-03-30 15:27:53 UTC 
(rev 75205)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins/Addin.cs  2007-03-30 15:34:16 UTC 
(rev 75206)
@@ -187,7 +187,7 @@
                public static string GetFullId (string ns, string id, string 
version)
                {
                        string res;
-                       if (ns != null && ns.Length > 0 && id.IndexOf ('.') == 
-1)
+                       if (ns != null && ns.Length > 0 && !id.StartsWith 
("::"))
                                res = ns + "." + id;
                        else
                                res = id;

Modified: trunk/mono-addins/Mono.Addins/Mono.Addins/AddinRegistry.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins/AddinRegistry.cs  2007-03-30 
15:27:53 UTC (rev 75205)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins/AddinRegistry.cs  2007-03-30 
15:34:16 UTC (rev 75206)
@@ -75,6 +75,10 @@
                
                internal static string GlobalRegistryPath {
                        get {
+                               string customDir = 
Environment.GetEnvironmentVariable ("MONO_ADDINS_GLOBAL_REGISTRY");
+                               if (customDir != null && customDir.Length > 0)
+                                       return Util.GetFullPath (customDir);
+                               
                                string path = Environment.GetFolderPath 
(Environment.SpecialFolder.ApplicationData); 
                                path = Path.Combine (path, "mono.addins");
                                return Util.GetFullPath (path);

Modified: trunk/mono-addins/Mono.Addins/Mono.Addins/ExtensionContext.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins/ExtensionContext.cs       
2007-03-30 15:27:53 UTC (rev 75205)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins/ExtensionContext.cs       
2007-03-30 15:34:16 UTC (rev 75206)
@@ -367,25 +367,43 @@
                        try {
                                fireEvents = true;
                                
-                               ArrayList list = new ArrayList ();
-                               tree.GetExtendedLoadedNodes (id, list);
+                               Addin addin = AddinManager.Registry.GetAddin 
(id);
+                               if (addin == null) {
+                                       AddinManager.ReportError ("Required 
add-in not found", id, null, false);
+                                       return;
+                               }
                                
-                               foreach (TreeNode nod in list) {
-                                       ExtensionPoint ep = nod.ExtensionPoint;
+                               // Look for loaded extension points
+                               Hashtable eps = new Hashtable ();
+                               foreach (ModuleDescription mod in 
addin.Description.AllModules) {
+                                       foreach (Extension ext in 
mod.Extensions) {
+                                               ExtensionPoint ep = 
tree.FindExtensionPoint (ext.Path);
+                                               if (ep != null && !eps.Contains 
(ep))
+                                                       eps.Add (ep, ep);
+                                       }
+                               }
+                               
+                               // Add the new nodes
+                               ArrayList loadedNodes = new ArrayList ();
+                               foreach (ExtensionPoint ep in eps.Keys) {
                                        ExtensionLoadData data = 
GetAddinExtensions (id, ep);
                                        if (data != null) {
                                                foreach (Extension ext in 
data.Extensions) {
                                                        TreeNode node = GetNode 
(ext.Path);
                                                        if (node != null && 
node.ExtensionNodeSet != null)
-                                                               
LoadModuleExtensionNodes (ext, data.AddinId, node.ExtensionNodeSet);
+                                                               
LoadModuleExtensionNodes (ext, data.AddinId, node.ExtensionNodeSet, 
loadedNodes);
                                                        else
                                                                
AddinManager.ReportError ("Extension node not found or not extensible: " + 
ext.Path, id, null, false);
                                                }
                                                
                                                // Global extension change 
event. Other events are fired by LoadModuleExtensionNodes.
-                                               NotifyExtensionsChanged (new 
ExtensionEventArgs (nod.GetPath ()));
+                                               NotifyExtensionsChanged (new 
ExtensionEventArgs (ep.Path));
                                        }
                                }
+                               
+                               // Call the OnAddinLoaded method on nodes, if 
the add-in is already loaded
+                               foreach (TreeNode nod in loadedNodes)
+                                       nod.ExtensionNode.OnAddinLoaded ();
                        }
                        finally {
                                fireEvents = false;
@@ -478,15 +496,19 @@
                                
                                // Now load the extensions
                                
+                               ArrayList loadedNodes = new ArrayList ();
                                foreach (ExtensionLoadData data in loadData) {
                                        foreach (Extension ext in 
data.Extensions) {
                                                TreeNode cnode = GetNode 
(ext.Path);
                                                if (cnode != null && 
cnode.ExtensionNodeSet != null)
-                                                       
LoadModuleExtensionNodes (ext, data.AddinId, cnode.ExtensionNodeSet);
+                                                       
LoadModuleExtensionNodes (ext, data.AddinId, cnode.ExtensionNodeSet, 
loadedNodes);
                                                else
                                                        
AddinManager.ReportError ("Extension node not found or not extensible: " + 
ext.Path, data.AddinId, null, false);
                                        }
                                }
+                               // Call the OnAddinLoaded method on nodes, if 
the add-in is already loaded
+                               foreach (TreeNode nod in loadedNodes)
+                                       nod.ExtensionNode.OnAddinLoaded ();
 
                                NotifyExtensionsChanged (new ExtensionEventArgs 
(requestedExtensionPath));
                        }
@@ -542,17 +564,19 @@
                        }
                }
                
-               void LoadModuleExtensionNodes (Extension extension, string 
addinId, ExtensionNodeSet nset)
+               void LoadModuleExtensionNodes (Extension extension, string 
addinId, ExtensionNodeSet nset, ArrayList loadedNodes)
                {
                        // Now load the extensions
                        ArrayList addedNodes = new ArrayList ();
                        tree.LoadExtension (addinId, extension, addedNodes);
                        
                        RuntimeAddin ad = AddinManager.SessionService.GetAddin 
(addinId);
-                       foreach (TreeNode nod in addedNodes) {
-                               // Call the OnAddinLoaded method on nodes, if 
the add-in is already loaded
-                               if (ad != null)
-                                       nod.NotifyAddinLoaded (ad, false);
+                       if (ad != null) {
+                               foreach (TreeNode nod in addedNodes) {
+                                       // Don't call OnAddinLoaded here. Do it 
when the entire extension point has been loaded.
+                                       if (nod.ExtensionNode != null)
+                                               loadedNodes.Add (nod);
+                               }
                        }
                }
                

Modified: trunk/mono-addins/Mono.Addins/Mono.Addins/ExtensionNode.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins/ExtensionNode.cs  2007-03-30 
15:27:53 UTC (rev 75205)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins/ExtensionNode.cs  2007-03-30 
15:34:16 UTC (rev 75206)
@@ -78,13 +78,13 @@
                
                public RuntimeAddin Addin {
                        get {
-                               if (addinId == null)
-                                       return null;
-                               if (addin == null) {
+                               if (addin == null && addinId != null) {
                                        if 
(!AddinManager.SessionService.IsAddinLoaded (addinId))
                                                
AddinManager.SessionService.LoadAddin (null, addinId, true);
                                        addin = 
AddinManager.SessionService.GetAddin (addinId);
                                }
+                               if (addin == null)
+                                       throw new InvalidOperationException 
("Add-in '" + addinId + "' could not be loaded.");
                                return addin; 
                        }
                }

Modified: trunk/mono-addins/Mono.Addins/Mono.Addins/ExtensionTree.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins/ExtensionTree.cs  2007-03-30 
15:27:53 UTC (rev 75205)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins/ExtensionTree.cs  2007-03-30 
15:34:16 UTC (rev 75206)
@@ -58,7 +58,7 @@
                                AddinManager.ReportError ("Can't load 
extensions for path '" + extension.Path + "'. Extension point not defined.", 
addin, null, false);
                                return;
                        }
-                               
+                       
                        int curPos = tnode.ChildCount;
                        LoadExtensionElement (tnode, addin, 
extension.ExtensionNodes, ref curPos, tnode.Condition, false, addedNodes);
                }
@@ -87,7 +87,7 @@
                                string after = elem.GetAttribute 
("insertafter");
                                if (after.Length > 0) {
                                        int i = tnode.Children.IndexOfNode 
(after);
-                                       if (i != -1 && i+1 > curPos)
+                                       if (i != -1)
                                                curPos = i+1;
                                }
                                string before = elem.GetAttribute 
("insertbefore");

Modified: trunk/mono-addins/Mono.Addins/Mono.Addins/TreeNode.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins/TreeNode.cs       2007-03-30 
15:27:53 UTC (rev 75205)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins/TreeNode.cs       2007-03-30 
15:34:16 UTC (rev 75206)
@@ -176,21 +176,18 @@
                        TreeNode curNode = this;
 
                        foreach (string part in parts) {
-                               bool found = false;
                                int i = curNode.Children.IndexOfNode (part);
                                if (i != -1) {
                                        curNode = curNode.Children [i];
-                                       found = true;
+                                       continue;
                                }
                                
-                               if (!found) {
-                                       if (buildPath) {
-                                               TreeNode newNode = new TreeNode 
(part);
-                                               curNode.AddChildNode (newNode);
-                                               curNode = newNode;
-                                       } else
-                                               return null;
-                               }
+                               if (buildPath) {
+                                       TreeNode newNode = new TreeNode (part);
+                                       curNode.AddChildNode (newNode);
+                                       curNode = newNode;
+                               } else
+                                       return null;
                        }
                        return curNode;
                }
@@ -240,17 +237,25 @@
                        }
                }
                
-               public void GetExtendedLoadedNodes (string id, ArrayList nodes)
+               public ExtensionPoint FindExtensionPoint (string path)
                {
-                       if (childrenLoaded) {
-                               if (extensionPoint != null && 
extensionPoint.Addins != null) {
-                                       if 
(((IList)extensionPoint.Addins).Contains (id))
-                                               nodes.Add (this);
+                       if (path.StartsWith ("/"))
+                               path = path.Substring (1);
+
+                       string[] parts = path.Split ('/');
+                       TreeNode curNode = this;
+
+                       foreach (string part in parts) {
+                               int i = curNode.Children.IndexOfNode (part);
+                               if (i != -1) {
+                                       curNode = curNode.Children [i];
+                                       if (curNode.ExtensionPoint != null)
+                                               return curNode.ExtensionPoint;
+                                       continue;
                                }
-                               
-                               foreach (TreeNode node in Children)
-                                       node.GetExtendedLoadedNodes (id, nodes);
+                               return null;
                        }
+                       return null;
                }
                
                public void FindAddinNodes (string id, ArrayList nodes)

Modified: trunk/mono-addins/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs 
2007-03-30 15:27:53 UTC (rev 75205)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins.Database/AddinDatabase.cs 
2007-03-30 15:34:16 UTC (rev 75206)
@@ -744,24 +744,33 @@
                                scanResult.RegenerateAllData = true;
                        }
                        
+                       AddinScanner scanner = new AddinScanner (this);
+                       
                        // Check if any of the previously scanned folders has 
been deleted
                        
                        foreach (string file in Directory.GetFiles 
(AddinFolderCachePath, "*.data")) {
                                AddinScanFolderInfo folderInfo;
-                               ReadFolderInfo (monitor, file, out folderInfo);
-                               if (folderInfo == null || !Directory.Exists 
(folderInfo.Folder)) {
-                                       // Folder info object corrupt, or 
folder has been deleted. Disacard it.
-                                       SafeDelete (monitor, file);
-                                       scanResult.RegenerateRelationData = 
true;
-                                       scanResult.ChangesFound = true;
-                                       if (scanResult.CheckOnly)
+                               bool res = ReadFolderInfo (monitor, file, out 
folderInfo);
+                               if (!res || !Directory.Exists 
(folderInfo.Folder)) {
+                                       if (res) {
+                                               // Folder has been deleted. 
Remove the add-ins it had.
+                                               scanner.UpdateDeletedAddins 
(monitor, folderInfo, scanResult);
+                                       }
+                                       else {
+                                               // Folder info file corrupt. 
Regenerate all.
+                                               scanResult.ChangesFound = true;
+                                               
scanResult.RegenerateRelationData = true;
+                                       }
+                                       
+                                       if (!scanResult.CheckOnly)
+                                               SafeDelete (monitor, file);
+                                       else
                                                return;
                                }
                        }
-                               
+                       
                        // Look for changes in the add-in folders
                        
-                       AddinScanner scanner = new AddinScanner (this);
                        foreach (string dir in registry.AddinDirectories) {
                                if (dir == registry.DefaultAddinsFolder)
                                        scanner.ScanFolderRec (monitor, dir, 
scanResult);

Modified: 
trunk/mono-addins/Mono.Addins/Mono.Addins.Database/AddinScanFolderInfo.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins.Database/AddinScanFolderInfo.cs   
2007-03-30 15:27:53 UTC (rev 75205)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins.Database/AddinScanFolderInfo.cs   
2007-03-30 15:34:16 UTC (rev 75206)
@@ -130,8 +130,10 @@
                        
                        if (!Directory.Exists (folder)) {
                                // All deleted
-                               foreach (AddinFileInfo info in files.Values)
-                                       missing.Add (info);
+                               foreach (AddinFileInfo info in files.Values) {
+                                       if (info.AddinId != null && 
info.AddinId.Length > 0)
+                                               missing.Add (info);
+                               }
                                files.Clear ();
                                return missing;
                        }

Modified: trunk/mono-addins/Mono.Addins/Mono.Addins.Database/AddinScanner.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins.Database/AddinScanner.cs  
2007-03-30 15:27:53 UTC (rev 75205)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins.Database/AddinScanner.cs  
2007-03-30 15:34:16 UTC (rev 75206)
@@ -100,8 +100,9 @@
                                // The folder has been deleted. All add-ins 
defined in that folder should also be deleted.
                                scanResult.RegenerateRelationData = true;
                                scanResult.ChangesFound = true;
+                               if (scanResult.CheckOnly)
+                                       return;
                                database.DeleteFolderInfo (monitor, folderInfo);
-                               return;
                        }
                        
                        if (scanResult.LocateAssembliesOnly)
@@ -109,9 +110,15 @@
                        
                        // Look for deleted add-ins.
                        
+                       UpdateDeletedAddins (monitor, folderInfo, scanResult);
+               }
+               
+               public void UpdateDeletedAddins (IProgressStatus monitor, 
AddinScanFolderInfo folderInfo, AddinScanResult scanResult)
+               {
                        ArrayList missing = folderInfo.GetMissingAddins ();
                        if (missing.Count > 0) {
-                               scanResult.ModifiedFolderInfos.Add (folderInfo);
+                               if (Directory.Exists (folderInfo.Folder))
+                                       scanResult.ModifiedFolderInfos.Add 
(folderInfo);
                                scanResult.ChangesFound = true;
                                if (scanResult.CheckOnly)
                                        return;

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

Reply via email to