SDL_Android/SmartDeviceLinkAndroidProxy - added the correct version of the proxy

[profile/ivi/smartdevicelink.git] / SDL_Android / SmartDeviceLinkProxyAndroid / src / com / smartdevicelink / proxy / RPCMessage.java

diff --git a/SDL_Android/SmartDeviceLinkProxyAndroid/src/com/smartdevicelink/proxy/RPCMessage.java b/SDL_Android/SmartDeviceLinkProxyAndroid/src/com/smartdevicelink/proxy/RPCMessage.java
index dae9dfb..8df1f93 100755 (executable)
--- a/SDL_Android/SmartDeviceLinkProxyAndroid/src/com/smartdevicelink/proxy/RPCMessage.java
+++ b/SDL_Android/SmartDeviceLinkProxyAndroid/src/com/smartdevicelink/proxy/RPCMessage.java
@@ -1,71 +1,71 @@
-//
-// Copyright (c) 2013 Ford Motor Company
-//
-package com.smartdevicelink.proxy;
-
-import java.util.Hashtable;
-
-import com.smartdevicelink.protocol.ProtocolMessage;
-import com.smartdevicelink.protocol.enums.FunctionID;
-import com.smartdevicelink.proxy.constants.Names;
-
-public class RPCMessage extends RPCStruct  {
-
-       public RPCMessage(String functionName) {
-               this(functionName, "request");
-       }
-       
-       protected RPCMessage(RPCMessage rpcm) {
-               this(rpcm.store);
-       }
-       
-       protected RPCMessage(RPCStruct rpcs) {
-               this("", "");
-               this.parameters = rpcs.store;
-       }
-       
-       public RPCMessage(String functionName, String messageType) {
-               function = new Hashtable();
-               this.messageType = messageType;
-               store.put(messageType, function);
-               parameters = new Hashtable();
-               function.put(Names.parameters, parameters);
-               function.put(Names.function_name, functionName);
-       }
-
-       public RPCMessage(Hashtable hash) {
+package com.smartdevicelink.proxy;\r
+\r
+import java.util.Hashtable;\r
+import java.util.Iterator;
+\r
+import com.smartdevicelink.proxy.constants.Names;\r
+\r
+public class RPCMessage extends RPCStruct  {\r
+\r
+       public RPCMessage(String functionName) {\r
+               this(functionName, "request");\r
+       }\r
+       \r
+       protected RPCMessage(RPCMessage rpcm) {\r
+               this(rpcm.store);\r
+       }\r
+       \r
+       protected RPCMessage(RPCStruct rpcs) {\r
+               this("", "");\r
+               this.parameters = rpcs.store;\r
+       }\r
+       \r
+       public RPCMessage(String functionName, String messageType) {\r
+               function = new Hashtable();\r
+               this.messageType = messageType;\r
+               store.put(messageType, function);\r
+               parameters = new Hashtable();\r
+               function.put(Names.parameters, parameters);\r
+               function.put(Names.function_name, functionName);\r
+       }\r
+\r
+       public RPCMessage(Hashtable hash) {\r
                store = hash;
-               messageType = (String)hash.keys().nextElement();
-
-               function = (Hashtable)hash.get(messageType);
-               parameters = (Hashtable)function.get(Names.parameters);
-       }
-
-       protected String messageType;
-       protected Hashtable parameters;
-       protected Hashtable function;
-       
-       public String getFunctionName() {
-               return (String)function.get(Names.function_name);
-       }
-       
-       protected void setFunctionName(String functionName) {
-               function.put(Names.function_name, functionName);
-       }
-
-       public String getMessageType() {
-               return messageType;
-       }
-       
-       public void setParameters(String functionName, Object value) {
-               if (value != null) {
-                       parameters.put(functionName, value);
-               } else {
-                       parameters.remove(functionName);
-               }
-       }
-       
-       public Object getParameters(String functionName) {
-               return parameters.get(functionName);
-       }
-}
+               Iterator it = hash.keySet().iterator();
+               String key;
+               while (it.hasNext()) {
+                       key = (String)it.next().toString();
+                       if (key != Names.bulkData) messageType = key;
+               }\r
+               function = (Hashtable)hash.get(messageType);\r
+               parameters = (Hashtable)function.get(Names.parameters);\r
+       }\r
+\r
+       protected String messageType;\r
+       protected Hashtable parameters;\r
+       protected Hashtable function;\r
+       \r
+       public String getFunctionName() {\r
+               return (String)function.get(Names.function_name);\r
+       }\r
+       \r
+       protected void setFunctionName(String functionName) {\r
+               function.put(Names.function_name, functionName);\r
+       }\r
+\r
+       public String getMessageType() {\r
+               return messageType;\r
+       }\r
+       \r
+       public void setParameters(String functionName, Object value) {\r
+               if (value != null) {\r
+                       parameters.put(functionName, value);\r
+               } else {\r
+                       parameters.remove(functionName);\r
+               }\r
+       }\r
+       \r
+       public Object getParameters(String functionName) {\r
+               return parameters.get(functionName);\r
+       }\r
+}\r