reflexil fixes

Author: TELERIK\manev

Reflexil.JustDecompile/JustDecompileCecilStudioPackage.cs

@@ -26,6 +26,8 @@ namespace Reflexil.JustDecompile
 {
 	internal class JustDecompileCecilStudioPackage : CecilStudioPackage
 	{
+        public static event EventHandler HandleItemRequest = delegate { };
+
         public JustDecompileCecilStudioPackage() { }
 
 		public override object ActiveItem
@@ -38,16 +40,22 @@ public override object ActiveItem
 		public ITreeViewItem SelectedTreeViewItem { get; set; }
 		public void Delete()
 		{
+            HandleItemRequest(this, EventArgs.Empty);
+
 			this.DeleteMember(this, EventArgs.Empty);
 		}
 
 		public void Rename()
 		{
+            HandleItemRequest(this, EventArgs.Empty);
+
 			this.RenameItem(this, EventArgs.Empty);
 		}
 
 		internal AssemblyDefinition GetCurrentAssemblyDefinition()
 		{
+            HandleItemRequest(this, EventArgs.Empty);
+
 			return base.GetCurrentAssemblyDefinition();
 		}
 
@@ -63,11 +71,15 @@ internal string GetProductVersion()
 
 		internal void Inject(EInjectType injectType)
 		{
+            HandleItemRequest(this, EventArgs.Empty);
+
 			base.Inject(injectType);
 		}
 
 		internal void ReloadAssembly()
 		{
+            HandleItemRequest(this, EventArgs.Empty);
+
 			this.ReloadAssembly(this, EventArgs.Empty);
 
             ////string originallocation = GetCurrentModuleOriginalLocation();

Reflexil.JustDecompile/MenuItems/MenuItemBase.cs

@@ -19,68 +19,70 @@
 
 namespace Reflexil.JustDecompile
 {
-	internal abstract class MenuItemBase : MenuItem
-	{
-		public JustDecompileCecilStudioPackage StudioPackage;
-		public MenuItemBase(IEventAggregator eventAggregator) : base()
-		{
-			this.StudioPackage = new JustDecompileCecilStudioPackage();
-            
-			this.Header = StudioPackage.GetProductVersion();
+    internal abstract class MenuItemBase : MenuItem
+    {
+        public JustDecompileCecilStudioPackage StudioPackage;
 
-			eventAggregator.GetEvent<SelectedTreeViewItemChangedEvent>().Subscribe(SetReflexilHandler);
-		}
+        public MenuItemBase(IEventAggregator eventAggregator)
+            : base()
+        {
+            this.StudioPackage = new JustDecompileCecilStudioPackage();
 
-		public override void AddMenuItems()
-		{
-			this.Collection.Add(new MenuItem { Header = "Inject class", Command = new DelegateCommand(OnInjectClass) });
-			this.Collection.Add(new MenuItem { Header = "Inject interface", Command = new DelegateCommand(OnInterfaceClass) });
-			this.Collection.Add(new MenuItem { Header = "Inject struct", Command = new DelegateCommand(OnStructClass) });
-			this.Collection.Add(new MenuItem { Header = "Inject enum", Command = new DelegateCommand(OnEnumClass) });
-		}
+            this.Header = StudioPackage.GetProductVersion();
 
-		public void AddRenameDeleteNodes()
-		{
-			this.Collection.Add(new MenuItem { Header = "Rename...", Command = new DelegateCommand(OnRename) });
-			this.Collection.Add(new MenuItem { Header = "Delete", Command = new DelegateCommand(OnDelete) });
-		}
+            eventAggregator.GetEvent<SelectedTreeViewItemChangedEvent>().Subscribe(SetReflexilHandler);
+        }
 
-		private void OnDelete()
-		{
-			StudioPackage.Delete();
-		}
+        public override void AddMenuItems()
+        {
+            this.Collection.Add(new MenuItem { Header = "Inject class", Command = new DelegateCommand(OnInjectClass) });
+            this.Collection.Add(new MenuItem { Header = "Inject interface", Command = new DelegateCommand(OnInterfaceClass) });
+            this.Collection.Add(new MenuItem { Header = "Inject struct", Command = new DelegateCommand(OnStructClass) });
+            this.Collection.Add(new MenuItem { Header = "Inject enum", Command = new DelegateCommand(OnEnumClass) });
+        }
 
-		private void OnEnumClass()
-		{
-			StudioPackage.Inject(EInjectType.Enum);
-		}
+        public void AddRenameDeleteNodes()
+        {
+            this.Collection.Add(new MenuItem { Header = "Rename...", Command = new DelegateCommand(OnRename) });
+            this.Collection.Add(new MenuItem { Header = "Delete", Command = new DelegateCommand(OnDelete) });
+        }
 
-		private void OnInjectClass()
-		{
-			StudioPackage.Inject(EInjectType.Class);
-		}
+        private void OnDelete()
+        {
+            StudioPackage.Delete();
+        }
 
-		private void OnInterfaceClass()
-		{
-			StudioPackage.Inject(EInjectType.Interface);
-		}
+        private void OnEnumClass()
+        {
+            StudioPackage.Inject(EInjectType.Enum);
+        }
 
-		private void OnRename()
-		{
-			StudioPackage.Rename();
-		}
+        private void OnInjectClass()
+        {
+            StudioPackage.Inject(EInjectType.Class);
+        }
 
-		private void OnStructClass()
-		{
-			StudioPackage.Inject(EInjectType.Struct);
-		}
+        private void OnInterfaceClass()
+        {
+            StudioPackage.Inject(EInjectType.Interface);
+        }
 
-		private void SetReflexilHandler(ITreeViewItem selectedTreeItem)
-		{
-			if (selectedTreeItem != null)
-			{
-				this.StudioPackage.SelectedTreeViewItem = selectedTreeItem;
-			}
-		}
-	}
+        private void OnRename()
+        {
+            StudioPackage.Rename();
+        }
+
+        private void OnStructClass()
+        {
+            StudioPackage.Inject(EInjectType.Struct);
+        }
+
+        private void SetReflexilHandler(ITreeViewItem selectedTreeItem)
+        {
+            if (selectedTreeItem != null)
+            {
+                this.StudioPackage.SelectedTreeViewItem = selectedTreeItem;
+            }
+        }
+    }
 }

Reflexil.JustDecompile/ReflexilModule.cs

@@ -50,7 +50,10 @@ public class ReflexilModule : IModule, IPartImportsSatisfiedNotification, IPacka
 		private ModuleDefinitionContextMenu moduleDefinitionNodeContextMenu;
 		#endregion
 
-        public ReflexilModule() { }
+        public ReflexilModule()
+        {
+            JustDecompileCecilStudioPackage.HandleItemRequest += JustDecompileCecilStudioPackageHandleItemRequest;
+        }
 
 		public IHandler ActiveHandler { get; set; }
 
@@ -92,6 +95,14 @@ public void OnImportsSatisfied()
 			this.eventAggregator.GetEvent<TreeViewItemCollectionChangedEvent>().Subscribe(LoadAssembliesIntoPlugin);
 		}
 
+        private void JustDecompileCecilStudioPackageHandleItemRequest(object sender, EventArgs e)
+        {
+            if (this.selectedItem != null)
+            {
+                ActiveHandler = ReflexilWindow.HandleItem(this.selectedItem);
+            }
+        }
+
         private void OnClickExecuted()
         {
             if (!IsReflexilHostLoaded)