project: Fix name spaces.

freezy · freezy · commit 8c3ff94875da · 2022-01-03T09:34:17.000+01:00
diff --git a/Editor/Descriptors/SetCoilUnitDescriptor.cs b/Editor/Descriptors/SetCoilUnitDescriptor.cs
@@ -29,8 +29,7 @@ protected override void DefinedPort(IUnitPort port, UnitPortDescription descript
 		{
 			base.DefinedPort(port, description);
 
-			switch (port.key)
-			{
+			switch (port.key) {
 				case nameof(SetCoilUnit.Id):
 					description.summary = "The ID of the coil to be set.";
 					break;
diff --git a/Editor/GleUnitAnalyzer.cs b/Editor/GleUnitAnalyzer.cs
@@ -19,7 +19,7 @@
 using VisualPinball.Unity;
 using VisualPinball.Unity.VisualScripting;
 
-namespace Editor
+namespace VisualPinball.Unity.VisualScripting.Editor
 {
 
 	[Analyser(typeof(SwitchEventUnit))]
diff --git a/Editor/PropertyDrawers/VisualScriptingCoilPropertyDrawer.cs b/Editor/PropertyDrawers/VisualScriptingCoilPropertyDrawer.cs
@@ -15,14 +15,13 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 using UnityEditor;
-using VisualPinball.Unity.VisualScripting;
 
-namespace Editor.PropertyDrawers
+namespace VisualPinball.Unity.VisualScripting.Editor
 {
 	[CustomPropertyDrawer(typeof(VisualScriptingCoil))]
 	public class VisualScriptingCoilPropertyDrawer : VisualScriptingDeviceItemPropertyDrawer
 	{
-		public override string NameName => nameof(VisualScriptingCoil.Name);
-		public override string DescName => nameof(VisualScriptingCoil.Desc);
+		protected override string NameName => nameof(VisualScriptingCoil.Name);
+		protected override string DescName => nameof(VisualScriptingCoil.Desc);
 	}
 }
diff --git a/Editor/PropertyDrawers/VisualScriptingDeviceItemPropertyDrawer.cs b/Editor/PropertyDrawers/VisualScriptingDeviceItemPropertyDrawer.cs
@@ -16,16 +16,15 @@
 
 using UnityEditor;
 using UnityEngine;
-using VisualPinball.Unity.VisualScripting;
 
-namespace Editor.PropertyDrawers
+namespace VisualPinball.Unity.VisualScripting.Editor
 {
 	public abstract class VisualScriptingDeviceItemPropertyDrawer : PropertyDrawer
 	{
 		private const float Padding = 2f;
 
-		public abstract string NameName { get; }
-		public abstract string DescName { get; }
+		protected abstract string NameName { get; }
+		protected abstract string DescName { get; }
 
 		public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
 		{
diff --git a/Editor/PropertyDrawers/VisualScriptingLampPropertyDrawer.cs b/Editor/PropertyDrawers/VisualScriptingLampPropertyDrawer.cs
@@ -15,14 +15,13 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 using UnityEditor;
-using VisualPinball.Unity.VisualScripting;
 
-namespace Editor.PropertyDrawers
+namespace VisualPinball.Unity.VisualScripting.Editor
 {
 	[CustomPropertyDrawer(typeof(VisualScriptingLamp))]
 	public class VisualScriptingLampPropertyDrawer : VisualScriptingDeviceItemPropertyDrawer
 	{
-		public override string NameName => nameof(VisualScriptingLamp.Name);
-		public override string DescName => nameof(VisualScriptingLamp.Desc);
+		protected override string NameName => nameof(VisualScriptingLamp.Name);
+		protected override string DescName => nameof(VisualScriptingLamp.Desc);
 	}
 }
diff --git a/Editor/PropertyDrawers/VisualScriptingSwitchPropertyDrawer.cs b/Editor/PropertyDrawers/VisualScriptingSwitchPropertyDrawer.cs
@@ -17,12 +17,12 @@
 using UnityEditor;
 using VisualPinball.Unity.VisualScripting;
 
-namespace Editor.PropertyDrawers
+namespace VisualPinball.Unity.VisualScripting.Editor
 {
 	[CustomPropertyDrawer(typeof(VisualScriptingSwitch))]
 	public class VisualScriptingSwitchPropertyDrawer : VisualScriptingDeviceItemPropertyDrawer
 	{
-		public override string NameName => nameof(VisualScriptingSwitch.Name);
-		public override string DescName => nameof(VisualScriptingSwitch.Desc);
+		protected override string NameName => nameof(VisualScriptingSwitch.Name);
+		protected override string DescName => nameof(VisualScriptingSwitch.Desc);
 	}
 }
diff --git a/Editor/Widgets/GetLampValueUnitWidget.cs b/Editor/Widgets/GetLampValueUnitWidget.cs
@@ -19,7 +19,7 @@
 using Unity.VisualScripting;
 using VisualPinball.Unity;
 
-namespace VisualPinball.Unity.VisualScripting
+namespace VisualPinball.Unity.VisualScripting.Editor
 {
 	[Widget(typeof(GetLampValueUnit))]
 	public sealed class GetLampValueUnitWidget : UnitWidget<GetLampValueUnit>
diff --git a/Editor/Widgets/GleUnitWidget.cs b/Editor/Widgets/GleUnitWidget.cs
@@ -14,12 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using Unity.VisualScripting;
 
-namespace VisualPinball.Unity.VisualScripting
+namespace VisualPinball.Unity.VisualScripting.Editor
 {
 	public abstract class GleUnitWidget<TUnit> : UnitWidget<TUnit> where TUnit : Unit, IGleUnit
 	{
diff --git a/Editor/Widgets/LampEventUnitWidget.cs b/Editor/Widgets/LampEventUnitWidget.cs
@@ -18,7 +18,7 @@
 using System.Collections.Generic;
 using Unity.VisualScripting;
 
-namespace VisualPinball.Unity.VisualScripting
+namespace VisualPinball.Unity.VisualScripting.Editor
 {
 	[Widget(typeof(LampEventUnit))]
 	public sealed class LampEventUnitWidget : UnitWidget<LampEventUnit>
diff --git a/Editor/Widgets/SetCoilUnitWidget.cs b/Editor/Widgets/SetCoilUnitWidget.cs
@@ -19,7 +19,7 @@
 using System.Linq;
 using Unity.VisualScripting;
 
-namespace VisualPinball.Unity.VisualScripting
+namespace VisualPinball.Unity.VisualScripting.Editor
 {
 	[Widget(typeof(SetCoilUnit))]
 	public sealed class SetCoilUnitWidget : GleUnitWidget<SetCoilUnit>
diff --git a/Editor/Widgets/SetLampUnitWidget.cs b/Editor/Widgets/SetLampUnitWidget.cs
@@ -19,7 +19,7 @@
 using System.Linq;
 using Unity.VisualScripting;
 
-namespace VisualPinball.Unity.VisualScripting
+namespace VisualPinball.Unity.VisualScripting.Editor
 {
 	[Widget(typeof(SetLampUnit))]
 	public sealed class SetLampUnitWidget : GleUnitWidget<SetLampUnit>
diff --git a/Editor/Widgets/SwitchEventUnitWidget.cs b/Editor/Widgets/SwitchEventUnitWidget.cs
@@ -19,7 +19,7 @@
 using System.Linq;
 using Unity.VisualScripting;
 
-namespace VisualPinball.Unity.VisualScripting
+namespace VisualPinball.Unity.VisualScripting.Editor
 {
 	[Widget(typeof(SwitchEventUnit))]
 	public sealed class SwitchEventUnitWidget : GleUnitWidget<SwitchEventUnit>

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,7 @@ protected override void DefinedPort(IUnitPort port, UnitPortDescription descript`
`29`	`29`	`{`
`30`	`30`	`base.DefinedPort(port, description);`
`31`	`31`
`32`		`- switch (port.key)`
`33`		`- {`
	`32`	`+ switch (port.key) {`
`34`	`33`	`case nameof(SetCoilUnit.Id):`
`35`	`34`	`description.summary = "The ID of the coil to be set.";`
`36`	`35`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`using VisualPinball.Unity;`
`20`	`20`	`using VisualPinball.Unity.VisualScripting;`
`21`	`21`
`22`		`-namespace Editor`
	`22`	`+namespace VisualPinball.Unity.VisualScripting.Editor`
`23`	`23`	`{`
`24`	`24`
`25`	`25`	`[Analyser(typeof(SwitchEventUnit))]`
Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,13 @@`
`15`	`15`	`// along with this program. If not, see <https://www.gnu.org/licenses/>.`
`16`	`16`
`17`	`17`	`using UnityEditor;`
`18`		`-using VisualPinball.Unity.VisualScripting;`
`19`	`18`
`20`		`-namespace Editor.PropertyDrawers`
	`19`	`+namespace VisualPinball.Unity.VisualScripting.Editor`
`21`	`20`	`{`
`22`	`21`	`[CustomPropertyDrawer(typeof(VisualScriptingCoil))]`
`23`	`22`	`public class VisualScriptingCoilPropertyDrawer : VisualScriptingDeviceItemPropertyDrawer`
`24`	`23`	`{`
`25`		`- public override string NameName => nameof(VisualScriptingCoil.Name);`
`26`		`- public override string DescName => nameof(VisualScriptingCoil.Desc);`
	`24`	`+ protected override string NameName => nameof(VisualScriptingCoil.Name);`
	`25`	`+ protected override string DescName => nameof(VisualScriptingCoil.Desc);`
`27`	`26`	`}`
`28`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,16 +16,15 @@`
`16`	`16`
`17`	`17`	`using UnityEditor;`
`18`	`18`	`using UnityEngine;`
`19`		`-using VisualPinball.Unity.VisualScripting;`
`20`	`19`
`21`		`-namespace Editor.PropertyDrawers`
	`20`	`+namespace VisualPinball.Unity.VisualScripting.Editor`
`22`	`21`	`{`
`23`	`22`	`public abstract class VisualScriptingDeviceItemPropertyDrawer : PropertyDrawer`
`24`	`23`	`{`
`25`	`24`	`private const float Padding = 2f;`
`26`	`25`
`27`		`- public abstract string NameName { get; }`
`28`		`- public abstract string DescName { get; }`
	`26`	`+ protected abstract string NameName { get; }`
	`27`	`+ protected abstract string DescName { get; }`
`29`	`28`
`30`	`29`	`public override float GetPropertyHeight(SerializedProperty property, GUIContent label)`
`31`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,12 +17,12 @@`
`17`	`17`	`using UnityEditor;`
`18`	`18`	`using VisualPinball.Unity.VisualScripting;`
`19`	`19`
`20`		`-namespace Editor.PropertyDrawers`
	`20`	`+namespace VisualPinball.Unity.VisualScripting.Editor`
`21`	`21`	`{`
`22`	`22`	`[CustomPropertyDrawer(typeof(VisualScriptingSwitch))]`
`23`	`23`	`public class VisualScriptingSwitchPropertyDrawer : VisualScriptingDeviceItemPropertyDrawer`
`24`	`24`	`{`
`25`		`- public override string NameName => nameof(VisualScriptingSwitch.Name);`
`26`		`- public override string DescName => nameof(VisualScriptingSwitch.Desc);`
	`25`	`+ protected override string NameName => nameof(VisualScriptingSwitch.Name);`
	`26`	`+ protected override string DescName => nameof(VisualScriptingSwitch.Desc);`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,9 @@`
`14`	`14`	`// You should have received a copy of the GNU General Public License`
`15`	`15`	`// along with this program. If not, see <https://www.gnu.org/licenses/>.`
`16`	`16`
`17`		`-using System;`
`18`		`-using System.Collections.Generic;`
`19`		`-using System.Linq;`
`20`	`17`	`using Unity.VisualScripting;`
`21`	`18`
`22`		`-namespace VisualPinball.Unity.VisualScripting`
	`19`	`+namespace VisualPinball.Unity.VisualScripting.Editor`
`23`	`20`	`{`
`24`	`21`	`public abstract class GleUnitWidget<TUnit> : UnitWidget<TUnit> where TUnit : Unit, IGleUnit`
`25`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`using System.Collections.Generic;`
`19`	`19`	`using Unity.VisualScripting;`
`20`	`20`
`21`		`-namespace VisualPinball.Unity.VisualScripting`
	`21`	`+namespace VisualPinball.Unity.VisualScripting.Editor`
`22`	`22`	`{`
`23`	`23`	`[Widget(typeof(LampEventUnit))]`
`24`	`24`	`public sealed class LampEventUnitWidget : UnitWidget<LampEventUnit>`