Feature 105 language translator split

Examples/ServiceExamples/Scripts/ExampleLanguageTranslation.cs

@@ -0,0 +1,36 @@
+/**
+* Copyright 2015 IBM Corp. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+*/
+
+using UnityEngine;
+using IBM.Watson.DeveloperCloud.Services.LanguageTranslation.v1;
+
+public class ExampleLanguageTranslation : MonoBehaviour {
+	private LanguageTranslation m_Translate = new LanguageTranslation();
+	private string m_PharseToTranslate = "How do I get to the disco?";
+
+	void Start ()
+	{
+		Debug.Log("English Phrase to translate: " + m_PharseToTranslate);
+		m_Translate.GetTranslation(m_PharseToTranslate, "en", "es", OnGetTranslation);
+	}
+
+	private void OnGetTranslation(Translations translation)
+	{
+		if (translation != null && translation.translations.Length > 0)
+			Debug.Log("Spanish Translation: " + translation.translations[0].translation);
+	}
+}

Examples/ServiceExamples/ServiceExamples.unity

@@ -124,7 +124,7 @@ Transform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 9
+  m_RootOrder: 10
 --- !u!1 &525603453
 GameObject:
   m_ObjectHideFlags: 0
@@ -149,7 +149,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 525603453}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d33458a9d3f434f2889ac182de6fa097, type: 3}
+  m_Script: {fileID: 11500000, guid: d929f6bc1ee63ed4cb5fdbe0d2213414, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
 --- !u!4 &525603455
@@ -180,7 +180,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &659829312
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -204,7 +204,7 @@ Transform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 12
+  m_RootOrder: 13
 --- !u!1 &725710367
 GameObject:
   m_ObjectHideFlags: 0
@@ -291,7 +291,7 @@ Transform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 7
 --- !u!1 &748186939
 GameObject:
   m_ObjectHideFlags: 0
@@ -331,7 +331,7 @@ Transform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 11
+  m_RootOrder: 12
 --- !u!1 &859102722
 GameObject:
   m_ObjectHideFlags: 0
@@ -387,7 +387,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &1053617510
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -411,7 +411,7 @@ Transform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 12
+  m_RootOrder: 14
 --- !u!1 &1073418922
 GameObject:
   m_ObjectHideFlags: 0
@@ -451,7 +451,7 @@ Transform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_RootOrder: 8
 --- !u!1 &1160237478
 GameObject:
   m_ObjectHideFlags: 0
@@ -548,7 +548,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &1310649319
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -572,7 +572,7 @@ Transform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 12
+  m_RootOrder: 15
 --- !u!1 &1713392457
 GameObject:
   m_ObjectHideFlags: 0
@@ -588,7 +588,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!114 &1713392458
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -612,7 +612,7 @@ Transform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 8
+  m_RootOrder: 9
 --- !u!1 &1740459831
 GameObject:
   m_ObjectHideFlags: 0
@@ -668,7 +668,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &1937656528
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -692,7 +692,7 @@ Transform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 6
 --- !u!1 &1979050314
 GameObject:
   m_ObjectHideFlags: 0
@@ -772,4 +772,4 @@ Transform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 10
+  m_RootOrder: 11

Scripts/Connection/RESTConnector.cs

@@ -489,6 +489,11 @@ private IEnumerator ProcessRequestQueue()
                 }
                 else
                 {
+
+#if ENABLE_DEBUGGING
+                    Log.Debug("RESTConnector", "Delete Request URL: {0}", url);
+#endif
+
 #if UNITY_EDITOR
                     float timeout = Mathf.Max(Config.Instance.TimeOut, req.Timeout);
 
@@ -507,6 +512,7 @@ private IEnumerator ProcessRequestQueue()
                         continue;
 
                     resp.Success = deleteReq.Success;
+
 #else
                     Log.Warning( "RESTConnector", "DELETE method is supported in the editor only." );
                     resp.Success = false;
@@ -530,8 +536,13 @@ private class DeleteRequest
             public bool IsComplete { get; set; }
             public bool Success { get; set; }
 
+            private Thread m_Thread = null;
+
             public bool Send(string url, Dictionary<string, string> headers)
             {
+#if ENABLE_DEBUGGING
+                Log.Debug("RESTConnector", "DeleteRequest, Send: {0}, m_Thread:{1}", url, m_Thread);
+#endif
                 if (m_Thread != null && m_Thread.IsAlive)
                     return false;
 
@@ -544,24 +555,37 @@ public bool Send(string url, Dictionary<string, string> headers)
                 }
 
                 m_Thread = new Thread(ProcessRequest);
+
                 m_Thread.Start();
                 return true;
             }
-
-            private Thread m_Thread = null;
-
+
             private void ProcessRequest()
             {
                 // This fixes the exception thrown by self-signed certificates.
                 ServicePointManager.ServerCertificateValidationCallback = new RemoteCertificateValidationCallback(delegate { return true; });
 
+#if ENABLE_DEBUGGING
+                Log.Debug("RESTConnector", "DeleteRequest, ProcessRequest {0}", URL);
+#endif
+
                 WebRequest deleteReq = WebRequest.Create(URL);
+
                 foreach (var kp in Headers)
                     deleteReq.Headers.Add(kp.Key, kp.Value);
                 deleteReq.Method = "DELETE";
 
+#if ENABLE_DEBUGGING
+                Log.Debug("RESTConnector", "DeleteRequest, sending deletereq {0}", deleteReq);
+#endif
                 HttpWebResponse deleteResp = deleteReq.GetResponse() as HttpWebResponse;
+#if ENABLE_DEBUGGING
+                Log.Debug("RESTConnector", "DELETE Request SENT: {0}", URL);
+#endif
                 Success = deleteResp.StatusCode == HttpStatusCode.OK;
+#if ENABLE_DEBUGGING
+                Log.Debug("RESTConnector", "DELETE Request COMPLETE: {0}", URL);
+#endif
                 IsComplete = true;
             }
         };

Scripts/Editor/ConfigEditor.cs

@@ -54,10 +54,12 @@ private class ServiceSetup
                 URL ="https://console.ng.bluemix.net/catalog/text-to-speech/", ServiceID="TextToSpeechV1" },
             new ServiceSetup() { ServiceName = "Dialog", ServiceAPI = "dialog/api",
                 URL ="https://console.ng.bluemix.net/catalog/dialog/", ServiceID="DialogV1" },
-            new ServiceSetup() { ServiceName = "Language Translator", ServiceAPI = "language-translation/api",
-                URL ="https://console.ng.bluemix.net/catalog/services/language-translation/", ServiceID="LanguageTranslatorV1" },
+            new ServiceSetup() { ServiceName = "Language Translation (to be deprecated)", ServiceAPI = "language-translation/api",
+                URL ="https://console.ng.bluemix.net/catalog/services/language-translation/", ServiceID="LanguageTranslationV1" },
+            //new ServiceSetup() { ServiceName = "Language Translator", ServiceAPI = "language-translator/api",
+            //    URL ="https://console.ng.bluemix.net/catalog/services/language-translator/", ServiceID="LanguageTranslatorV1" },
             new ServiceSetup() { ServiceName = "Natural Language Classifier", ServiceAPI = "natural-language-classifier/api",
-				URL ="https://console.ng.bluemix.net/catalog/natural-language-classifier/", ServiceID="NaturalLanguageClassifierV1" },
+				        URL ="https://console.ng.bluemix.net/catalog/natural-language-classifier/", ServiceID="NaturalLanguageClassifierV1" },
             new ServiceSetup() { ServiceName = "Tone Analyzer", ServiceAPI = "tone-analyzer/api",
                 URL ="https://console.ng.bluemix.net/catalog/services/tone-analyzer/", ServiceID="ToneAnalyzerV3" },
             new ServiceSetup() { ServiceName = "Tradeoff Analytics", ServiceAPI = "tradeoff-analytics/api",