From 0bdd3fe99511ae6b974d77b2ffa7eca6d77d1041 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Fri, 2 Sep 2016 11:13:24 +0700
Subject: [PATCH] big name refactor continue

---
 Assets/FlashTools/Resources/SwfSettings.asset          |  2 +-
 .../Scripts/Internal/Editor/SwfAssetEditor.cs          |  6 +++---
 .../Scripts/Internal/Editor/SwfAssetPostprocessor.cs   |  2 +-
 Assets/FlashTools/Scripts/Internal/SwfSettings.cs      | 10 +++++-----
 Assets/FlashTools/Scripts/SwfAsset.cs                  |  4 ++--
 unityflash.userprefs                                   |  5 ++---
 6 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/Assets/FlashTools/Resources/SwfSettings.asset b/Assets/FlashTools/Resources/SwfSettings.asset
index b616830..1048e93 100644
--- a/Assets/FlashTools/Resources/SwfSettings.asset
+++ b/Assets/FlashTools/Resources/SwfSettings.asset
@@ -11,7 +11,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6da591d87f967451298a275621e1fd5d, type: 3}
   m_Name: SwfSettings
   m_EditorClassIdentifier: 
-  DefaultSettings:
+  Settings:
     MaxAtlasSize: 1024
     AtlasPadding: 1
     PixelsPerUnit: 100
diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfAssetEditor.cs b/Assets/FlashTools/Scripts/Internal/Editor/SwfAssetEditor.cs
index 946bbc5..4df5d4c 100644
--- a/Assets/FlashTools/Scripts/Internal/Editor/SwfAssetEditor.cs
+++ b/Assets/FlashTools/Scripts/Internal/Editor/SwfAssetEditor.cs
@@ -38,7 +38,7 @@ namespace FlashTools.Internal {
 		}
 
 		static void OverriddenSettingsToDefault(SwfAsset asset) {
-			asset.Overridden = SwfSettings.GetDefaultSettings();
+			asset.Overridden = SwfSettings.GetDefault();
 		}
 
 		static void ApplyOverriddenSettings(SwfAsset asset) {
@@ -135,7 +135,7 @@ namespace FlashTools.Internal {
 			GUILayout.BeginHorizontal();
 			GUILayout.FlexibleSpace();
 			{
-				var default_settings = SwfSettings.GetDefaultSettings();
+				var default_settings = SwfSettings.GetDefault();
 				SwfEditorUtils.DoWithEnabledGUI(
 					_assets.Any(p => !p.Overridden.CheckEquals(default_settings)), () => {
 						if ( GUILayout.Button("Default") ) {
@@ -166,7 +166,7 @@ namespace FlashTools.Internal {
 				.OfType<SwfAsset>()
 				.ToList();
 			_settingsFoldout =
-				_assets.Any(p => !p.Settings.CheckEquals(SwfSettings.GetDefaultSettings()));
+				_assets.Any(p => !p.Settings.CheckEquals(SwfSettings.GetDefault()));
 		}
 
 		void OnDisable() {
diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfAssetPostprocessor.cs b/Assets/FlashTools/Scripts/Internal/Editor/SwfAssetPostprocessor.cs
index 1f69c58..fbdade7 100644
--- a/Assets/FlashTools/Scripts/Internal/Editor/SwfAssetPostprocessor.cs
+++ b/Assets/FlashTools/Scripts/Internal/Editor/SwfAssetPostprocessor.cs
@@ -279,7 +279,7 @@ namespace FlashTools.Internal {
 				}
 			}
 
-			var settings_holder = SwfSettings.GetSettingsHolder();
+			var settings_holder = SwfSettings.GetHolder();
 			for ( var i = 0; i < baked_groups.Count; ++i ) {
 				var group = baked_groups[i];
 				switch ( group.Type ) {
diff --git a/Assets/FlashTools/Scripts/Internal/SwfSettings.cs b/Assets/FlashTools/Scripts/Internal/SwfSettings.cs
index db28674..a4776d4 100644
--- a/Assets/FlashTools/Scripts/Internal/SwfSettings.cs
+++ b/Assets/FlashTools/Scripts/Internal/SwfSettings.cs
@@ -62,7 +62,7 @@ namespace FlashTools.Internal {
 
 	public class SwfSettings : ScriptableObject {
 
-		public SwfSettingsData DefaultSettings;
+		public SwfSettingsData Settings;
 
 		[HideInInspector] public Material       SimpleMaterial;
 		[HideInInspector] public Material       IncrMaskMaterial;
@@ -175,11 +175,11 @@ namespace FlashTools.Internal {
 		// ---------------------------------------------------------------------
 
 		void Reset() {
-			DefaultSettings = SwfSettingsData.identity;
+			Settings = SwfSettingsData.identity;
 			FillMaterialsCache();
 		}
 
-		public static SwfSettings GetSettingsHolder() {
+		public static SwfSettings GetHolder() {
 			var settings_holder = LoadFirstAssetByFilter<SwfSettings>("t:SwfSettings");
 			if ( !settings_holder ) {
 				throw new UnityException("SwfSettings asset not found");
@@ -187,8 +187,8 @@ namespace FlashTools.Internal {
 			return settings_holder;
 		}
 
-		public static SwfSettingsData GetDefaultSettings() {
-			return GetSettingsHolder().DefaultSettings;
+		public static SwfSettingsData GetDefault() {
+			return GetHolder().Settings;
 		}
 	#endif
 	}
diff --git a/Assets/FlashTools/Scripts/SwfAsset.cs b/Assets/FlashTools/Scripts/SwfAsset.cs
index 5d71b81..87860fb 100644
--- a/Assets/FlashTools/Scripts/SwfAsset.cs
+++ b/Assets/FlashTools/Scripts/SwfAsset.cs
@@ -86,8 +86,8 @@ namespace FlashTools {
 			Data       = new SwfAssetData();
 			Atlas      = null;
 			Clips      = new List<SwfClipAsset>();
-			Settings   = SwfSettings.GetDefaultSettings();
-			Overridden = SwfSettings.GetDefaultSettings();
+			Settings   = SwfSettings.GetDefault();
+			Overridden = SwfSettings.GetDefault();
 		}
 	#endif
 	}
diff --git a/unityflash.userprefs b/unityflash.userprefs
index bc7f7d9..7440527 100644
--- a/unityflash.userprefs
+++ b/unityflash.userprefs
@@ -1,9 +1,8 @@
 <Properties StartupItem="Assembly-CSharp.csproj">
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" PreferredExecutionTarget="Unity.Instance.Unity Editor" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="Assets/FlashTools/Scripts/Internal/Editor/SwfPostprocessor.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="Assets/FlashTools/Scripts/Internal/Editor/SwfAssetEditor.cs">
     <Files>
-      <File FileName="Assets/FlashTools/Scripts/Internal/Editor/SwfAnimationAssetPostprocessor.cs" Line="22" Column="38" />
-      <File FileName="Assets/FlashTools/Scripts/Internal/Editor/SwfPostprocessor.cs" Line="287" Column="37" />
+      <File FileName="Assets/FlashTools/Scripts/Internal/Editor/SwfAssetEditor.cs" Line="11" Column="40" />
     </Files>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>