misc: cleanup default value keys

jsm174 · freezy · commit 14e27ddc2cf6 · 2022-03-11T18:23:05.000+01:00
diff --git a/Editor/Descriptors/GetSwitchUnitDescriptor.cs b/Editor/Descriptors/GetSwitchUnitDescriptor.cs
@@ -16,6 +16,7 @@
 
 // ReSharper disable UnusedType.Global
 
+using System.Text.RegularExpressions;
 using Unity.VisualScripting;
 using VisualPinball.Unity.Editor;
 using IconSize = VisualPinball.Unity.Editor.IconSize;
@@ -40,13 +41,18 @@ protected override void DefinedPort(IUnitPort port, UnitPortDescription desc)
 		{
 			base.DefinedPort(port, desc);
 
-			switch (port.key) {
-				case nameof(GetSwitchUnit.Ids):
-					desc.summary = "The IDs of the switches for which to get the current status.";
-					break;
-				case nameof(GetSwitchUnit.IsEnabled):
-					desc.summary = "Whether the switch is enabled.";
-					break;
+			if (port.key == nameof(GetSwitchUnit.IsEnabled)) {
+				desc.summary = "Whether the switch is enabled.";
+			}
+			else {
+				var match = new Regex("^(item)([0-9]+)$").Match(port.key);
+
+				if (match.Success) {
+					var id = int.Parse(match.Groups[2].Value) + 1;
+
+					desc.label = $"Switch ID {id}";
+					desc.summary = $"Switch ID {id} to check if enabled.";
+				}
 			}
 		}
 	}
diff --git a/Editor/Descriptors/PulseCoilUnitDescriptor.cs b/Editor/Descriptors/PulseCoilUnitDescriptor.cs
@@ -16,6 +16,7 @@
 
 // ReSharper disable UnusedType.Global
 
+using System.Text.RegularExpressions;
 using Unity.VisualScripting;
 using VisualPinball.Unity.Editor;
 
@@ -43,13 +44,18 @@ protected override void DefinedPort(IUnitPort port, UnitPortDescription desc)
 		{
 			base.DefinedPort(port, desc);
 
-			switch (port.key) {
-				case nameof(PulseCoilUnit.Ids):
-					desc.summary = "The IDs of the coils to be pulsed.";
-					break;
-				case nameof(PulseCoilUnit.PulseDuration):
-					desc.summary = "The time in milliseconds until the coils are disabled again.";
-					break;
+			if (port.key == nameof(PulseCoilUnit.PulseDuration)) {
+				desc.summary = "The time in milliseconds until the coils are disabled again.";
+			}
+			else {
+				var match = new Regex("^(item)([0-9]+)$").Match(port.key);
+
+				if (match.Success) {
+					var id = int.Parse(match.Groups[2].Value) + 1;
+
+					desc.label = $"Coil ID {id}";
+					desc.summary = $"Coil ID {id} of the coil to be pulsed.";
+				}
 			}
 		}
 	}
diff --git a/Editor/Descriptors/SetCoilUnitDescriptor.cs b/Editor/Descriptors/SetCoilUnitDescriptor.cs
@@ -16,6 +16,7 @@
 
 // ReSharper disable UnusedType.Global
 
+using System.Text.RegularExpressions;
 using Unity.VisualScripting;
 using VisualPinball.Unity.Editor;
 
@@ -43,13 +44,18 @@ protected override void DefinedPort(IUnitPort port, UnitPortDescription desc)
 		{
 			base.DefinedPort(port, desc);
 
-			switch (port.key) {
-				case nameof(SetCoilUnit.Ids):
-					desc.summary = "The IDs of the coils to be set.";
-					break;
-				case nameof(SetCoilUnit.IsEnabled):
-					desc.summary = "The value to assign to the coils.";
-					break;
+			if (port.key == nameof(SetCoilUnit.IsEnabled)) {
+				desc.summary = "The value to assign to the coils.";
+			}
+			else {
+				var match = new Regex("^(item)([0-9]+)$").Match(port.key);
+
+				if (match.Success) {
+					var id = int.Parse(match.Groups[2].Value) + 1;
+
+					desc.label = $"Coil ID {id}";
+					desc.summary = $"Coil ID {id} of the coil to be set.";
+				}
 			}
 		}
 	}
diff --git a/Editor/Descriptors/SwitchEnabledEventUnitDescriptor.cs b/Editor/Descriptors/SwitchEnabledEventUnitDescriptor.cs
@@ -16,6 +16,7 @@
 
 // ReSharper disable UnusedType.Global
 
+using System.Text.RegularExpressions;
 using Unity.VisualScripting;
 
 namespace VisualPinball.Unity.VisualScripting.Editor
@@ -38,10 +39,13 @@ protected override void DefinedPort(IUnitPort port, UnitPortDescription desc)
 		{
 			base.DefinedPort(port, desc);
 
-			switch (port.key) {
-				case nameof(SwitchEnabledEventUnit.Ids):
-					desc.summary = "The IDs of the switches for which to look for enabled status.";
-					break;
+			var match = new Regex("^(item)([0-9]+)$").Match(port.key);
+
+			if (match.Success) {
+				var id = int.Parse(match.Groups[2].Value) + 1;
+
+				desc.label = $"Switch ID {id}";
+				desc.summary = $"Switch ID {id} to look for enabled status.";
 			}
 		}
 	}
diff --git a/Editor/Descriptors/SwitchLampUnitDescriptor.cs b/Editor/Descriptors/SwitchLampUnitDescriptor.cs
@@ -49,10 +49,10 @@ protected override void DefinedPort(IUnitPort port, UnitPortDescription desc)
 				var match = new Regex("^(item)([0-9]+)$").Match(port.key);
 
 				if (match.Success) {
-					var id = int.Parse(match.Groups[2].Value);
+					var id = int.Parse(match.Groups[2].Value) + 1;
 
 					desc.label = $"Lamp ID {id}";
-					desc.summary = "Lamp ID to enable if specified Value matches source Value, or disable if specified Value does not match source Value";
+					desc.summary = $"Lamp ID {id} to enable if specified Value matches source Value, or disable if specified Value does not match source Value";
 				}
 			}
 		}
diff --git a/Editor/Widgets/GetSwitchUnitWidget.cs b/Editor/Widgets/GetSwitchUnitWidget.cs
@@ -35,14 +35,14 @@ public GetSwitchUnitWidget(FlowCanvas canvas, GetSwitchUnit unit) : base(canvas,
 
 		public override Inspector GetPortInspector(IUnitPort port, Metadata meta)
 		{
-			if (_switchIdInspectorConstructorList.Count() < unit.idCount) {
-				for (var index = 0; index < unit.idCount - _switchIdInspectorConstructorList.Count(); index++) {
+			if (_switchIdInspectorConstructorList.Count() < unit.itemCount) {
+				for (var index = 0; index < unit.itemCount - _switchIdInspectorConstructorList.Count(); index++) {
 					_switchIdInspectorConstructorList.Add(meta => new VariableNameInspector(meta, GetNameSuggestions));
 				}
 			}
 
-			for (var index = 0; index < unit.idCount; index++) {
-				if (unit.Ids[index] == port) {
+			for (var index = 0; index < unit.itemCount; index++) {
+				if (unit.Items[index] == port) {
 					VariableNameInspector switchIdInspector = new VariableNameInspector(meta, GetNameSuggestions);
 					InspectorProvider.instance.Renew(ref switchIdInspector, meta, _switchIdInspectorConstructorList[index]);
 
diff --git a/Editor/Widgets/PulseCoilUnitWidget.cs b/Editor/Widgets/PulseCoilUnitWidget.cs
@@ -35,14 +35,14 @@ public PulseCoilUnitWidget(FlowCanvas canvas, PulseCoilUnit unit) : base(canvas,
 
 		public override Inspector GetPortInspector(IUnitPort port, Metadata meta)
 		{
-			if (_coilIdInspectorConstructorList.Count() < unit.idCount) {
-				for (var index = 0; index < unit.idCount - _coilIdInspectorConstructorList.Count(); index++) {
+			if (_coilIdInspectorConstructorList.Count() < unit.itemCount) {
+				for (var index = 0; index < unit.itemCount - _coilIdInspectorConstructorList.Count(); index++) {
 					_coilIdInspectorConstructorList.Add(meta => new VariableNameInspector(meta, GetNameSuggestions));
 				}
 			}
 
-			for (var index = 0; index < unit.idCount; index++) {
-				if (unit.Ids[index] == port) {
+			for (var index = 0; index < unit.itemCount; index++) {
+				if (unit.Items[index] == port) {
 					VariableNameInspector coilIdInspector = new VariableNameInspector(meta, GetNameSuggestions);
 					InspectorProvider.instance.Renew(ref coilIdInspector, meta, _coilIdInspectorConstructorList[index]);
 
diff --git a/Editor/Widgets/SetCoilUnitWidget.cs b/Editor/Widgets/SetCoilUnitWidget.cs
@@ -35,14 +35,14 @@ public SetCoilUnitWidget(FlowCanvas canvas, SetCoilUnit unit) : base(canvas, uni
 
 		public override Inspector GetPortInspector(IUnitPort port, Metadata meta)
 		{
-			if (_coilIdInspectorConstructorList.Count() < unit.idCount) {
-				for (var index = 0; index < unit.idCount - _coilIdInspectorConstructorList.Count(); index++) {
+			if (_coilIdInspectorConstructorList.Count() < unit.itemCount) {
+				for (var index = 0; index < unit.itemCount - _coilIdInspectorConstructorList.Count(); index++) {
 					_coilIdInspectorConstructorList.Add(meta => new VariableNameInspector(meta, GetNameSuggestions));
 				}
 			}
 
-			for (var index = 0; index < unit.idCount; index++) {
-				if (unit.Ids[index] == port) {
+			for (var index = 0; index < unit.itemCount; index++) {
+				if (unit.Items[index] == port) {
 					VariableNameInspector coilIdInspector = new VariableNameInspector(meta, GetNameSuggestions);
 					InspectorProvider.instance.Renew(ref coilIdInspector, meta, _coilIdInspectorConstructorList[index]);
 
diff --git a/Editor/Widgets/SwitchEnabledEventUnitWidget.cs b/Editor/Widgets/SwitchEnabledEventUnitWidget.cs
@@ -35,14 +35,14 @@ public SwitchEnabledEventUnitWidget(FlowCanvas canvas, SwitchEnabledEventUnit un
 
 		public override Inspector GetPortInspector(IUnitPort port, Metadata meta)
 		{
-			if (_switchIdInspectorConstructorList.Count() < unit.idCount) {
-				for (var index = 0; index < unit.idCount - _switchIdInspectorConstructorList.Count(); index++) {
+			if (_switchIdInspectorConstructorList.Count() < unit.itemCount) {
+				for (var index = 0; index < unit.itemCount - _switchIdInspectorConstructorList.Count(); index++) {
 					_switchIdInspectorConstructorList.Add(meta => new VariableNameInspector(meta, GetNameSuggestions));
 				}
 			}
 
-			for (var index = 0; index < unit.idCount; index++) {
-				if (unit.Ids[index] == port) {
+			for (var index = 0; index < unit.itemCount; index++) {
+				if (unit.Items[index] == port) {
 					VariableNameInspector switchIdInspector = new VariableNameInspector(meta, GetNameSuggestions);
 					InspectorProvider.instance.Renew(ref switchIdInspector, meta, _switchIdInspectorConstructorList[index]);
 
diff --git a/Editor/Widgets/SwitchLampUnitWidget.cs b/Editor/Widgets/SwitchLampUnitWidget.cs
@@ -35,13 +35,13 @@ public SwitchLampUnitWidget(FlowCanvas canvas, SwitchLampUnit unit) : base(canva
 
 		public override Inspector GetPortInspector(IUnitPort port, Metadata meta)
 		{
-			if (_lampIdInspectorConstructorList.Count() < unit.idCount) {
-				for (var index = 0; index < unit.idCount - _lampIdInspectorConstructorList.Count(); index++) {
+			if (_lampIdInspectorConstructorList.Count() < unit.itemCount) {
+				for (var index = 0; index < unit.itemCount - _lampIdInspectorConstructorList.Count(); index++) {
 					_lampIdInspectorConstructorList.Add(meta => new LampIdValueInspector(meta, GetNameSuggestions));
 				}
 			}
 
-			for (var index = 0; index < unit.idCount; index++) {
+			for (var index = 0; index < unit.itemCount; index++) {
 				if (unit.Items[index] == port) {
 					LampIdValueInspector lampIdInspector = new LampIdValueInspector(meta, GetNameSuggestions);
 					InspectorProvider.instance.Renew(ref lampIdInspector, meta, _lampIdInspectorConstructorList[index]);
diff --git a/Runtime/Nodes/Coils/PulseCoilUnit.cs b/Runtime/Nodes/Coils/PulseCoilUnit.cs
@@ -33,19 +33,19 @@ public class PulseCoilUnit : GleUnit
 		[PortLabelHidden]
 		public ControlOutput OutputTrigger;
 
-		[SerializeAs(nameof(idCount))]
-		private int _idCount = 1;
+		[SerializeAs(nameof(itemCount))]
+		private int _itemCount = 1;
 
 		[DoNotSerialize]
 		[Inspectable, UnitHeaderInspectable("Coil IDs")]
-		public int idCount
+		public int itemCount
 		{
-			get => _idCount;
-			set => _idCount = Mathf.Clamp(value, 1, 10);
+			get => _itemCount;
+			set => _itemCount = Mathf.Clamp(value, 1, 10);
 		}
 
 		[DoNotSerialize]
-		public List<ValueInput> Ids { get; private set; }
+		public List<ValueInput> Items { get; private set; }
 
 		[DoNotSerialize]
 		[PortLabel("Duration (ms)")]
@@ -56,16 +56,16 @@ protected override void Definition()
 			InputTrigger = ControlInput(nameof(InputTrigger), Process);
 			OutputTrigger = ControlOutput(nameof(OutputTrigger));
 
-			Ids = new List<ValueInput>();
+			Items = new List<ValueInput>();
 
-			for (var i = 0; i < idCount; i++) {
-				var id = ValueInput<string>("Coil ID " + (i + 1), string.Empty);
-				Ids.Add(id);
+			for (var i = 0; i < itemCount; i++) {
+				var item = ValueInput($"item{i}", string.Empty);
+				Items.Add(item);
 
-				Requirement(id, InputTrigger);
+				Requirement(item, InputTrigger);
 			}
 
-			PulseDuration = ValueInput<int>(nameof(PulseDuration), 80);
+			PulseDuration = ValueInput(nameof(PulseDuration), 80);
 
 			Succession(InputTrigger, OutputTrigger);
 		}
@@ -84,11 +84,11 @@ private ControlOutput Process(Flow flow)
 
 			var pulseDuration = flow.GetValue<int>(PulseDuration);
 
-			foreach (var id in Ids) {
-				var idValue = flow.GetValue<string>(id);
+			foreach (var item in Items) {
+				var id = flow.GetValue<string>(item);
 
-				Gle.SetCoil(idValue, true);
-				Player.ScheduleAction(pulseDuration, () => Gle.SetCoil(idValue, false));
+				Gle.SetCoil(id, true);
+				Player.ScheduleAction(pulseDuration, () => Gle.SetCoil(id, false));
 			}
 
 			return OutputTrigger;
diff --git a/Runtime/Nodes/Coils/SetCoilUnit.cs b/Runtime/Nodes/Coils/SetCoilUnit.cs
@@ -33,19 +33,19 @@ public class SetCoilUnit : GleUnit
 		[PortLabelHidden]
 		public ControlOutput OutputTrigger;
 
-		[SerializeAs(nameof(idCount))]
-		private int _idCount = 1;
+		[SerializeAs(nameof(itemCount))]
+		private int _itemCount = 1;
 
 		[DoNotSerialize]
 		[Inspectable, UnitHeaderInspectable("Coil IDs")]
-		public int idCount
+		public int itemCount
 		{
-			get => _idCount;
-			set => _idCount = Mathf.Clamp(value, 1, 10);
+			get => _itemCount;
+			set => _itemCount = Mathf.Clamp(value, 1, 10);
 		}
 
 		[DoNotSerialize]
-		public List<ValueInput> Ids { get; private set; }
+		public List<ValueInput> Items { get; private set; }
 
 		[DoNotSerialize]
 		[PortLabel("Value")]
@@ -56,16 +56,16 @@ protected override void Definition()
 			InputTrigger = ControlInput(nameof(InputTrigger), Process);
 			OutputTrigger = ControlOutput(nameof(OutputTrigger));
 
-			Ids = new List<ValueInput>();
+			Items = new List<ValueInput>();
 
-			for (var i = 0; i < idCount; i++) {
-				var id = ValueInput<string>("Coil ID " + (i + 1), string.Empty);
-				Ids.Add(id);
+			for (var i = 0; i < itemCount; i++) {
+				var item = ValueInput($"item{i}", string.Empty);
+				Items.Add(item);
 
-				Requirement(id, InputTrigger);
+				Requirement(item, InputTrigger);
 			}
 
-			IsEnabled = ValueInput<bool>(nameof(IsEnabled), false);
+			IsEnabled = ValueInput(nameof(IsEnabled), false);
 
 			Succession(InputTrigger, OutputTrigger);
 		}
@@ -79,10 +79,10 @@ private ControlOutput Process(Flow flow)
 
 			var isEnabled = flow.GetValue<bool>(IsEnabled);
 
-			foreach (var id in Ids) {
-				var idValue = flow.GetValue<string>(id);
+			foreach (var item in Items) {
+				var id = flow.GetValue<string>(item);
 
-				Gle.SetCoil(idValue, isEnabled);
+				Gle.SetCoil(id, isEnabled);
 			}
 
 			return OutputTrigger;
diff --git a/Runtime/Nodes/Lamps/LampIdValue.cs b/Runtime/Nodes/Lamps/LampIdValue.cs
diff --git a/Runtime/Nodes/Lamps/LampIdValue.cs.meta b/Runtime/Nodes/Lamps/LampIdValue.cs.meta
diff --git a/Runtime/Nodes/Lamps/SwitchLampUnit.cs b/Runtime/Nodes/Lamps/SwitchLampUnit.cs
diff --git a/Runtime/Nodes/Switches/GetSwitchUnit.cs b/Runtime/Nodes/Switches/GetSwitchUnit.cs
diff --git a/Runtime/Nodes/Switches/SwitchEnabledEventUnit.cs b/Runtime/Nodes/Switches/SwitchEnabledEventUnit.cs

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`
`17`	`17`	`// ReSharper disable UnusedType.Global`
`18`	`18`
	`19`	`+using System.Text.RegularExpressions;`
`19`	`20`	`using Unity.VisualScripting;`
`20`	`21`
`21`	`22`	`namespace VisualPinball.Unity.VisualScripting.Editor`
`@@ -38,10 +39,13 @@ protected override void DefinedPort(IUnitPort port, UnitPortDescription desc)`
`38`	`39`	`{`
`39`	`40`	`base.DefinedPort(port, desc);`
`40`	`41`
`41`		`- switch (port.key) {`
`42`		`- case nameof(SwitchEnabledEventUnit.Ids):`
`43`		`- desc.summary = "The IDs of the switches for which to look for enabled status.";`
`44`		`- break;`
	`42`	`+ var match = new Regex("^(item)([0-9]+)$").Match(port.key);`
	`43`	`+`
	`44`	`+ if (match.Success) {`
	`45`	`+ var id = int.Parse(match.Groups[2].Value) + 1;`
	`46`	`+`
	`47`	`+ desc.label = $"Switch ID {id}";`
	`48`	`+ desc.summary = $"Switch ID {id} to look for enabled status.";`
`45`	`49`	`}`
`46`	`50`	`}`
`47`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,10 +49,10 @@ protected override void DefinedPort(IUnitPort port, UnitPortDescription desc)`
`49`	`49`	`var match = new Regex("^(item)([0-9]+)$").Match(port.key);`
`50`	`50`
`51`	`51`	`if (match.Success) {`
`52`		`- var id = int.Parse(match.Groups[2].Value);`
	`52`	`+ var id = int.Parse(match.Groups[2].Value) + 1;`
`53`	`53`
`54`	`54`	`desc.label = $"Lamp ID {id}";`
`55`		`- desc.summary = "Lamp ID to enable if specified Value matches source Value, or disable if specified Value does not match source Value";`
	`55`	`+ desc.summary = $"Lamp ID {id} to enable if specified Value matches source Value, or disable if specified Value does not match source Value";`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,14 +35,14 @@ public GetSwitchUnitWidget(FlowCanvas canvas, GetSwitchUnit unit) : base(canvas,`
`35`	`35`
`36`	`36`	`public override Inspector GetPortInspector(IUnitPort port, Metadata meta)`
`37`	`37`	`{`
`38`		`- if (_switchIdInspectorConstructorList.Count() < unit.idCount) {`
`39`		`- for (var index = 0; index < unit.idCount - _switchIdInspectorConstructorList.Count(); index++) {`
	`38`	`+ if (_switchIdInspectorConstructorList.Count() < unit.itemCount) {`
	`39`	`+ for (var index = 0; index < unit.itemCount - _switchIdInspectorConstructorList.Count(); index++) {`
`40`	`40`	`_switchIdInspectorConstructorList.Add(meta => new VariableNameInspector(meta, GetNameSuggestions));`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`44`		`- for (var index = 0; index < unit.idCount; index++) {`
`45`		`- if (unit.Ids[index] == port) {`
	`44`	`+ for (var index = 0; index < unit.itemCount; index++) {`
	`45`	`+ if (unit.Items[index] == port) {`
`46`	`46`	`VariableNameInspector switchIdInspector = new VariableNameInspector(meta, GetNameSuggestions);`
`47`	`47`	`InspectorProvider.instance.Renew(ref switchIdInspector, meta, _switchIdInspectorConstructorList[index]);`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -35,14 +35,14 @@ public PulseCoilUnitWidget(FlowCanvas canvas, PulseCoilUnit unit) : base(canvas,`
`35`	`35`
`36`	`36`	`public override Inspector GetPortInspector(IUnitPort port, Metadata meta)`
`37`	`37`	`{`
`38`		`- if (_coilIdInspectorConstructorList.Count() < unit.idCount) {`
`39`		`- for (var index = 0; index < unit.idCount - _coilIdInspectorConstructorList.Count(); index++) {`
	`38`	`+ if (_coilIdInspectorConstructorList.Count() < unit.itemCount) {`
	`39`	`+ for (var index = 0; index < unit.itemCount - _coilIdInspectorConstructorList.Count(); index++) {`
`40`	`40`	`_coilIdInspectorConstructorList.Add(meta => new VariableNameInspector(meta, GetNameSuggestions));`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`44`		`- for (var index = 0; index < unit.idCount; index++) {`
`45`		`- if (unit.Ids[index] == port) {`
	`44`	`+ for (var index = 0; index < unit.itemCount; index++) {`
	`45`	`+ if (unit.Items[index] == port) {`
`46`	`46`	`VariableNameInspector coilIdInspector = new VariableNameInspector(meta, GetNameSuggestions);`
`47`	`47`	`InspectorProvider.instance.Renew(ref coilIdInspector, meta, _coilIdInspectorConstructorList[index]);`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -35,14 +35,14 @@ public SetCoilUnitWidget(FlowCanvas canvas, SetCoilUnit unit) : base(canvas, uni`
`35`	`35`
`36`	`36`	`public override Inspector GetPortInspector(IUnitPort port, Metadata meta)`
`37`	`37`	`{`
`38`		`- if (_coilIdInspectorConstructorList.Count() < unit.idCount) {`
`39`		`- for (var index = 0; index < unit.idCount - _coilIdInspectorConstructorList.Count(); index++) {`
	`38`	`+ if (_coilIdInspectorConstructorList.Count() < unit.itemCount) {`
	`39`	`+ for (var index = 0; index < unit.itemCount - _coilIdInspectorConstructorList.Count(); index++) {`
`40`	`40`	`_coilIdInspectorConstructorList.Add(meta => new VariableNameInspector(meta, GetNameSuggestions));`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`44`		`- for (var index = 0; index < unit.idCount; index++) {`
`45`		`- if (unit.Ids[index] == port) {`
	`44`	`+ for (var index = 0; index < unit.itemCount; index++) {`
	`45`	`+ if (unit.Items[index] == port) {`
`46`	`46`	`VariableNameInspector coilIdInspector = new VariableNameInspector(meta, GetNameSuggestions);`
`47`	`47`	`InspectorProvider.instance.Renew(ref coilIdInspector, meta, _coilIdInspectorConstructorList[index]);`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -35,14 +35,14 @@ public SwitchEnabledEventUnitWidget(FlowCanvas canvas, SwitchEnabledEventUnit un`
`35`	`35`
`36`	`36`	`public override Inspector GetPortInspector(IUnitPort port, Metadata meta)`
`37`	`37`	`{`
`38`		`- if (_switchIdInspectorConstructorList.Count() < unit.idCount) {`
`39`		`- for (var index = 0; index < unit.idCount - _switchIdInspectorConstructorList.Count(); index++) {`
	`38`	`+ if (_switchIdInspectorConstructorList.Count() < unit.itemCount) {`
	`39`	`+ for (var index = 0; index < unit.itemCount - _switchIdInspectorConstructorList.Count(); index++) {`
`40`	`40`	`_switchIdInspectorConstructorList.Add(meta => new VariableNameInspector(meta, GetNameSuggestions));`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`44`		`- for (var index = 0; index < unit.idCount; index++) {`
`45`		`- if (unit.Ids[index] == port) {`
	`44`	`+ for (var index = 0; index < unit.itemCount; index++) {`
	`45`	`+ if (unit.Items[index] == port) {`
`46`	`46`	`VariableNameInspector switchIdInspector = new VariableNameInspector(meta, GetNameSuggestions);`
`47`	`47`	`InspectorProvider.instance.Renew(ref switchIdInspector, meta, _switchIdInspectorConstructorList[index]);`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -35,13 +35,13 @@ public SwitchLampUnitWidget(FlowCanvas canvas, SwitchLampUnit unit) : base(canva`
`35`	`35`
`36`	`36`	`public override Inspector GetPortInspector(IUnitPort port, Metadata meta)`
`37`	`37`	`{`
`38`		`- if (_lampIdInspectorConstructorList.Count() < unit.idCount) {`
`39`		`- for (var index = 0; index < unit.idCount - _lampIdInspectorConstructorList.Count(); index++) {`
	`38`	`+ if (_lampIdInspectorConstructorList.Count() < unit.itemCount) {`
	`39`	`+ for (var index = 0; index < unit.itemCount - _lampIdInspectorConstructorList.Count(); index++) {`
`40`	`40`	`_lampIdInspectorConstructorList.Add(meta => new LampIdValueInspector(meta, GetNameSuggestions));`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`44`		`- for (var index = 0; index < unit.idCount; index++) {`
	`44`	`+ for (var index = 0; index < unit.itemCount; index++) {`
`45`	`45`	`if (unit.Items[index] == port) {`
`46`	`46`	`LampIdValueInspector lampIdInspector = new LampIdValueInspector(meta, GetNameSuggestions);`
`47`	`47`	`InspectorProvider.instance.Renew(ref lampIdInspector, meta, _lampIdInspectorConstructorList[index]);`