Skip to content

Commit 3798616

Browse files
committed
feat: Simplified namespaces
1 parent 3e94c74 commit 3798616

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+67
-68
lines changed

Scripts/Connection/RESTConnector.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
// uncomment to enable debugging
1919
//#define ENABLE_DEBUGGING
2020

21-
using IBM.Watson.DeveloperCloud.Utilities;
22-
using IBM.Watson.DeveloperCloud.Logging;
21+
using IBM.Watson.Utilities;
22+
using IBM.Watson.Logging;
2323
using System;
2424
using System.Collections;
2525
using System.Collections.Generic;
@@ -32,7 +32,7 @@
3232
using System.Net.Security;
3333
#endif
3434

35-
namespace IBM.Watson.DeveloperCloud.Connection
35+
namespace IBM.Watson.Connection
3636
{
3737
/// <summary>
3838
/// REST connector class.

Scripts/Connection/WSConnector.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
//! Uncomment to enable message debugging
1919
//#define ENABLE_MESSAGE_DEBUGGING
2020

21-
using IBM.Watson.DeveloperCloud.Logging;
22-
using IBM.Watson.DeveloperCloud.Utilities;
21+
using IBM.Watson.Logging;
22+
using IBM.Watson.Utilities;
2323
using System.Collections;
2424
using System.Collections.Generic;
2525
using System.Security.Authentication;
@@ -34,7 +34,7 @@
3434
using Windows.Storage.Streams;
3535
#endif
3636

37-
namespace IBM.Watson.DeveloperCloud.Connection
37+
namespace IBM.Watson.Connection
3838
{
3939
/// <summary>
4040
/// WebSocket connector class.

Scripts/Debug/DebugReactor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
*
1616
*/
1717

18-
using IBM.Watson.DeveloperCloud.Logging;
18+
using IBM.Watson.Logging;
1919

20-
namespace IBM.Watson.DeveloperCloud.Debug
20+
namespace IBM.Watson.Debug
2121
{
2222
/// <summary>
2323
/// This log reactor logs into the UnityEngine.Debug.Log() function.

Scripts/Editor/IBMCloudSignup.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
*/
1717

18-
using IBM.Watson.DeveloperCloud.Utilities;
18+
using IBM.Watson.Utilities;
1919
using UnityEngine;
2020

2121
public class IBMCloudSignup : MonoBehaviour

Scripts/Editor/WatsonMenu.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
using UnityEditor;
2121
using UnityEngine;
2222

23-
namespace IBM.Watson.DeveloperCloud.Editor
23+
namespace IBM.Watson.Editor
2424
{
2525
public class WatsonMenu : MonoBehaviour
2626
{

Scripts/Logging/FileReactor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
using System;
1919
using System.IO;
2020

21-
namespace IBM.Watson.DeveloperCloud.Logging
21+
namespace IBM.Watson.Logging
2222
{
2323
#if !UNITY_WEBPLAYER
2424

Scripts/Logging/ILogReactor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
*/
1717

18-
namespace IBM.Watson.DeveloperCloud.Logging
18+
namespace IBM.Watson.Logging
1919
{
2020
/// <summary>
2121
/// Any class that implement this interface can be added to the Logger class as a reactor and hook

Scripts/Logging/Logger.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
*
1616
*/
1717

18-
using IBM.Watson.DeveloperCloud.Utilities;
19-
using IBM.Watson.DeveloperCloud.Debug;
18+
using IBM.Watson.Utilities;
19+
using IBM.Watson.Debug;
2020
using System;
2121
using System.Collections.Generic;
2222
using UnityEngine;
2323

24-
namespace IBM.Watson.DeveloperCloud.Logging
24+
namespace IBM.Watson.Logging
2525
{
2626
/// <summary>
2727
/// All log messages are assigned to a log level, typically reactors have filters and will filter log
@@ -92,9 +92,9 @@ public LogRecord(LogLevel level, string subSystem, string messageFmt, params obj
9292
}
9393

9494
/// <summary>
95-
/// Returns a <see cref="System.String"/> that represents the current <see cref="IBM.Watson.DeveloperCloud.Logging.LogRecord"/>.
95+
/// Returns a <see cref="System.String"/> that represents the current <see cref="IBM.Watson.Logging.LogRecord"/>.
9696
/// </summary>
97-
/// <returns>A <see cref="System.String"/> that represents the current <see cref="IBM.Watson.DeveloperCloud.Logging.LogRecord"/>.</returns>
97+
/// <returns>A <see cref="System.String"/> that represents the current <see cref="IBM.Watson.Logging.LogRecord"/>.</returns>
9898
public override string ToString()
9999
{
100100
return string.Format("[{0}][{1}][{2}] {3}", _timeStamp.ToString("MM/dd/yyyy HH:mm:ss"), _subSystem, _level.ToString(), _message);

Scripts/Services/Assistant/v2/Assistant.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,15 @@
1616
*/
1717

1818
using FullSerializer;
19-
using IBM.Watson.DeveloperCloud.Connection;
20-
using IBM.Watson.DeveloperCloud.Logging;
21-
using IBM.Watson.DeveloperCloud.Utilities;
22-
using IBM.WatsonDeveloperCloud.Assistant.v2;
19+
using IBM.Watson.Connection;
20+
using IBM.Watson.Logging;
21+
using IBM.Watson.Utilities;
2322
using System;
2423
using System.Collections.Generic;
2524
using System.Text;
2625
using UnityEngine.Networking;
2726

28-
namespace IBM.Watson.DeveloperCloud.Services.Assistant.v2
27+
namespace IBM.Watson.Assistant.V2
2928
{
3029
public class Assistant : IWatsonService
3130
{

Scripts/Services/Assistant/v2/Models/CaptureGroup.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
using FullSerializer;
1919
using System.Collections.Generic;
2020

21-
namespace IBM.WatsonDeveloperCloud.Assistant.v2
21+
namespace IBM.Watson.Assistant.V2
2222
{
2323
/// <summary>
2424
/// CaptureGroup

Scripts/Services/Assistant/v2/Models/DialogLogMessage.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
using FullSerializer;
1919
using System.Runtime.Serialization;
2020

21-
namespace IBM.WatsonDeveloperCloud.Assistant.v2
21+
namespace IBM.Watson.Assistant.V2
2222
{
2323
/// <summary>
2424
/// Dialog log message details.

Scripts/Services/Assistant/v2/Models/DialogNodeAction.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
using FullSerializer;
1919
using System.Runtime.Serialization;
2020

21-
namespace IBM.WatsonDeveloperCloud.Assistant.v2
21+
namespace IBM.Watson.Assistant.V2
2222
{
2323
/// <summary>
2424
/// DialogNodeAction

Scripts/Services/Assistant/v2/Models/DialogNodeOutputOptionsElement.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
using FullSerializer;
1919

20-
namespace IBM.WatsonDeveloperCloud.Assistant.v2
20+
namespace IBM.Watson.Assistant.V2
2121
{
2222
/// <summary>
2323
/// DialogNodeOutputOptionsElement

Scripts/Services/Assistant/v2/Models/DialogNodeOutputOptionsElementValue.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
using FullSerializer;
1919

20-
namespace IBM.WatsonDeveloperCloud.Assistant.v2
20+
namespace IBM.Watson.Assistant.V2
2121
{
2222
/// <summary>
2323
/// An object defining the message input to be sent to the assistant if the user selects the corresponding option.

Scripts/Services/Assistant/v2/Models/DialogNodesVisited.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
using FullSerializer;
1919

20-
namespace IBM.WatsonDeveloperCloud.Assistant.v2
20+
namespace IBM.Watson.Assistant.V2
2121
{
2222
/// <summary>
2323
/// DialogNodesVisited

Scripts/Services/Assistant/v2/Models/DialogRuntimeResponseGeneric.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
using System.Collections.Generic;
2020
using System.Runtime.Serialization;
2121

22-
namespace IBM.WatsonDeveloperCloud.Assistant.v2
22+
namespace IBM.Watson.Assistant.V2
2323
{
2424
/// <summary>
2525
/// DialogRuntimeResponseGeneric

Scripts/Services/Assistant/v2/Models/DialogSuggestion.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
using FullSerializer;
1919

20-
namespace IBM.WatsonDeveloperCloud.Assistant.v2
20+
namespace IBM.Watson.Assistant.V2
2121
{
2222
/// <summary>
2323
/// DialogSuggestion

Scripts/Services/Assistant/v2/Models/DialogSuggestionValue.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
using FullSerializer;
1919

20-
namespace IBM.WatsonDeveloperCloud.Assistant.v2
20+
namespace IBM.Watson.Assistant.V2
2121
{
2222
/// <summary>
2323
/// An object defining the message input to be sent to the assistant if the user selects the corresponding

Scripts/Services/Assistant/v2/Models/MessageContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
using FullSerializer;
1919

20-
namespace IBM.WatsonDeveloperCloud.Assistant.v2
20+
namespace IBM.Watson.Assistant.V2
2121
{
2222
/// <summary>
2323
/// State information for the conversation.

Scripts/Services/Assistant/v2/Models/MessageContextGlobal.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
using FullSerializer;
1919

20-
namespace IBM.WatsonDeveloperCloud.Assistant.v2
20+
namespace IBM.Watson.Assistant.V2
2121
{
2222
/// <summary>
2323
/// Contains information that can be shared by all skills within the Assistant.

Scripts/Services/Assistant/v2/Models/MessageContextGlobalSystem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
using FullSerializer;
1919

20-
namespace IBM.WatsonDeveloperCloud.Assistant.v2
20+
namespace IBM.Watson.Assistant.V2
2121
{
2222
/// <summary>
2323
/// Properties that are shared by all skills used by the assistant.

Scripts/Services/Assistant/v2/Models/MessageContextSkills.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
using FullSerializer;
1919

20-
namespace IBM.WatsonDeveloperCloud.Assistant.v2
20+
namespace IBM.Watson.Assistant.V2
2121
{
2222
/// <summary>
2323
/// Contains information specific to particular skills within the Assistant.

Scripts/Services/Assistant/v2/Models/MessageInput.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
using System.Collections.Generic;
2121
using System.Runtime.Serialization;
2222

23-
namespace IBM.WatsonDeveloperCloud.Assistant.v2
23+
namespace IBM.Watson.Assistant.V2
2424
{
2525
/// <summary>
2626
/// The user input.

Scripts/Services/Assistant/v2/Models/MessageInputOptions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
using System;
2020
using System.Collections.Generic;
2121

22-
namespace IBM.WatsonDeveloperCloud.Assistant.v2
22+
namespace IBM.Watson.Assistant.V2
2323
{
2424
/// <summary>
2525
/// Optional properties that control how the assistant responds.

Scripts/Services/Assistant/v2/Models/MessageOutput.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
using FullSerializer;
1919
using System.Collections.Generic;
2020

21-
namespace IBM.WatsonDeveloperCloud.Assistant.v2
21+
namespace IBM.Watson.Assistant.V2
2222
{
2323
/// <summary>
2424
/// Assistant output to be rendered or processed by the client.

Scripts/Services/Assistant/v2/Models/MessageOutputDebug.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* limitations under the License.
2020
*
2121
*/
22-
namespace IBM.WatsonDeveloperCloud.Assistant.v2
22+
namespace IBM.Watson.Assistant.V2
2323
{
2424
/// <summary>
2525
/// Additional detailed information about a message response and how it was generated.

Scripts/Services/Assistant/v2/Models/MessageRequest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
using FullSerializer;
1919

20-
namespace IBM.WatsonDeveloperCloud.Assistant.v2
20+
namespace IBM.Watson.Assistant.V2
2121
{
2222
/// <summary>
2323
/// A request formatted for the Watson Assistant service.

Scripts/Services/Assistant/v2/Models/MessageResponse.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
using FullSerializer;
1919

20-
namespace IBM.WatsonDeveloperCloud.Assistant.v2
20+
namespace IBM.Watson.Assistant.V2
2121
{
2222
/// <summary>
2323
/// A response from the Watson Assistant service.

Scripts/Services/Assistant/v2/Models/RuntimeEntity.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
using FullSerializer;
1919
using System.Collections.Generic;
2020

21-
namespace IBM.WatsonDeveloperCloud.Assistant.v2
21+
namespace IBM.Watson.Assistant.V2
2222
{
2323
/// <summary>
2424
/// A term from the request that was identified as an entity.

Scripts/Services/Assistant/v2/Models/RuntimeIntent.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
using FullSerializer;
1919

20-
namespace IBM.WatsonDeveloperCloud.Assistant.v2
20+
namespace IBM.Watson.Assistant.V2
2121
{
2222
/// <summary>
2323
/// An intent identified in the user input.

Scripts/Services/Assistant/v2/Models/SessionResponse.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
using FullSerializer;
1919

20-
namespace IBM.WatsonDeveloperCloud.Assistant.v2
20+
namespace IBM.Watson.Assistant.V2
2121
{
2222
/// <summary>
2323
/// SessionResponse

Scripts/Utilities/AudioClipUtil.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
*
1616
*/
1717

18-
using IBM.Watson.DeveloperCloud.Logging;
18+
using IBM.Watson.Logging;
1919
using System;
2020
using System.IO;
2121
using UnityEngine;
2222

23-
namespace IBM.Watson.DeveloperCloud.Utilities
23+
namespace IBM.Watson.Utilities
2424
{
2525
/// <summary>
2626
/// AudioClip helper functions.

Scripts/Utilities/Constants.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
*/
1717

18-
namespace IBM.Watson.DeveloperCloud.Utilities
18+
namespace IBM.Watson.Utilities
1919
{
2020
/// <summary>
2121
/// This class wraps all constants.

Scripts/Utilities/Credentials.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
*/
1717

1818
using FullSerializer;
19-
using IBM.Watson.DeveloperCloud.Connection;
20-
using IBM.Watson.DeveloperCloud.Logging;
19+
using IBM.Watson.Connection;
20+
using IBM.Watson.Logging;
2121
using System;
2222
using System.Collections.Generic;
2323
using System.Text;
2424
using UnityEngine.Networking;
2525

26-
namespace IBM.Watson.DeveloperCloud.Utilities
26+
namespace IBM.Watson.Utilities
2727
{
2828
/// <summary>
2929
/// Helper class for holding a user and password or authorization token, used by both the WSCOnnector and RESTConnector.

Scripts/Utilities/EventManager.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
*
1616
*/
1717

18-
using IBM.Watson.DeveloperCloud.Logging;
18+
using IBM.Watson.Logging;
1919
using System;
2020
using System.Collections;
2121
using System.Collections.Generic;
2222

23-
namespace IBM.Watson.DeveloperCloud.Utilities
23+
namespace IBM.Watson.Utilities
2424
{
2525
/// <summary>
2626
/// Singleton class for sending and receiving events.

0 commit comments

Comments
 (0)