Author: lluis
Date: 2007-12-03 14:02:12 -0500 (Mon, 03 Dec 2007)
New Revision: 90578

Modified:
   trunk/mono-addins/Mono.Addins/ChangeLog
   trunk/mono-addins/Mono.Addins/Mono.Addins/Addin.cs
   trunk/mono-addins/Mono.Addins/Mono.Addins/AddinManager.cs
   trunk/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs
   trunk/mono-addins/Mono.Addins/Mono.Addins/ExtensionNode.cs
   trunk/mono-addins/Mono.Addins/Mono.Addins/RuntimeAddin.cs
Log:
* Mono.Addins/RuntimeAddin.cs, Mono.Addins/Addin.cs: Added more
  informative implementation of ToString ().
* Mono.Addins/AddinSessionService.cs, Mono.Addins/AddinManager.cs:
  Added CurrentAddin property, which returns the add-in on which the
  calling method is implemented. Same for CurrentLocalizer.
* Mono.Addins/ExtensionNode.cs: Allow getting the extension context
  bound to an extension node.

Modified: trunk/mono-addins/Mono.Addins/ChangeLog
===================================================================
--- trunk/mono-addins/Mono.Addins/ChangeLog     2007-12-03 18:37:11 UTC (rev 
90577)
+++ trunk/mono-addins/Mono.Addins/ChangeLog     2007-12-03 19:02:12 UTC (rev 
90578)
@@ -1,5 +1,15 @@
 2007-12-03  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
 
+       * Mono.Addins/RuntimeAddin.cs, Mono.Addins/Addin.cs: Added more 
informative
+         implementation of ToString ().
+       * Mono.Addins/AddinSessionService.cs, Mono.Addins/AddinManager.cs: Added
+         CurrentAddin property, which returns the add-in on which the calling
+         method is implemented. Same for CurrentLocalizer.
+       * Mono.Addins/ExtensionNode.cs: Allow getting the extension context 
bound to
+         an extension node.
+
+2007-12-03  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
+
        * Mono.Addins.Database/AddinScanner.cs: ScanNodeSet may change the
          ExtensionNodeSets collection, so it is necessary to make a copy when
          iterating with it.

Modified: trunk/mono-addins/Mono.Addins/Mono.Addins/Addin.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins/Addin.cs  2007-12-03 18:37:11 UTC 
(rev 90577)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins/Addin.cs  2007-12-03 19:02:12 UTC 
(rev 90578)
@@ -84,6 +84,11 @@
                        return AddinInfo.SupportsVersion (version);
                }
                
+               public override string ToString ()
+               {
+                       return Id;
+               }
+               
                internal AddinInfo AddinInfo {
                        get {
                                if (addin == null) {

Modified: trunk/mono-addins/Mono.Addins/Mono.Addins/AddinManager.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins/AddinManager.cs   2007-12-03 
18:37:11 UTC (rev 90577)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins/AddinManager.cs   2007-12-03 
19:02:12 UTC (rev 90578)
@@ -43,7 +43,6 @@
                static string startupDirectory;
                static bool initialized;
                static IAddinInstaller installer;
-               static AddinLocalizer defaultLocalizer;
 
                public static event AddinErrorEventHandler AddinLoadError;
                public static event AddinEventHandler AddinLoaded;
@@ -97,10 +96,8 @@
                
                public static void InitializeDefaultLocalizer (IAddinLocalizer 
localizer)
                {
-                       if (localizer != null)
-                               defaultLocalizer = new AddinLocalizer 
(localizer);
-                       else
-                               defaultLocalizer = null;
+                       CheckInitialized ();
+                       SessionService.InitializeDefaultLocalizer (localizer);
                }
                
                internal static string StartupDirectory {
@@ -118,13 +115,29 @@
                
                public static AddinLocalizer DefaultLocalizer {
                        get {
-                               if (defaultLocalizer != null)
-                                       return defaultLocalizer; 
+                               CheckInitialized ();
+                               return SessionService.DefaultLocalizer;
+                       }
+               }
+               
+               public static AddinLocalizer CurrentLocalizer {
+                       get {
+                               CheckInitialized ();
+                               RuntimeAddin addin = 
SessionService.GetAddinForAssembly (Assembly.GetCallingAssembly ());
+                               if (addin != null)
+                                       return addin.Localizer;
                                else
-                                       return NullLocalizer.Instance;
+                                       return SessionService.DefaultLocalizer;
                        }
                }
                
+               public static RuntimeAddin CurrentAddin {
+                       get {
+                               CheckInitialized ();
+                               return SessionService.GetAddinForAssembly 
(Assembly.GetCallingAssembly ());
+                       }
+               }
+               
                internal static AddinSessionService SessionService {
                        get {
                                if (sessionService == null)

Modified: trunk/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs    
2007-12-03 18:37:11 UTC (rev 90577)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins/AddinSessionService.cs    
2007-12-03 19:02:12 UTC (rev 90578)
@@ -34,6 +34,7 @@
 
 using Mono.Addins.Description;
 using Mono.Addins.Database;
+using Mono.Addins.Localization;
 
 namespace Mono.Addins
 {
@@ -44,6 +45,8 @@
                ExtensionContext defaultContext;
                Hashtable nodeSets = new Hashtable ();
                Hashtable autoExtensionTypes = new Hashtable ();
+               Hashtable loadedAssemblies = new Hashtable ();
+               AddinLocalizer defaultLocalizer;
                
                internal void Initialize ()
                {
@@ -57,13 +60,54 @@
                        AppDomain.CurrentDomain.AssemblyLoad -= new 
AssemblyLoadEventHandler (OnAssemblyLoaded);
                        defaultContext = null;
                        loadedAddins.Clear ();
+                       loadedAssemblies.Clear ();
                        defaultContext = null;
                }
                
+               public void InitializeDefaultLocalizer (IAddinLocalizer 
localizer)
+               {
+                       if (localizer != null)
+                               defaultLocalizer = new AddinLocalizer 
(localizer);
+                       else
+                               defaultLocalizer = null;
+               }
+               
+               public AddinLocalizer DefaultLocalizer {
+                       get {
+                               if (defaultLocalizer != null)
+                                       return defaultLocalizer; 
+                               else
+                                       return NullLocalizer.Instance;
+                       }
+               }
+               
                internal ExtensionContext DefaultContext {
                        get { return defaultContext; }
                }
                
+               public AddinLocalizer CurrentLocalizer {
+                       get {
+                               Assembly asm = Assembly.GetCallingAssembly ();
+                               RuntimeAddin addin = GetAddinForAssembly (asm);
+                               if (addin != null)
+                                       return addin.Localizer;
+                               else
+                                       return DefaultLocalizer;
+                       }
+               }
+               
+               public RuntimeAddin CurrentAddin {
+                       get {
+                               Assembly asm = Assembly.GetCallingAssembly ();
+                               return GetAddinForAssembly (asm);
+                       }
+               }
+               
+               internal RuntimeAddin GetAddinForAssembly (Assembly asm)
+               {
+                       return (RuntimeAddin) loadedAssemblies [asm];
+               }
+               
                // Enables or disables conflict checking while loading 
assemblies.
                // Disabling makes loading faster, but less safe.
                public bool CheckAssemblyLoadConflicts {
@@ -94,6 +138,8 @@
                        if (addin != null) {
                                addin.UnloadExtensions ();
                                loadedAddins.Remove (Addin.GetIdName (id));
+                               foreach (Assembly asm in addin.Assemblies)
+                                       loadedAssemblies.Remove (asm);
                                AddinManager.ReportAddinUnload (id);
                        }
                }
@@ -174,6 +220,9 @@
                                foreach (ExtensionPoint ep in 
description.ExtensionPoints)
                                        InsertExtensionPoint (p, ep);
                                
+                               foreach (Assembly asm in p.Assemblies)
+                                       loadedAssemblies [asm] = p;
+                               
                                // Fire loaded event
                                defaultContext.NotifyAddinLoaded (p);
                                AddinManager.ReportAddinLoad (p.Id);

Modified: trunk/mono-addins/Mono.Addins/Mono.Addins/ExtensionNode.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins/ExtensionNode.cs  2007-12-03 
18:37:11 UTC (rev 90577)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins/ExtensionNode.cs  2007-12-03 
19:02:12 UTC (rev 90578)
@@ -62,6 +62,10 @@
                        }
                }
                
+               public ExtensionContext ExtensionContext {
+                       get { return treeNode.Context; }
+               }
+               
                public bool HasId {
                        get { return !Id.StartsWith 
(ExtensionTree.AutoIdPrefix); }
                }

Modified: trunk/mono-addins/Mono.Addins/Mono.Addins/RuntimeAddin.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins/RuntimeAddin.cs   2007-12-03 
18:37:11 UTC (rev 90577)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins/RuntimeAddin.cs   2007-12-03 
19:02:12 UTC (rev 90578)
@@ -72,6 +72,11 @@
                internal Addin Addin {
                        get { return ainfo; }
                }
+               
+               public override string ToString ()
+               {
+                       return ainfo.ToString ();
+               }
 
                void CreateResourceManagers ()
                {
@@ -118,7 +123,7 @@
                {
                        if (resourceManagers == null)
                                CreateResourceManagers ();
-
+                       
                        // Look in resources of this add-in
                        foreach (ResourceManager manager in resourceManagers)
                        {

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

Reply via email to