PropertyEditor is easier to customize now

The Configure() method is now called from Initialize() instead of from the constructor. This will allow derived classes to use parameters from their constructors in their override of Configure().
SonyWWS · Oct 30, 2014 · a944cc5 · a944cc5
1 parent 0ff57f7
commit a944cc5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/Framework/Atf.Gui.WinForms/Applications/PropertyEditor.cs b/Framework/Atf.Gui.WinForms/Applications/PropertyEditor.cs
@@ -22,7 +22,7 @@ namespace Sce.Atf.Applications
     public class PropertyEditor : IInitializable, IControlHostClient, IDisposable
     {
         /// <summary>
-        /// Constructor with paramters</summary>
+        /// Constructor with parameters</summary>
         /// <param name="commandService">ICommandService</param>
         /// <param name="controlHostService">IControlHostService</param>
         /// <param name="contextRegistry">IContextRegistry</param>
@@ -35,11 +35,6 @@ public class PropertyEditor : IInitializable, IControlHostClient, IDisposable
             CommandService = commandService;
             ControlHostService = controlHostService;
             ContextRegistry = contextRegistry;
-
-            Configure(out m_propertyGrid, out m_controlInfo);
-
-            m_propertyGrid.PropertyGridView.ContextRegistry = ContextRegistry;
-            m_propertyGrid.MouseUp += propertyGrid_MouseUp;
         }
 
         /// <summary>
@@ -57,7 +52,7 @@ protected virtual void Configure(out PropertyGrid propertyGrid, out ControlInfo
         }
 
         /// <summary>
-        /// Gets the internal property grid</summary>
+        /// Gets the internal property grid. Is available after Initialize() and Configure() are called.</summary>
         public PropertyGrid PropertyGrid
         {
             get { return m_propertyGrid; }
@@ -81,6 +76,11 @@ public SelectionPropertyEditingContext DefaultPropertyEditingContext
         /// Finishes initializing component by subscribing to event, registering control, and setting up Settings Service</summary>
         public virtual void Initialize()
         {
+            Configure(out m_propertyGrid, out m_controlInfo);
+
+            m_propertyGrid.PropertyGridView.ContextRegistry = ContextRegistry;
+            m_propertyGrid.MouseUp += propertyGrid_MouseUp;
+
             ContextRegistry.ActiveContextChanged += contextRegistry_ActiveContextChanged;
 
             ControlHostService.RegisterControl(m_propertyGrid, m_controlInfo, this);
@@ -222,8 +222,8 @@ private IPropertyEditingContext GetContext()
         [ImportMany]
         private IEnumerable<Lazy<IContextMenuCommandProvider>> m_contextMenuCommandProviders;
 
-        private readonly PropertyGrid m_propertyGrid;
-        private readonly ControlInfo m_controlInfo;
+        private PropertyGrid m_propertyGrid;
+        private ControlInfo m_controlInfo;
         private SelectionPropertyEditingContext m_defaultContext = new SelectionPropertyEditingContext();
     }
 }
diff --git a/wws_atf.component b/wws_atf.component
@@ -5,7 +5,7 @@
   xsi:schemaLocation="http://www.ship.scea.com/wws_sdk/component/v1 http://www.ship.scea.com/wws_sdk/component/v1.xsd">
 
   <readablename>Authoring Tools Framework</readablename>
-  <version>3.8.0.8</version>
+  <version>3.8.0.9</version>
   <owner>rlittle</owner>
   <platforms>PC</platforms>
   <category>Component</category>