Skip to content

Commit 2b1cfe7

Browse files
committed
refactor: AssetGroupPresenterクラスのruleContextフィールドをruleTypeに変更
AssetGroupCollectionPanelPresenterとAssetGroupPanelPresenterで使用されていた _ruleContextフィールド名を_ruleTypeに統一。パラメータ名も同様に変更。
1 parent 6444eb9 commit 2b1cfe7

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

Assets/SmartAddresser/Editor/Core/Tools/Addresser/Shared/AssetGroups/AssetGroupCollectionPanelPresenter.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ internal sealed class AssetGroupCollectionPanelPresenter : IDisposable
1616
new Dictionary<string, AssetGroupPanelPresenter>();
1717

1818
private readonly AutoIncrementHistory _history;
19-
private readonly RuleType? _ruleContext;
19+
private readonly RuleType? _ruleType;
2020
private readonly IAssetSaveService _saveService;
2121
private readonly CompositeDisposable _setupViewDisposables = new CompositeDisposable();
2222
private readonly AssetGroupCollectionPanelView _view;
@@ -25,12 +25,12 @@ internal sealed class AssetGroupCollectionPanelPresenter : IDisposable
2525
private IObservableList<AssetGroup> _groups;
2626

2727
public AssetGroupCollectionPanelPresenter(AssetGroupCollectionPanelView view, AutoIncrementHistory history,
28-
IAssetSaveService saveService, RuleType? ruleContext = null)
28+
IAssetSaveService saveService, RuleType? ruleType = null)
2929
{
3030
_view = view;
3131
_history = history;
3232
_saveService = saveService;
33-
_ruleContext = ruleContext;
33+
_ruleType = ruleType;
3434

3535
SetupViewEventHandlers();
3636
}
@@ -80,7 +80,7 @@ public void SetupView(ObservableList<AssetGroup> groups)
8080
void AddGroupView(AssetGroup group, int index)
8181
{
8282
var groupPanelView = _view.AddGroupPanelView(group, index);
83-
var groupPanelPresenter = new AssetGroupPanelPresenter(groupPanelView, _history, _saveService, _ruleContext);
83+
var groupPanelPresenter = new AssetGroupPanelPresenter(groupPanelView, _history, _saveService, _ruleType);
8484
groupPanelPresenter.SetupView(_groups, index);
8585
_groupPanelPresenters.Add(group.Id, groupPanelPresenter);
8686
}

Assets/SmartAddresser/Editor/Core/Tools/Addresser/Shared/AssetGroups/AssetGroupPanelPresenter.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ internal sealed class AssetGroupPanelPresenter : IDisposable
2020
new Dictionary<string, AssetFilterViewPresenter>();
2121

2222
private readonly AutoIncrementHistory _history;
23-
private readonly RuleType? _ruleContext;
23+
private readonly RuleType? _ruleType;
2424
private readonly IAssetSaveService _saveService;
2525
private readonly CompositeDisposable _setupViewDisposables = new CompositeDisposable();
2626
private readonly AssetGroupPanelView _view;
@@ -30,12 +30,12 @@ internal sealed class AssetGroupPanelPresenter : IDisposable
3030
private IList<AssetGroup> _groups;
3131

3232
public AssetGroupPanelPresenter(AssetGroupPanelView view, AutoIncrementHistory history,
33-
IAssetSaveService saveService, RuleType? ruleContext = null)
33+
IAssetSaveService saveService, RuleType? ruleType = null)
3434
{
3535
_view = view;
3636
_history = history;
3737
_saveService = saveService;
38-
_ruleContext = ruleContext;
38+
_ruleType = ruleType;
3939

4040
SetupViewEventHandlers();
4141
}
@@ -249,15 +249,15 @@ void AddFilter()
249249
.Where(x => x.GetCustomAttribute<IgnoreAssetFilterAttribute>() == null);
250250

251251
// Filter by rule context if set
252-
if (_ruleContext.HasValue)
252+
if (_ruleType.HasValue)
253253
types = types.Where(type =>
254254
{
255255
var restrictedAttribute = type.GetCustomAttribute<RestrictedToRulesAttribute>();
256256
// If no restriction attribute, allow for all rules
257257
if (restrictedAttribute == null)
258258
return true;
259259
// If restriction attribute exists, check if current rule type is allowed
260-
return restrictedAttribute.AllowedRuleTypes.Contains(_ruleContext.Value);
260+
return restrictedAttribute.AllowedRuleTypes.Contains(_ruleType.Value);
261261
});
262262

263263
// Show filter selection menu.

0 commit comments

Comments
 (0)