Apply suggestions from code review

Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> Signed-off-by: Timfa <timfalken@hotmail.com>
Simple-Station · Feb 21, 2025 · c0fa48c · c0fa48c
1 parent 293289d
commit c0fa48c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/Content.Client/Renamable/RenamableBoundUserInterface.cs b/Content.Client/Renamable/RenamableBoundUserInterface.cs
@@ -24,19 +24,17 @@ protected override void Open()
         base.Open();
 
         _window = this.CreateWindow<RenamableWindow>();
-
         _window.OnNameChanged += OnNameChanged;
         Reload();
     }
 
     private void OnNameChanged(string newName) => SendPredictedMessage(new RenamableBuiMessage(newName));
 
-    private void Reload()
+    private void Reload(MetaDataComponent? metaData = null)
     {
-        MetaDataComponent? metadata = null;
-        if (!_metaQuery.Resolve(Owner, ref metadata))
+        if (!_metaQuery.Resolve(Owner, ref metaData))
             return;
 
-        _window!.SetCurrentName(metadata.EntityName);
+        _window!.SetCurrentName(metaData.EntityName);
     }
 }
diff --git a/Content.Client/Renamable/RenamableWindow.xaml.cs b/Content.Client/Renamable/RenamableWindow.xaml.cs
@@ -22,9 +22,9 @@ public RenamableWindow()
     {
         RobustXamlLoader.Load(this);
 
-        NameLineEdit.OnTextEntered += e =>
+        NameLineEdit.OnTextEntered += args =>
         {
-            _name = e.Text;
+            _name = args.Text;
             OnNameChanged?.Invoke(_name);
         };
 

diff --git a/Content.Shared/Renamable/EntitySystems/SharedRenamableSystem.cs b/Content.Shared/Renamable/EntitySystems/SharedRenamableSystem.cs
@@ -21,6 +21,7 @@ public override void Initialize()
         base.Initialize();
         SubscribeLocalEvent<RenamableComponent, GetVerbsEvent<Verb>>(OnGetVerbs);
         SubscribeLocalEvent<RenamableComponent, RenamableBuiMessage>(OnRename);
+
         _popup = _entManager.System<SharedPopupSystem>();
         _metaData = _entManager.System<MetaDataSystem>();
     }
@@ -46,9 +47,10 @@ private void OnGetVerbs(Entity<RenamableComponent> entity, ref GetVerbsEvent<Ver
     {
         if (!args.CanAccess || !args.CanInteract || args.Hands == null)
             return;
+
         var entityUid = entity.Owner;
         var user = args.User;
-        var v = new Verb
+        var renameVerb = new Verb
         {
             Text = Loc.GetString("verb-categories-rename"),
             DoContactInteraction = true,
@@ -57,7 +59,7 @@ private void OnGetVerbs(Entity<RenamableComponent> entity, ref GetVerbsEvent<Ver
                 _uiSystem.OpenUi(entityUid, SharedRenamableInterfaceKey.Key, user);
             }
         };
-        args.Verbs.Add(v);
+        args.Verbs.Add(renameVerb);
     }
 }