Fixed namespaces.

tmorgner · tmorgner · commit feb399795571 · 2019-03-13T17:48:42.000Z
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/Aggregators/EventMessageAggregator.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/Aggregators/EventMessageAggregator.cs
@@ -1,10 +1,10 @@
 ﻿using System.Collections.Generic;
 using NaughtyAttributes;
-using TutorialSystem.Events;
 using UnityEngine;
 using UnityEngine.Events;
+using UnityTutorialSystem.Events;
 
-namespace TutorialSystem.Aggregators
+namespace UnityTutorialSystem.Aggregators
 {
     public class MatchProgressEvent : UnityEvent<EventMessageAggregator, BasicEventStreamMessage>
     {
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/Aggregators/EventMessageCounter.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/Aggregators/EventMessageCounter.cs
@@ -1,9 +1,9 @@
 ﻿using System;
 using System.Collections.Generic;
-using TutorialSystem.Events;
 using UnityEngine;
+using UnityTutorialSystem.Events;
 
-namespace TutorialSystem.Aggregators
+namespace UnityTutorialSystem.Aggregators
 {
     /// <summary>
     ///     A simple example of an aggregator function. This behaviour listens for
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/Aggregators/EventSequenceAggregator.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/Aggregators/EventSequenceAggregator.cs
@@ -1,11 +1,11 @@
 ﻿using System;
 using System.Collections.Generic;
 using NaughtyAttributes;
-using TutorialSystem.Events;
 using UnityEngine;
 using UnityEngine.Events;
+using UnityTutorialSystem.Events;
 
-namespace TutorialSystem.Aggregators
+namespace UnityTutorialSystem.Aggregators
 {
     /// <summary>
     ///     A event sequence matcher. The matcher checks incoming events against a
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/Aggregators/EventSetAggregator.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/Aggregators/EventSetAggregator.cs
@@ -1,10 +1,10 @@
 ﻿using System;
 using System.Collections.Generic;
-using TutorialSystem.Events;
 using UnityEngine;
 using UnityEngine.Events;
+using UnityTutorialSystem.Events;
 
-namespace TutorialSystem.Aggregators
+namespace UnityTutorialSystem.Aggregators
 {
     /// <summary>
     ///     A aggregator that waits for all events to occur. The events can
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/Aggregators/IEventMessageAggregator.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/Aggregators/IEventMessageAggregator.cs
@@ -1,9 +1,9 @@
 ﻿using System;
 using System.Collections.Generic;
-using TutorialSystem.Events;
 using UnityEngine.Events;
+using UnityTutorialSystem.Events;
 
-namespace TutorialSystem.Aggregators
+namespace UnityTutorialSystem.Aggregators
 {
     public enum EventMessageMatcherState
     {
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/Aggregators/OneOfEventSetAggregator.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/Aggregators/OneOfEventSetAggregator.cs
@@ -1,8 +1,8 @@
 ﻿using System;
 using System.Collections.Generic;
-using TutorialSystem.Events;
+using UnityTutorialSystem.Events;
 
-namespace TutorialSystem.Aggregators
+namespace UnityTutorialSystem.Aggregators
 {
     /// <summary>
     ///     A reactor component that waits for any of the given messages and fires a
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/Events/BasicEventStream.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/Events/BasicEventStream.cs
@@ -5,7 +5,7 @@
 using UnityEngine;
 using UnityEngine.Events;
 
-namespace TutorialSystem.Events
+namespace UnityTutorialSystem.Events
 {
     /// <summary>
     ///     A event stream receives and aggregates preconfigured messages.
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/Events/BasicEventStreamEditorSupport.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/Events/BasicEventStreamEditorSupport.cs
@@ -6,7 +6,7 @@
 
 #endif
 
-namespace TutorialSystem.Events
+namespace UnityTutorialSystem.Events
 {
     public static class BasicEventStreamEditorSupport
     {
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/Events/BasicEventStreamMessage.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/Events/BasicEventStreamMessage.cs
@@ -1,7 +1,7 @@
 ﻿using NaughtyAttributes;
 using UnityEngine;
 
-namespace TutorialSystem.Events
+namespace UnityTutorialSystem.Events
 {
     public class BasicEventStreamMessage : ScriptableObject
     {
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/Events/EventMessageAggregatorStatePublisher.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/Events/EventMessageAggregatorStatePublisher.cs
@@ -1,10 +1,9 @@
 ﻿using System.Collections.Generic;
-using TutorialSystem.Aggregators;
-using TutorialSystem.Events;
 using UnityEngine;
 using UnityEngine.Events;
+using UnityTutorialSystem.Aggregators;
 
-namespace TutorialSystem.Helpers
+namespace UnityTutorialSystem.Events
 {
     public class EventMessageAggregatorStatePublisher : StreamEventSource
     {
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/Events/LogEventStream.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/Events/LogEventStream.cs
@@ -1,8 +1,7 @@
-﻿using System;
-using UnityEngine;
+﻿using UnityEngine;
 using UnityEngine.Events;
 
-namespace TutorialSystem.Events
+namespace UnityTutorialSystem.Events
 {
     public class LogEventStream : MonoBehaviour
     {
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/Events/NextEventAggregationActivator.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/Events/NextEventAggregationActivator.cs
@@ -1,7 +1,6 @@
-﻿using TutorialSystem.Aggregators;
-using TutorialSystem.Events;
+﻿using UnityTutorialSystem.Aggregators;
 
-namespace TutorialSystem.Helpers
+namespace UnityTutorialSystem.Events
 {
     public class NextEventAggregationActivator : NextEventSelectorBase
     {
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/Events/NextEventSelector.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/Events/NextEventSelector.cs
@@ -1,7 +1,7 @@
 ﻿using UnityEngine;
 using UnityEngine.Events;
 
-namespace TutorialSystem.Events
+namespace UnityTutorialSystem.Events
 {
     public class NextEventSelector : NextEventSelectorBase
     {
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/Events/NextEventSelectorBase.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/Events/NextEventSelectorBase.cs
@@ -1,8 +1,9 @@
 ﻿using System.Collections.Generic;
-using TutorialSystem.Aggregators;
 using UnityEngine;
+using UnityTutorialSystem.Aggregators;
+using UnityTutorialSystem.Helpers;
 
-namespace TutorialSystem.Events
+namespace UnityTutorialSystem.Events
 {
     public abstract class NextEventSelectorBase : MonoBehaviour
     {
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/Events/PublishStreamEvent.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/Events/PublishStreamEvent.cs
@@ -1,7 +1,7 @@
 ﻿using JetBrains.Annotations;
 using UnityEngine;
 
-namespace TutorialSystem.Events
+namespace UnityTutorialSystem.Events
 {
     /// <summary>
     ///     This class exists as an trigger to fire events from UnityEvent bindings.
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/Events/StaticStreamEventSource.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/Events/StaticStreamEventSource.cs
@@ -1,7 +1,7 @@
 ﻿using System.Collections.Generic;
 using UnityEngine;
 
-namespace TutorialSystem.Events
+namespace UnityTutorialSystem.Events
 {
     public class StaticStreamEventSource : StreamEventSource
     {
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/Events/StreamEventSource.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/Events/StreamEventSource.cs
@@ -1,6 +1,6 @@
 ﻿using UnityEngine;
 
-namespace TutorialSystem.Events
+namespace UnityTutorialSystem.Events
 {
     public abstract class StreamEventSource : MonoBehaviour
     {
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/Helpers/MouseEventPublisher.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/Helpers/MouseEventPublisher.cs
@@ -1,7 +1,7 @@
 ﻿using UnityEngine;
 using UnityEngine.Events;
 
-namespace TutorialSystem.Helpers
+namespace UnityTutorialSystem.Helpers
 {
     public class MouseEventPublisher : MonoBehaviour
     {
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/Helpers/SharedMethods.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/Helpers/SharedMethods.cs
@@ -4,7 +4,7 @@
 using UnityEngine;
 using UnityEngine.SceneManagement;
 
-namespace TutorialSystem
+namespace UnityTutorialSystem.Helpers
 {
     /// <summary>
     ///     Copied from VRTK_SharedMethods class (MIT License).
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/Tutorial/TutorialEventMessage.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/Tutorial/TutorialEventMessage.cs
@@ -1,9 +1,9 @@
 ﻿using System;
 using NaughtyAttributes;
-using TutorialSystem.Events;
 using UnityEngine;
+using UnityTutorialSystem.Events;
 
-namespace TutorialSystem.Helpers
+namespace UnityTutorialSystem.Tutorial
 {
     public enum TutorialEventState
     {
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/Tutorial/TutorialEventStateData.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/Tutorial/TutorialEventStateData.cs
@@ -3,9 +3,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using TutorialSystem.Events;
+using UnityTutorialSystem.Events;
 
-namespace TutorialSystem.Helpers
+namespace UnityTutorialSystem.Tutorial
 {
     public class TutorialEventStateData : IReadOnlyList<TutorialEventStateData>,
                                           IEquatable<TutorialEventStateData>
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/Tutorial/TutorialEventStream.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/Tutorial/TutorialEventStream.cs
@@ -1,7 +1,7 @@
-﻿using TutorialSystem.Events;
-using UnityEngine;
+﻿using UnityEngine;
+using UnityTutorialSystem.Events;
 
-namespace TutorialSystem.Helpers
+namespace UnityTutorialSystem.Tutorial
 {
     [CreateAssetMenu(menuName = "Event Stream/Tutorial Event Stream")]
     public class TutorialEventStream : BasicEventStream
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/Tutorial/TutorialEventStreamManager.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/Tutorial/TutorialEventStreamManager.cs
@@ -1,12 +1,12 @@
 ﻿using System.Collections.Generic;
 using System.Linq;
 using NaughtyAttributes;
-using TutorialSystem.Aggregators;
-using TutorialSystem.Events;
-using TutorialSystem.UI.Trees;
 using UnityEngine;
+using UnityTutorialSystem.Aggregators;
+using UnityTutorialSystem.Events;
+using UnityTutorialSystem.UI.Trees;
 
-namespace TutorialSystem.Helpers
+namespace UnityTutorialSystem.Tutorial
 {
     public class TutorialEventStreamManager : MonoBehaviour
     {
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/Tutorial/TutorialEventTreeItemRenderer.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/Tutorial/TutorialEventTreeItemRenderer.cs
@@ -1,11 +1,11 @@
 ﻿using System;
 using TMPro;
-using TutorialSystem.Events;
-using TutorialSystem.UI.Trees;
 using UnityEngine;
 using UnityEngine.UI;
+using UnityTutorialSystem.Events;
+using UnityTutorialSystem.UI.Trees;
 
-namespace TutorialSystem.Helpers
+namespace UnityTutorialSystem.Tutorial
 {
     public class TutorialEventTreeItemRenderer : TreeItemRenderer<TutorialEventStateData>
     {
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/Tutorial/TutorialEventTreeView.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/Tutorial/TutorialEventTreeView.cs
@@ -1,7 +1,7 @@
-﻿using TutorialSystem.UI.Trees;
-using UnityEngine;
+﻿using UnityEngine;
+using UnityTutorialSystem.UI.Trees;
 
-namespace TutorialSystem.Helpers
+namespace UnityTutorialSystem.Tutorial
 {
     public class TutorialEventTreeView : TreeView<TutorialEventStateData>
     {
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/UI/Trees/ITreeModel.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/UI/Trees/ITreeModel.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace TutorialSystem.UI.Trees
+namespace UnityTutorialSystem.UI.Trees
 {
     public interface ITreeModel<TNode>
     {
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/UI/Trees/ListTreeModel.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/UI/Trees/ListTreeModel.cs
@@ -1,7 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 
-namespace TutorialSystem.UI.Trees
+namespace UnityTutorialSystem.UI.Trees
 {
     public class ListTreeModel<TList> : TreeModel<TList> where TList : class, IReadOnlyList<TList>
     {
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/UI/Trees/TreeItemRenderer.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/UI/Trees/TreeItemRenderer.cs
@@ -1,6 +1,6 @@
 ﻿using UnityEngine;
 
-namespace TutorialSystem.UI.Trees
+namespace UnityTutorialSystem.UI.Trees
 {
     /// <summary>
     ///     Abstract because its unity
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/UI/Trees/TreeModel.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/UI/Trees/TreeModel.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace TutorialSystem.UI.Trees
+namespace UnityTutorialSystem.UI.Trees
 {
     public abstract class TreeModel<TNode> : ITreeModel<TNode>
     {
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/UI/Trees/TreeModelEventArgs.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/UI/Trees/TreeModelEventArgs.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace TutorialSystem.UI.Trees
+namespace UnityTutorialSystem.UI.Trees
 {
     public class TreeModelEventArgs<TNode> : EventArgs
     {
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/UI/Trees/TreePath.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/UI/Trees/TreePath.cs
@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace TutorialSystem.UI.Trees
+namespace UnityTutorialSystem.UI.Trees
 {
     public static class TreePath
     {
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/UI/Trees/TreeView.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/UI/Trees/TreeView.cs
@@ -1,7 +1,7 @@
 ﻿using System.Collections.Generic;
 using UnityEngine;
 
-namespace TutorialSystem.UI.Trees
+namespace UnityTutorialSystem.UI.Trees
 {
     /// <summary>
     ///     abstract because of generics and unity.
diff --git a/Assets/Plugins/UnityTutorialSystem/Scripts/UI/VisibleDuringEdit.cs b/Assets/Plugins/UnityTutorialSystem/Scripts/UI/VisibleDuringEdit.cs
@@ -1,6 +1,6 @@
 ﻿using UnityEngine;
 
-namespace TutorialSystem.UI
+namespace UnityTutorialSystem.UI
 {
     /// <summary>
     ///     A small helper that deactivates template elements when not in the editor.
diff --git a/UnityTutorialSystem.csproj.DotSettings b/UnityTutorialSystem.csproj.DotSettings
@@ -0,0 +1,3 @@
+﻿<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cplugins/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cplugins_005Cunitytutorialsystem_005Cscripts/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`	`2`	`using NaughtyAttributes;`
`3`		`-using TutorialSystem.Events;`
`4`	`3`	`using UnityEngine;`
`5`	`4`	`using UnityEngine.Events;`
	`5`	`+using UnityTutorialSystem.Events;`
`6`	`6`
`7`		`-namespace TutorialSystem.Aggregators`
	`7`	`+namespace UnityTutorialSystem.Aggregators`
`8`	`8`	`{`
`9`	`9`	`public class MatchProgressEvent : UnityEvent<EventMessageAggregator, BasicEventStreamMessage>`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`		`-using TutorialSystem.Events;`
`4`	`3`	`using UnityEngine.Events;`
	`4`	`+using UnityTutorialSystem.Events;`
`5`	`5`
`6`		`-namespace TutorialSystem.Aggregators`
	`6`	`+namespace UnityTutorialSystem.Aggregators`
`7`	`7`	`{`
`8`	`8`	`public enum EventMessageMatcherState`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`using UnityEngine;`
`6`	`6`	`using UnityEngine.Events;`
`7`	`7`
`8`		`-namespace TutorialSystem.Events`
	`8`	`+namespace UnityTutorialSystem.Events`
`9`	`9`	`{`
`10`	`10`	`/// <summary>`
`11`	`11`	`/// A event stream receives and aggregates preconfigured messages.`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`#endif`
`8`	`8`
`9`		`-namespace TutorialSystem.Events`
	`9`	`+namespace UnityTutorialSystem.Events`
`10`	`10`	`{`
`11`	`11`	`public static class BasicEventStreamEditorSupport`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using NaughtyAttributes;`
`2`	`2`	`using UnityEngine;`
`3`	`3`
`4`		`-namespace TutorialSystem.Events`
	`4`	`+namespace UnityTutorialSystem.Events`
`5`	`5`	`{`
`6`	`6`	`public class BasicEventStreamMessage : ScriptableObject`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,9 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`		`-using TutorialSystem.Aggregators;`
`3`		`-using TutorialSystem.Events;`
`4`	`2`	`using UnityEngine;`
`5`	`3`	`using UnityEngine.Events;`
	`4`	`+using UnityTutorialSystem.Aggregators;`
`6`	`5`
`7`		`-namespace TutorialSystem.Helpers`
	`6`	`+namespace UnityTutorialSystem.Events`
`8`	`7`	`{`
`9`	`8`	`public class EventMessageAggregatorStatePublisher : StreamEventSource`
`10`	`9`	`{`