Commit: 4 - NeoFT.Workshop (svn)

FreeTrainの進化系を目指す

Commit MetaInfo

• Revision: 4 (tree)
• Time: 2013-11-10 17:45:07
• Author: c477

Log Message

Refactoring around pluginManager.
Pluginのロード方法、一覧ダイアログなど修正．

Change Summary

• modified: NeoFT.suo
• modified: framework/res/plugin_icons.bmp
• modified: framework/framework/Main.cs
• modified: framework/framework/plugin/Contribution.cs
• modified: framework/framework/plugin/PluginManager.cs
• modified: framework/framework/plugin/Plugin.cs
• modified: framework/framework/plugin/PluginXmlException.cs
• modified: framework/util/ContribListControlHelper.cs
• modified: ui_jp/ui/system/ErrorMessageBox.cs
• modified: ui_jp/ui/system/PluginListDialog.cs

Incremental Difference

--- framework/framework/Main.cs	(revision 3)
+++ framework/framework/Main.cs	(revision 4)
@@ -33,7 +33,7 @@
         public static readonly NftProperties resources = NftProperties.LoadFromFile(Directories.AppBaseDir + "nftfw.resource.xml", false);
 
 		/// <summary> Plug-ins. </summary>
-		public static readonly PluginManager plugins = new PluginManager();
+		public static readonly PluginManager pluginManager = new PluginManager();
 
 		#region sound and BGM
 /*		
@@ -89,7 +89,7 @@
 				// load global modules;
 				GlobalModules.Initialize();
 				// load plug-ins
-				Main.plugins.init(new string[]{Directories.PluginDir}, monitor);
+				Main.pluginManager.init(new string[]{Directories.PluginDir}, monitor);
 			}
 
 			//new PluginListDialog().ShowDialog();

--- framework/framework/plugin/Contribution.cs	(revision 3)
+++ framework/framework/plugin/Contribution.cs	(revision 4)
@@ -220,12 +220,18 @@
 		/// </summary>
 		public virtual Assembly Assembly { get { return this.GetType().Assembly; } }
 
+        public bool IsPrimitive {
+            get {
+                return IsPrimitiveContribution(this.GetType());
+            }
+        }
+
         /// <summary>
         /// return true if specified class has 'PrimitiveContribution' Attribute.
         /// </summary>
         /// <param name="type"></param>
         /// <returns></returns>
-        public static bool isPrimitiveContribution(Type type) {
+        public static bool IsPrimitiveContribution(Type type) {
             object[] o = type.GetCustomAttributes(typeof(PrimitiveContributionAttribute),true);
             return (o != null && o.Length > 0);
         }
@@ -267,7 +273,7 @@
 		internal sealed class ReferenceImpl : IObjectReference {
 			private string id=null;
 			public object GetRealObject(StreamingContext context) {
-				object o = Main.plugins.GetContribution(id);
+				object o = PluginManager.theInstance.GetContribution(id);
 				if(o==null)
 					throw new SerializationException(
 						"コントリビューション\""+id+"\"を含むプラグインが見つかりません");

--- framework/framework/plugin/PluginManager.cs	(revision 3)
+++ framework/framework/plugin/PluginManager.cs	(revision 4)
@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Reflection;
@@ -29,24 +30,19 @@
 		public ParseEventHandler BeforeContributionParse;
 
 		/// <summary>
-		/// All loaded plug-ins.
-		/// </summary>
-		private Plugin[] plugins;
-
-		/// <summary>
 		/// Plugins keyed by their names.
 		/// </summary>
-		private readonly Hashtable pluginMap = new Hashtable();
+        private readonly Dictionary<string, Plugin> pluginMap = new Dictionary<string, Plugin>();
 		
 		/// <summary>
 		/// Contribution factories that are used to load contributions.
 		/// </summary>
-		private readonly Hashtable contributionFactories = new Hashtable();
+        private readonly Dictionary<string, IContributionFactory> contributionFactories = new Dictionary<string, IContributionFactory>();
 
 		/// <summary>
 		/// Contributions keyed by their IDs.
 		/// </summary>
-		private readonly Hashtable contributionMap = new Hashtable();
+        private readonly Dictionary<string, Contribution> contributionMap = new Dictionary<string, Contribution>();
 
 		/// <summary>
 		/// Contribution Types keyed by their CtbTypes (string specified a Type of Contribution).
@@ -71,12 +67,12 @@
 		public void init( ICollection dirs, ProgressMonitor monitor ) 
 		{
 			errCount=0;
-			ArrayList pluginSet=SeekPluginDirectories(dirs,monitor);
+			IList<Plugin> pluginSet=SeekPluginDirectories(dirs,monitor);
 
-			SolveDependency(pluginSet, monitor);
-			LoadContributions(monitor);
-			InitContributions(monitor);
-
+            Plugin[] plugins = SolveDependency(pluginSet, monitor);
+            LoadContributions(plugins, monitor);
+            InitContributions(monitor);
+            DisposeReaders();
 //			if( errCount!=0 ) {
 //				// error during the initialization
 //				Environment.Exit(errCount);
@@ -91,8 +87,8 @@
 		}
 	
 		#region initialization processes
-        private ArrayList SeekPluginDirectories(ICollection directories, ProgressMonitor monitor) {
-            ArrayList pluginSet = new ArrayList();
+        private IList<Plugin> SeekPluginDirectories(ICollection directories, ProgressMonitor monitor) {
+            List<Plugin> pluginSet = new List<Plugin>();
             monitor.Progress(1, 1, "プラグインを検索中");
             string[][] subdirs = new string[directories.Count][];
             int n = 0;
@@ -110,7 +106,7 @@
             }
             return pluginSet;
         }
-        private void ProcessSubDirectories(ArrayList pluginSet, string parent, string[] subdirs, ProgressMonitor monitor)
+        private void ProcessSubDirectories(IList<Plugin> pluginSet, string parent, string[] subdirs, ProgressMonitor monitor)
 		{
 			foreach( string dir in subdirs )
 			{								
@@ -130,7 +126,7 @@
                     ParamsReader reader = new ParamsReader(path, parser);
 					pluginSet.Add( p );
                     p.LoadParams(reader["plug-in"]);
-					if( pluginMap.Contains(p.ID) ) 
+					if( pluginMap.ContainsKey(p.ID) ) 
 					{
 						p._state = InstallationState.FatalError;
 						// loaded more than once
@@ -137,7 +133,7 @@
 						// maybe same subdir name in different plugin dirs.
 						throw new Exception( string.Format(
 							"プラグイン「{0}」は{1}と{2}の二箇所からロードされています",
-							p.ID, p.Uri, ((Plugin)pluginMap[p.ID]).Uri) );
+							p.ID, p.Uri, (pluginMap[p.ID]).Uri) );
 					}
 					pluginMap.Add( p.ID, p );
 				} 
@@ -154,31 +150,45 @@
 			}			
 		}
 
-		private void SolveDependency(ArrayList pluginSet, ProgressMonitor monitor)
+        private Plugin[] SolveDependency(IList<Plugin> pluginSet, ProgressMonitor monitor)
 		{// convert it to an array by sorting them in the order of dependency
 			monitor.Progress(1,1,"依存関係を整理中");
 			monitor.SetMaximum(2,pluginSet.Count);
 
-			this.plugins = new Plugin[pluginSet.Count];
+			Plugin[] plugins = new Plugin[pluginSet.Count];
 			int ptr=0;
-
+            
+            // Add system default plugin to the order-list at first.
+            Plugin p = GetPlugin("system");
+            monitor.Progress(2, 1, p.ID);
+            plugins[ptr++] = p;
+            pluginSet.Remove(p);
+            // Loop until pluginSet becomes empty.
 			while( pluginSet.Count>0 ) 
 			{
-				Plugin p = (Plugin)pluginSet[0];
+				p = pluginSet[0];
 				monitor.Progress(2,1,p.ID);
 				try 
 				{
-					while(true) 
+                    Plugin pr;
+                    while(true) 
 					{
-						Plugin[] deps = p.getDependencies();
-						int i;
-						for( i=0; i<deps.Length; i++ )
-							if( pluginSet.Contains(deps[i]) )
-								break;
-						if(i==deps.Length)
-							break;
-						else
-							p = deps[i];
+                        List<Plugin> deps = GetDependencies(p, p._reader);
+                        pr = null;
+                        // Pick a dependent plugin from remaining-list (if exist).
+                        foreach (Plugin p2 in deps) {
+                            if (pluginSet.Contains(p2)) {
+                                pr = p2;
+                                break;
+                            }
+                        }
+                        if (pr == null) {
+                            // exit inner while loop to add current 'p' to the orde-list.
+                            break;
+                        } else {
+                            // 'pr' is the one to load earlier, so check dependency of 'pr' next.
+                            p = pr;
+                        }
 					}
 				} 
 				catch( Exception e ) 
@@ -185,13 +195,14 @@
 				{					
 					ReportError(e.Message,e);
 				}
-
+                // Add 'p' to order-list and remove from remaining-list
 				pluginSet.Remove(p);
 				plugins[ptr++] = p;
 			}
+            return plugins;
 		}
 
-		private void LoadContributions(ProgressMonitor monitor)
+		private void LoadContributions(Plugin[] plugins, ProgressMonitor monitor)
 		{
 			//	 load all the contributions
 			monitor.Progress(1,1,"コントリビューションをロード中");
@@ -202,7 +213,7 @@
 				monitor.Progress(2,1,p.ID);
 				try 
 				{
-					p.loadBinaries();
+					LoadBinaries(p, p._reader);
 				} 
 				catch( Exception e ) 
 				{
@@ -216,9 +227,8 @@
 				try 
 				{
 					// this will call AddContribution method
-					p.loadContributions();
-					p._state = InstallationState.Ready;
-				} 
+					LoadContributions(p, p._reader);
+                } 
 				catch( Exception e ) 
 				{
                     p._state = InstallationState.FatalError;
@@ -229,13 +239,16 @@
 
 		private void InitContributions(ProgressMonitor monitor)
 		{
-			// initialize contributions
 			monitor.Progress(1,1,"コントリビューションを初期化中");
-            Contribution[] arrprm = PrimitiveContributions;
-            Contribution[] arrctb = Contributions;
-            monitor.SetMaximum(2, arrctb.Length+arrprm.Length);
+            IList nonPrimitives = new List<Contribution>(contributionMap.Count);
+            monitor.SetMaximum(2, contributionMap.Count);
             Hashtable handlers = new Hashtable();
-            foreach (Contribution contrib in arrprm) {
+            // Initialize all primitive contirbutions before Non primitive contributions.
+            foreach (Contribution contrib in contributionMap.Values) {
+                if(!contrib.IsPrimitive){
+                    nonPrimitives.Add(contrib);
+                    continue;
+                }
                 try {
                     InitCompleteEventHandler h = contrib.Initialize();
                     if (h != null) {
@@ -251,7 +264,7 @@
                     ReportError(string.Format(templ, contrib.Parent.ID, "contrib.name", contrib.ID), e);
                 }
             }
-            foreach (Contribution contrib in arrctb) 
+            foreach (Contribution contrib in nonPrimitives) 
 			{
 				try 
 				{
@@ -286,6 +299,16 @@
             }
 		}
 
+        private void DisposeReaders() {
+            foreach (Plugin p in pluginMap.Values) {
+                IDisposable pr = p._reader as IDisposable;
+                p._reader = null;
+                if (pr!=null) {
+                    pr.Dispose();
+                }
+            }
+        }
+
 		internal void ReportError(string msg, Exception e)
 		{
             errCount++;
@@ -311,7 +334,129 @@
 			return Directories.PluginDir;
 		}
 
-		#region called from Plugin constructor
+		#region Loading contributions for eacn Plugins.
+        /// <summary>
+        /// Get all the dependent plug-ins.
+        /// called from PluginManager before initialize this plugin.
+        /// </summary>
+        public List<Plugin> GetDependencies(Plugin p, ParamsReader _reader) {
+            List<Plugin> a = new List<Plugin>();
+            foreach (ParamsReader depend in _reader.EnumChildren("depend")) {
+                string name = depend["on"].InnerText;
+                Plugin p2 = GetPlugin(name);
+                if (p2 == null) {
+                    string templ = Main.resources["plugin.dependency_not_found"].stringValue;
+                    throw new Exception(String.Format(templ, p.ID, name));
+                }
+                a.Add(p2);
+            }
+            return a;
+        }
+
+        /// <summary>
+        /// Loads class type contributions from this plug-in
+        /// </summary>
+        internal void LoadBinaries(Plugin p, ParamsReader _reader) {
+            // locate contribution factories first,
+            // because we'll need them to load contributions.
+            foreach (ParamsReader ctb_reader in _reader.EnumChildren("contribution")) {
+                string type = ctb_reader["type"].InnerText;
+                try {
+                    Contribution cb = null;
+                    // load a contribution factory
+                    if ("factory".Equals(type)) {
+                        NotifyStartParse(p, ctb_reader);
+                        ParamsReader nd = ctb_reader["declare"];
+                        string regtype;
+                        if (!nd.IsNull) {
+                            regtype = nd["type"].InnerText;
+                        } else {
+                            // use name property for alternative.
+                            regtype = ctb_reader["name"].InnerText;
+                        }
+                        object[] args = new object[] { ctb_reader };
+                        // create and register contribution factory
+                        IContributionFactory factory =
+                            PluginUtil.createCtbFactory(p, ctb_reader);
+                        AddContributionFactory(regtype, factory);
+                        cb = factory as Contribution;
+                        // Register dummy contribution (in order to list on Dialog).
+                        if (cb == null) {
+                            cb = new CtbContributionDefiner(p, ctb_reader);
+                        }
+                    } else if ("binary".Equals(type)) {
+                        NotifyStartParse(p, ctb_reader);
+                        cb = PluginUtil.createContributionObject(p, ctb_reader) as BinaryModule;
+                        if (cb == null) {
+                            // create dummy module for list Dialog
+                            cb = new BinaryModule(p, ctb_reader);
+                        }
+                    } else {
+                        continue;
+                    }
+                    cb.Attach();
+                    cb._state = InstallationState.Ready;
+                } catch (Exception e) {
+                    p._state = InstallationState.FatalError;
+                    string msg = MakeContribExceptionMessage(p, ctb_reader);
+                    throw new Exception(msg, e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Loads contributions from this plug-in
+        /// </summary>
+        internal void LoadContributions(Plugin p, ParamsReader _reader) {
+            Contribution c = null;
+            int count = 0;
+            int errors = 0;
+            // load contributions
+            foreach (ParamsReader ctb_reader in _reader.EnumChildren("contribution")) {
+                try {
+                    count++;
+                    string type = ctb_reader["type"].InnerText;
+                    if ("factory".Equals(type) || "binary".Equals(type)) continue;	// ignore
+
+                    NotifyStartParse(p, ctb_reader);
+                    IContributionFactory factory = GetContributionFactory(type);
+                    c = factory.load(p, ctb_reader);
+                    c.Attach();
+                    if (c.IsDetachable) {
+                        p.AssociateAddableContribution(c);
+                    }
+                    AddContribution(c);
+                    c._state = InstallationState.Ready;
+                } catch (Exception e) {
+                    errors++;
+                    Debug.WriteLine(e.Message);
+                    Debug.WriteLine(e.StackTrace);
+                    if (e.InnerException != null) {
+                        Debug.WriteLine(e.InnerException.Message);
+                        Debug.WriteLine(e.InnerException.StackTrace);
+                    }
+                    if (c != null)
+                        c._state = InstallationState.FatalError;
+                    string msg = MakeContribExceptionMessage(p, ctb_reader);
+                    if (p._state != InstallationState.FatalError)
+                        p._state = InstallationState.PartialError;
+                    ReportError(msg, e);
+                }
+            }
+            if (p._state != InstallationState.FatalError && errors == count) {
+                p._state = InstallationState.FatalError;
+            } else if (p._state == InstallationState.Uninitialized) {
+                p._state = InstallationState.Ready;
+            }
+        }
+
+        private string MakeContribExceptionMessage(Plugin p, ParamsReader pr) {
+            string templ = Main.resources["plugin.contrib_load_error"].stringValue;
+            string _id = pr["id"].InnerTextOr("unknown");
+            string _name = pr["name"].InnerTextOr("unknown");
+            return string.Format(templ, p.Uri.AbsoluteUri, _name, _id);
+        }
+
 		/// <summary>
 		/// Registers a <c>ContributionFactory</c>.
 		/// This method has to be called before the initialization.
@@ -320,7 +465,7 @@
 		/// </summary>
 		public void AddContributionFactory( string name, IContributionFactory factory ) 
 		{
-			if( contributionFactories.Contains(name) )
+			if( contributionFactories.ContainsKey(name) )
 				throw new Exception(string.Format(
 					"contribution type \"{0}\" is already registered.",name));
 
@@ -329,8 +474,7 @@
 
 		// 
 		public IContributionFactory GetContributionFactory( string name ) {
-			IContributionFactory factory = (IContributionFactory)
-				contributionFactories[name];
+			IContributionFactory factory = contributionFactories[name];
 			if(factory==null)
 				throw new Exception(name+"は未知のコントリビューションです");
 			else
@@ -341,43 +485,41 @@
 		/// <summary>
 		/// Lists up contributions of the given type.
 		/// </summary>
+        [Obsolete("Use EnumContributions")]
 		public Array ListContributions( Type contributionType, bool hideDisabled ) 
 		{
 			ArrayList list = new ArrayList();
-			foreach( Plugin p in plugins ) {
-				foreach( Contribution contrib in p.Contributions ) {
-					if( contributionType.IsInstanceOfType(contrib) )
-						if( !hideDisabled || contrib.IsAttached )
-							list.Add(contrib);
-				}
+			foreach( Contribution contrib in contributionMap.Values) {
+				if( contributionType.IsInstanceOfType(contrib) )
+					if( !hideDisabled || contrib.IsAttached )
+						list.Add(contrib);
 			}
-
 			return list.ToArray(contributionType);
 		}
 
+        public IEnumerable<Contribution> EnumContributions(Type contributionType, bool hideDisabled) {
+            return new ContributionEnumerator(contributionType, hideDisabled);
+        }
 
+
 		/// <summary>
 		/// Gets all contributions.
 		/// </summary>
-		public Contribution[] Contributions {
+		public IEnumerable<Contribution> Contributions {
 			get {
-				ArrayList list = new ArrayList();
-				foreach( Plugin p in plugins )
-					foreach( Contribution contrib in p.Contributions )
-						list.Add(contrib);
-
-				return (Contribution[])list.ToArray(typeof(Contribution));
+				return new ContributionEnumerator(false);
 			}
 		}
 
-        private Contribution[] PrimitiveContributions {
+        public IEnumerable<Plugin> Plugins {
             get {
-                ArrayList list = new ArrayList();
-                foreach (Plugin p in plugins)
-                    foreach (Contribution contrib in p.Primitives)
-                        list.Add(contrib);
+                return new PluginEnumerator();
+            }
+        }
 
-                return (Contribution[])list.ToArray(typeof(Contribution));
+        public IEnumerable<IContributionFactory> Factories {
+            get {
+                return new FactoryEnumerator();
             }
         }
 
@@ -394,23 +536,15 @@
 		/// Gets the contribution with a given ID, or null if not found.
 		/// </summary>
 		public Contribution GetContribution( string id ) {
-			return (Contribution)contributionMap[id];
+			return contributionMap[id];
 		}
 
 		/// <summary>
-		/// Enumerates all plug-in objects.
-		/// </summary>
-		public IEnumerator GetEnumerator() 
-		{
-			return plugins.GetEnumerator();
-		}
-
-		/// <summary>
 		/// Get the plug-in of the specified name, or null if not found.
 		/// </summary>
 		public Plugin GetPlugin( string name ) 
 		{
-			return (Plugin)pluginMap[name];
+			return pluginMap[name];
 		}
 
 		public Type GetDefinedType( string ctbType )
@@ -424,10 +558,10 @@
 
 		public string GetInstallInfo()
 		{
-			if(plugins == null )
+            if (pluginMap.Count == 0)
 				return "";
 			string output = "Installed Plugins (except for system plugins).";
-			foreach(Plugin p in plugins)
+			foreach(Plugin p in pluginMap.Values)
 			{
 				if(!p.ID.StartsWith("system"))
 				{
@@ -437,5 +571,71 @@
 			}
 			return output;
 		}
-	}
+
+
+        internal class FactoryEnumerator : IEnumerable<IContributionFactory>
+        {
+            public FactoryEnumerator() {
+            }
+
+            public IEnumerator<IContributionFactory> GetEnumerator() {
+                foreach (IContributionFactory fct in PluginManager.theInstance.contributionFactories.Values)
+                    yield return fct;
+            }
+
+            System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() {
+                return GetEnumerator();
+            }
+        }
+
+        internal class PluginEnumerator : IEnumerable<Plugin>
+        {
+            public PluginEnumerator() {
+            }
+
+            public IEnumerator<Plugin> GetEnumerator() {
+                foreach (Plugin p in PluginManager.theInstance.pluginMap.Values)
+                    yield return p;
+            }
+
+            System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() {
+                return GetEnumerator();
+            }
+        }
+
+        internal class ContributionEnumerator : IEnumerable<Contribution>
+        {
+            readonly Type type;
+            readonly bool hideDisabled;
+            public ContributionEnumerator(bool hideDisable) : this(null, hideDisable) { }
+
+            public ContributionEnumerator(Type t) : this(t, true) { }
+
+            public ContributionEnumerator(Type t, bool hideDisable) {
+                this.type = t;
+                this.hideDisabled = hideDisable;
+            }
+
+            public IEnumerator<Contribution> GetEnumerator() {
+                if (type == null) {
+                    foreach (Contribution c in PluginManager.theInstance.contributionMap.Values)
+                        if (!hideDisabled || c.IsAttached)
+                            yield return c;
+                } else {
+                    foreach (Contribution c in PluginManager.theInstance.contributionMap.Values) {
+                        if (type.IsInstanceOfType(c)) {
+                            if (!hideDisabled || c.IsAttached)
+                                yield return c;
+                        }
+                    }
+                }
+            }
+
+            System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() {
+                return GetEnumerator();
+            }
+        }
+    
+    }
+
 }

--- framework/framework/plugin/Plugin.cs	(revision 3)
+++ framework/framework/plugin/Plugin.cs	(revision 4)
@@ -49,16 +49,6 @@
         public readonly Uri Uri;
 
         /// <summary>
-        /// All the contributions in this plug-in
-        /// </summary>
-        public readonly IList Contributions = new ArrayList();
-
-        /// <summary>
-        /// All the contribution definers and binary modules in this plug-in
-        /// </summary>
-        public readonly IList Primitives = new ArrayList();
-
-        /// <summary>
         /// ParamsReader is given from PluginManager and will set null after loading complete.
         /// </summary>
         internal protected ParamsReader _reader;
@@ -119,6 +109,15 @@
                     onDetach(this);
             }
         }
+
+        internal void AssociateAddableContribution(Contribution c){
+            if (c.IsDetachable) {
+                totalDetachables++;
+                detachable = true;
+                c.OnAttach += new AttachChangeEvent(this.AttachChangeEventHandler);
+                c.OnDetach += new AttachChangeEvent(this.AttachChangeEventHandler);
+            }
+        }
         #endregion
 
         /// <summary>
@@ -161,7 +160,33 @@
             }
         }
 
+
         /// <summary>
+        /// All the contributions in this plug-in
+        /// </summary>
+        public IList Contributions {
+            get {
+                IList l = new ArrayList();
+                foreach (Contribution c in PluginManager.theInstance.Contributions) {
+                    if (c.Parent == this)
+                        l.Add(c);
+                }
+                return l;
+            }
+        }
+
+        /// <summary>
+        /// All the contribution definers and binary modules in this plug-in
+        /// </summary>
+        [Obsolete]
+        public IList Primitives {
+            get {
+                return new ArrayList();
+            }
+        }
+
+        /*
+        /// <summary>
         /// Get all the dependent plug-ins.
         /// called from PluginManager before initialize this plugin.
         /// </summary>
@@ -223,7 +248,7 @@
                     } else {
                         continue;
                     }
-                    if (Contribution.isPrimitiveContribution(cb.GetType())) {
+                    if (Contribution.IsPrimitiveContribution(cb.GetType())) {
                         Primitives.Add(cb);
                     } else {
                         Contributions.Add(cb);
@@ -243,9 +268,12 @@
         /// </summary>
         internal void loadContributions() {
             Contribution c = null;
+            int count = 0;
+            int errors = 0;
             // load contributions
             foreach (ParamsReader contrib in _reader.EnumChildren("contribution")) {
                 try {
+                    count++;
                     string type = contrib["type"].InnerText;
                     if ("factory".Equals(type) || "binary".Equals(type)) continue;	// ignore
 
@@ -263,6 +291,7 @@
                     PluginManager.theInstance.AddContribution(c);
                     c._state = InstallationState.Ready;
                 } catch (Exception e) {
+                    errors++;
                     Debug.WriteLine(e.Message);
                     Debug.WriteLine(e.StackTrace);
                     if (e.InnerException != null) {
@@ -272,14 +301,16 @@
                     if (c != null)
                         c._state = InstallationState.FatalError;
                     string msg = MakeContribExceptionMessage(contrib);
-                    
-					if(_state != InstallationState.FatalError)
-						_state = InstallationState.PartialError;
-					PluginManager.theInstance.ReportError(msg,e);
+                    if (_state != InstallationState.FatalError)
+                        _state = InstallationState.PartialError;
+                    PluginManager.theInstance.ReportError(msg, e);
                 }
             }
-            if (_state == InstallationState.Uninitialized)
+            if (_state != InstallationState.FatalError && errors == count) {
+                _state = InstallationState.FatalError;
+            } else if (_state == InstallationState.Uninitialized) {
                 _state = InstallationState.Ready;
+            }
         }
 
         private string MakeContribExceptionMessage(ParamsReader pr) {
@@ -288,5 +319,6 @@
             string _name = pr["name"].InnerTextOr("unknown");
             return string.Format(templ, Uri.AbsoluteUri, _name, _id);
         }
+        */
     }
 }

--- framework/framework/plugin/PluginXmlException.cs	(revision 3)
+++ framework/framework/plugin/PluginXmlException.cs	(revision 4)
@@ -39,7 +39,7 @@
 			if(plugin==null)
 			{
 				string pname = Path.GetFileName(Path.GetDirectoryName(node.SourceURI)+"");
-				plugin = Main.plugins.GetPlugin(pname);
+				plugin = PluginManager.theInstance.GetPlugin(pname);
 			}
 		}
 

--- framework/util/ContribListControlHelper.cs	(revision 3)
+++ framework/util/ContribListControlHelper.cs	(revision 4)
@@ -2,6 +2,7 @@
 using System.Windows.Forms;
 using nft.framework;
 using nft.framework.plugin;
+using System.Collections.Generic;
 
 namespace nft.util
 {
@@ -14,10 +15,10 @@
 
 		public static int Set( ComboBox combo, string ctbType, bool hideDisabled, IListContribFilter filter )
 		{
-			Array arr = GetArray( ctbType, hideDisabled );
-			if( arr == null ) return -1;
+			IEnumerable<Contribution> en = GetArray( ctbType, hideDisabled );
+			if( en == null ) return -1;
 			int n = 0;
-			foreach( Contribution c in arr )
+			foreach( Contribution c in en )
 				if(filter.IsValid(c))
 				{
 					combo.Items.Add( new AbstractItem(c) );
@@ -65,12 +66,12 @@
             }
         }
 
-		private static Array GetArray( string ctbType, bool hideDisabled )
+		private static IEnumerable<Contribution> GetArray( string ctbType, bool hideDisabled )
 		{
 			PluginManager pm = PluginManager.theInstance;
 			Type t = pm.GetDefinedType(ctbType);
 			if( t == null ) return null;
-			return pm.ListContributions(t,hideDisabled);
+			return pm.EnumContributions(t,hideDisabled);
 		}
 
 		#region Default Filter

--- ui_jp/ui/system/ErrorMessageBox.cs	(revision 3)
+++ ui_jp/ui/system/ErrorMessageBox.cs	(revision 4)
@@ -61,8 +61,8 @@
             sb.AppendLine("-----System Information-----");
             sb.AppendLine(ConfigureService.GetSystemInfo());
             sb.AppendLine("-----PlugIn Information-----");
-            if (Main.plugins != null) {
-                sb.AppendLine(Main.plugins.GetInstallInfo());
+            if (Main.pluginManager != null) {
+                sb.AppendLine(Main.pluginManager.GetInstallInfo());
             } else {
                 sb.AppendLine("Plugin manager not initialized.");
             }

--- ui_jp/ui/system/PluginListDialog.cs	(revision 3)
+++ ui_jp/ui/system/PluginListDialog.cs	(revision 4)
@@ -1,6 +1,7 @@
 using System;
 using System.Drawing;
 using System.Collections;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Windows.Forms;
 using nft.framework;
@@ -9,6 +10,7 @@
 using nft.util;
 using nft.win32util;
 using nft.controls;
+using System.IO;
 
 namespace nft.ui.system
 {
@@ -293,13 +295,17 @@
 			// populate the list
 			clist.Items.Clear();
 			plist.Items.Clear();
-			foreach( Plugin p in Main.plugins )
+			foreach( Plugin p in PluginManager.theInstance.Plugins )
 				plist.Items.Add( CreateListItem(p) );
 
 			// construct tree
 			tree.Nodes.Clear();
-			foreach( Plugin p in Main.plugins )
-				tree.Nodes.Add( CreateTreeItem(p) );
+            foreach (IContributionFactory f in PluginManager.theInstance.Factories) {
+                Type t = f.OutputType;
+                tree.Nodes.Add(CreateTreeItem(f));
+            }
+            //foreach (Plugin p in PluginManager.theInstance.Plugins)
+				//tree.Nodes.Add( CreateTreeItem(p) );
 		}
 
 		private void list_ColumnClick(object sender, System.Windows.Forms.ColumnClickEventArgs e)
@@ -323,24 +329,52 @@
 			{
 				Application.DoEvents();
 				Plugin p = (Plugin)item.Tag;
-                foreach (Contribution c in p.Primitives)
-					clist.Items.Add( CreateListItem(c) );
-				foreach( Contribution c in p.Contributions ) 
-					clist.Items.Add( CreateListItem(c) );
-			}
+                foreach (Contribution c in p.Contributions) {
+                    clist.Items.Add(CreateListItem(c));
+                }
+            }
 		}
 
 		private void tree_BeforeExpand(object sender, System.Windows.Forms.TreeViewCancelEventArgs e)
 		{
-			Plugin p = e.Node.Tag as Plugin;
+            IContributionFactory f = e.Node.Tag as IContributionFactory;
+            if (f != null) {
+                e.Node.Nodes.Clear();
+                foreach (Contribution c in PluginManager.theInstance.EnumContributions(f.OutputType,false)) {
+                    Plugin p = c.Parent;
+                    TreeNode pnode = null;
+                    foreach (TreeNode tn in e.Node.Nodes) {
+                        if (tn.Tag == p) {
+                            pnode = tn;
+                            break;
+                        }
+                    }
+                    if (pnode == null) {
+                        pnode = CreateTreeItem(p);
+                        e.Node.Nodes.Add(pnode);
+                    }
+                    pnode.Nodes.Add(CreateTreeItem(c));
+                }
+                return;
+            }
+            /*
+            Plugin p = e.Node.Tag as Plugin;
 			if(p!=null)
 			{
 				e.Node.Nodes.Clear();
-                foreach (Contribution c in p.Primitives) 
-					e.Node.Nodes.Add( CreateTreeItem(c) );
-				foreach( Contribution c in p.Contributions ) 
-					e.Node.Nodes.Add( CreateTreeItem(c) );
-			}
+                List<Contribution> prim = new List<Contribution>();
+                foreach (Contribution c in p.Contributions) {
+                    if (c.IsPrimitive) {
+                        prim.Add(c);
+                    } else {
+                        e.Node.Nodes.Add(CreateTreeItem(c));
+                    }
+                }
+                int i = 0;
+                foreach (Contribution c in prim)
+                    e.Node.Nodes.Insert(i++,CreateTreeItem(c));
+            }
+            */
 		}
 
 		private void tree_AfterSelect(object sender, System.Windows.Forms.TreeViewEventArgs e)
@@ -347,7 +381,16 @@
 		{
 			ShowInfoMessage();
 			string msg;
-			Plugin p = e.Node.Tag as Plugin;
+            IContributionFactory f = e.Node.Tag as IContributionFactory;
+            if (f != null) {
+                string dllname = Path.GetFileName(new Uri(f.GetType().Assembly.CodeBase).LocalPath);
+                msg = string.Format("Type:{0}\nFactory:{1}\nCodeBase:{2}", f.OutputType.Name, f.GetType().FullName, dllname);
+                info.Text = msg;
+                info.LinkArea = new LinkArea(0, 0);
+                info.TargetUrl = "";
+                return;
+            } 
+            Plugin p = e.Node.Tag as Plugin;
 			if(p!=null)
 			{
 				msg = string.Format("Title:{0}\nAuthor:{1}\nHomepage:{2}",p.Title,p.author,p.homepage);
@@ -368,7 +411,7 @@
 			Contribution c = e.Node.Tag as Contribution;
 			if(c!=null)
 			{
-				msg = string.Format("Name:{0}\nType:{1}",c.Name,c.CtbType);
+                msg = string.Format("ID:{0}\nName:{1}\nDescription:{2}", c.ID, c.Name, c.Description);
 				info.Text = msg;
 				info.LinkArea = new LinkArea(0,0);
 				info.TargetUrl="";
@@ -396,7 +439,7 @@
 			switch(c.State)
 			{
 				case InstallationState.Ready:
-                    if (Contribution.isPrimitiveContribution(c.GetType()))	
+                    if (c.IsPrimitive)	
 						return 4;
 					else
 						return 1;
@@ -413,6 +456,8 @@
 					return 0;
 				case InstallationState.PartialError:
 					return 3;
+                case InstallationState.FatalError:
+                    return 5;
 				default:
 					return 2;
 			}
@@ -437,7 +482,7 @@
 		private TreeNode CreateTreeItem(Contribution c)
 		{
 			int icon = GetIconIndex(c);
-			TreeNode node = new TreeNode(c.ID, icon, icon );
+			TreeNode node = new TreeNode(c.Name, icon, icon );
 			node.Tag = c;				
 			node.Checked = c.IsAttached;
 			return node;
@@ -484,9 +529,9 @@
 		private void tree_BeforeCheck(object sender, System.Windows.Forms.TreeViewCancelEventArgs e)
 		{
 			TreeNode node = e.Node;
-			IAddable addable = node.Tag as IAddable;
+            Contribution addable = node.Tag as Contribution;
 			 if(e.Action != TreeViewAction.ByMouse && e.Action !=TreeViewAction.ByKeyboard ) return;
-			if( addable.IsDetachable )
+             if (addable!=null && addable.IsDetachable)
 			{
 				if(node.Checked)
 					addable.Detach();
@@ -538,15 +583,22 @@
 		{
 		}
 	
-		private TreeNode CreateTreeItem(Plugin p)
+		private TreeNode CreateTreeItem(IContributionFactory f)
 		{
-			int icon = GetIconIndex(p);
-			TreeNode node = new TreeNode(p.ID, icon, icon, new TreeNode[]{new TreeNode("")} );
-			node.Tag = p;				
-			node.Checked = p.IsAttached;
+			int icon = 6;
+			TreeNode node = new TreeNode(f.OutputType.Name, icon, icon, new TreeNode[]{new TreeNode("")} );
+			node.Tag = f;
+			node.Checked = true;
 			return node;
 		}
-		#endregion
+        private TreeNode CreateTreeItem(Plugin p) {
+            int icon = GetIconIndex(p);
+            TreeNode node = new TreeNode(p.ID, icon, icon);
+            node.Tag = p;
+            node.Checked = p.IsAttached;
+            return node;
+        }
+        #endregion
 		
 		internal class Sorter : IComparer
 		{