Merge pull request #51 from kanonji/patch-4

Initialize TemplatePath when ScriptableObject asset created
kimsama · Dec 15, 2017 · f434e7e · f434e7e
2 parents ea1da26 + 61f04ff
commit f434e7e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 17 deletions.
diff --git a/Assets/QuickSheet/ExcelPlugin/Editor/ExcelMachine.cs b/Assets/QuickSheet/ExcelPlugin/Editor/ExcelMachine.cs
@@ -1,7 +1,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///
 /// ExcelMachine.cs
-/// 
+///
 /// (c)2014 Kim, Hyoun Woo
 ///
 ///////////////////////////////////////////////////////////////////////////////
@@ -17,32 +17,29 @@ namespace UnityQuickSheet
     internal class ExcelMachine : BaseMachine
     {
         /// <summary>
-        /// where the .xls or .xlsx file is. The path should start with "Assets/". 
+        /// where the .xls or .xlsx file is. The path should start with "Assets/".
         /// </summary>
         public string excelFilePath;
 
         // both are needed for popup editor control.
         public string[] SheetNames = { "" };
-        public int CurrentSheetIndex 
+        public int CurrentSheetIndex
         {
             get { return currentSelectedSheet; }
-            set { currentSelectedSheet = value;} 
+            set { currentSelectedSheet = value;}
         }
 
         [SerializeField]
         protected int currentSelectedSheet = 0;
 
-        // excel and google plugin have its own template files, 
+        // excel and google plugin have its own template files,
         // so we need to set the different path when the asset file is created.
         private readonly string excelTemplatePath = "QuickSheet/ExcelPlugin/Templates";
 
         /// <summary>
-        /// Note: Called when the asset file is selected.
+        /// Note: Called when the asset file is created.
         /// </summary>
-        protected new void OnEnable()
-        {
-            base.OnEnable();
-
+        private void Awake() {
             TemplatePath = excelTemplatePath;
         }
 

diff --git a/Assets/QuickSheet/GDataPlugin/Editor/GoogleMachine.cs b/Assets/QuickSheet/GDataPlugin/Editor/GoogleMachine.cs
@@ -1,7 +1,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///
 /// GoogleMachine.cs
-/// 
+///
 /// (c)2013 Kim, Hyoun Woo
 ///
 ///////////////////////////////////////////////////////////////////////////////
@@ -23,19 +23,16 @@ internal class GoogleMachine : BaseMachine
         [SerializeField]
         public static string assetFileName = "GoogleMachine.asset";
 
-        // excel and google plugin have its own template files, 
+        // excel and google plugin have its own template files,
         // so we need to set the different path when the asset file is created.
         private readonly string gDataTemplatePath = "QuickSheet/GDataPlugin/Templates";
 
         public string AccessCode = "";
 
         /// <summary>
-        /// Note: Called when the asset file is selected.
+        /// Note: Called when the asset file is created.
         /// </summary>
-        protected new void OnEnable()
-        {
-            base.OnEnable();
-
+        private void Awake() {
             TemplatePath = gDataTemplatePath;
         }