Add WayPoints API & fix resumption after rebase

1 files changed, 37 insertions, 5 deletions

diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_subscribe_way_points_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_subscribe_way_points_response.h
index 716ec8ff4e..d6637c709c 100644
--- a/src/components/application_manager/include/application_manager/commands/hmi/navi_subscribe_way_points_response.h
+++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_subscribe_way_points_response.h
@@ -1,3 +1,35 @@
+/*
+ * Copyright (c) 2016, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_SUBSCRIBE_WAY_POINTS_RESPONSE_H_
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_NAVI_SUBSCRIBE_WAY_POINTS_RESPONSE_H_
 
@@ -10,7 +42,7 @@ namespace commands {
 /**
  * @brief NaviSubscribeWaypoints command class
  **/
-class NaviSubscribeWaypointsResponse
+class NaviSubscribeWayPointsResponse
     : public ResponseFromHMI {
  public:
     /**
@@ -18,19 +50,19 @@ class NaviSubscribeWaypointsResponse
      *
      * @param message Incoming SmartObject message
      **/
-    explicit NaviSubscribeWaypointsResponse(const MessageSharedPtr& message);
+    explicit NaviSubscribeWayPointsResponse(const MessageSharedPtr& message);
 
     /**
      * @brief NaviSubscribeWaypoints class destructor
      **/
-    virtual ~NaviSubscribeWaypointsResponse();
+    virtual ~NaviSubscribeWayPointsResponse();
 
     /**
      * @brief Execute command
      **/
-    virtual void Run();
+    virtual void Run() OVERRIDE;
  private:
-  DISALLOW_COPY_AND_ASSIGN(NaviSubscribeWaypointsResponse);
+  DISALLOW_COPY_AND_ASSIGN(NaviSubscribeWayPointsResponse);
 };
 
 } // namespace commands