From b8c78caa2ffc6370424ed56ce13f465e6e6efa12 Mon Sep 17 00:00:00 2001
From: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
Date: Tue, 21 Sep 2021 09:48:09 -0700
Subject: [PATCH] Remove nested FocusModeFramework namespace

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
---
 .../AzToolsFramework/Application/ToolsApplication.cpp     | 2 +-
 .../AzToolsFramework/AzToolsFrameworkModule.cpp           | 2 +-
 .../AzToolsFramework/FocusMode/FocusModeInterface.h       | 5 ++---
 .../FocusMode/FocusModeSystemComponent.cpp                | 4 ++--
 .../AzToolsFramework/FocusMode/FocusModeSystemComponent.h | 4 ++--
 .../AzToolsFramework/Prefab/PrefabFocusHandler.cpp        | 4 ++--
 .../AzToolsFramework/Prefab/PrefabFocusHandler.h          | 8 ++------
 7 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp
index 7238a22c51..91a916ae70 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp
@@ -249,7 +249,7 @@ namespace AzToolsFramework
         components.insert(components.end(), {
                 azrtti_typeid<EditorEntityContextComponent>(),
                 azrtti_typeid<Components::EditorEntityUiSystemComponent>(),
-                azrtti_typeid<FocusModeFramework::FocusModeSystemComponent>(),
+                azrtti_typeid<FocusModeSystemComponent>(),
                 azrtti_typeid<SliceMetadataEntityContextComponent>(),
                 azrtti_typeid<Prefab::PrefabSystemComponent>(),
                 azrtti_typeid<EditorEntityFixupComponent>(),
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFrameworkModule.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFrameworkModule.cpp
index a557754437..b68d086892 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFrameworkModule.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFrameworkModule.cpp
@@ -70,7 +70,7 @@ namespace AzToolsFramework
             Components::EditorSelectionAccentSystemComponent::CreateDescriptor(),
             EditorEntityContextComponent::CreateDescriptor(),
             EditorEntityFixupComponent::CreateDescriptor(),
-            FocusModeFramework::FocusModeSystemComponent::CreateDescriptor(),
+            FocusModeSystemComponent::CreateDescriptor(),
             SliceMetadataEntityContextComponent::CreateDescriptor(),
             SliceRequestComponent::CreateDescriptor(),
             Prefab::PrefabSystemComponent::CreateDescriptor(),
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/FocusMode/FocusModeInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/FocusMode/FocusModeInterface.h
index edd94fd6b0..70bb320a96 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/FocusMode/FocusModeInterface.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/FocusMode/FocusModeInterface.h
@@ -11,8 +11,7 @@
 #include <AzCore/Interface/Interface.h>
 #include <AzCore/Serialization/SerializeContext.h>
 
-
-namespace AzToolsFramework::FocusModeFramework
+namespace AzToolsFramework
 {
     /*!
      * FocusModeInterface
@@ -37,4 +36,4 @@ namespace AzToolsFramework::FocusModeFramework
         virtual bool IsInFocusSubTree(AZ::EntityId entityId) = 0;
     };
 
-} // namespace AzToolsFramework::FocusModeFrameworkclassPrefabEditPublicInterface
+} // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/FocusMode/FocusModeSystemComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/FocusMode/FocusModeSystemComponent.cpp
index d82ce9ffeb..fcca452bf5 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/FocusMode/FocusModeSystemComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/FocusMode/FocusModeSystemComponent.cpp
@@ -13,7 +13,7 @@
 #include <AzToolsFramework/API/ViewportEditorModeTrackerInterface.h>
 #include <AzToolsFramework/FocusMode/FocusModeSystemComponent.h>
 
-namespace AzToolsFramework::FocusModeFramework
+namespace AzToolsFramework
 {
     FocusModeSystemComponent::~FocusModeSystemComponent()
     {
@@ -90,4 +90,4 @@ namespace AzToolsFramework::FocusModeFramework
         return IsInFocusSubTree_helper(parentId, focusRootId);
     }
 
-} // namespace AzToolsFramework::FocusModeFramework
+} // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/FocusMode/FocusModeSystemComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/FocusMode/FocusModeSystemComponent.h
index 54312a1e92..284515eeb7 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/FocusMode/FocusModeSystemComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/FocusMode/FocusModeSystemComponent.h
@@ -13,7 +13,7 @@
 
 #include <AzToolsFramework/FocusMode/FocusModeInterface.h>
 
-namespace AzToolsFramework::FocusModeFramework
+namespace AzToolsFramework
 {
     class FocusModeSystemComponent final
         : public AZ::Component
@@ -46,4 +46,4 @@ namespace AzToolsFramework::FocusModeFramework
         AZ::EntityId m_focusRoot;
     };
 
-} // namespace AzToolsFramework::FocusModeFramework
+} // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp
index 2f64234352..63921cff21 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp
@@ -14,7 +14,7 @@
 
 namespace AzToolsFramework::Prefab
 {
-    FocusModeFramework::FocusModeInterface* PrefabFocusHandler::s_focusModeInterface = nullptr;
+    FocusModeInterface* PrefabFocusHandler::s_focusModeInterface = nullptr;
     InstanceEntityMapperInterface* PrefabFocusHandler::s_instanceEntityMapperInterface = nullptr;
     PrefabEditorEntityOwnershipInterface* PrefabFocusHandler::s_prefabEditorEntityOwnershipInterface = nullptr;
 
@@ -25,7 +25,7 @@ namespace AzToolsFramework::Prefab
 
     void PrefabFocusHandler::Initialize()
     {
-        s_focusModeInterface = AZ::Interface<FocusModeFramework::FocusModeInterface>::Get();
+        s_focusModeInterface = AZ::Interface<FocusModeInterface>::Get();
         AZ_Assert(
             s_focusModeInterface,
             "Prefab - PrefabFocusHandler - "
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.h
index bf8b6994d1..6a2ff2f62e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.h
@@ -15,13 +15,9 @@
 #include <AzToolsFramework/Prefab/Template/Template.h>
 
 namespace AzToolsFramework
-{
-    class PrefabEditorEntityOwnershipInterface;
-}
-
-namespace AzToolsFramework::FocusModeFramework
 {
     class FocusModeInterface;
+    class PrefabEditorEntityOwnershipInterface;
 }
 
 namespace AzToolsFramework::Prefab
@@ -48,7 +44,7 @@ namespace AzToolsFramework::Prefab
         InstanceOptionalReference m_focusedInstance;
         TemplateId m_focusedTemplateId;
 
-        static FocusModeFramework::FocusModeInterface* s_focusModeInterface;
+        static FocusModeInterface* s_focusModeInterface;
         static InstanceEntityMapperInterface* s_instanceEntityMapperInterface;
         static PrefabEditorEntityOwnershipInterface* s_prefabEditorEntityOwnershipInterface;
     };