3 files changed, 24 insertions, 24 deletions

diff --git a/api/franca/navigation/mapviewer/CMakeLists.txt b/api/franca/navigation/mapviewer/CMakeLists.txt
index 7e8049d..c861873 100644
--- a/api/franca/navigation/mapviewer/CMakeLists.txt
+++ b/api/franca/navigation/mapviewer/CMakeLists.txt
@@ -24,6 +24,14 @@ cmake_minimum_required (VERSION 2.8.1)
 
 project(franca-mapviewer)
 
+get_directory_property(hasParent PARENT_DIRECTORY)
+
+if(hasParent)
+    set(COMMONAPI_GEN_DIR "${COMMONAPI_GEN_DIR}" PARENT_SCOPE)
+else()
+    set(COMMONAPI_GEN_DIR "${CMAKE_CURRENT_BINARY_DIR}/src-gen")
+endif()
+
 option(COMMONAPI_TOOL_DIR
        "Absolute path to CommonAPI tool" "")
 option(COMMONAPI_DBUS_TOOL_DIR
diff --git a/api/franca/navigation/mapviewer/MapViewerControl.fidl b/api/franca/navigation/mapviewer/MapViewerControl.fidl
index 2749ccb..a7df0c3 100755
--- a/api/franca/navigation/mapviewer/MapViewerControl.fidl
+++ b/api/franca/navigation/mapviewer/MapViewerControl.fidl
@@ -295,7 +295,6 @@ interface MapViewerControl {
 
 	<**
 		@description : createMapViewInstance = This method creates a new map instance
-		notify(MAPVIEWERCONTROL_ERROR_NOMOREMAPVIEWINSTANCEHANDLES) is emitted if no more map view instance handles are available
 	**>
 	method createMapViewInstance {
 		in {
@@ -319,11 +318,14 @@ interface MapViewerControl {
 			**>
 			Handle mapViewInstanceHandle
 		}
+		error {
+			OK
+			MAPVIEWERCONTROL_ERROR_NOMOREMAPVIEWINSTANCEHANDLES //no more map view instance handles are available
+		}
 	}
 
 	<**
 		@description : releaseMapViewInstance = This method releases (i.e. destroys) a given map instance. Only invisible map instances can be released
-		notify(MAPVIEWERCONTROL_ERROR_MAPVIEWINSTANCENOTAVAILABLE) is emitted if an application tries to delete a map view instance handle that is not available
 	**>
 	method releaseMapViewInstance {
 		in {
@@ -338,6 +340,10 @@ interface MapViewerControl {
 			**>
 			Handle mapViewInstanceHandle
 		}
+		error {
+			OK
+			MAPVIEWERCONTROL_ERROR_MAPVIEWINSTANCENOTAVAILABLE //an application tries to delete a map view instance handle that is not available
+		}
 	}
 
 	<**
@@ -1958,14 +1964,4 @@ interface MapViewerControl {
 			SelectedMapElement [] selectedElements
 		}
 	}
-
-	<**
-		@description : notify = This signal is emitted when something wrong occured when invoking the API 
-	**>
-	broadcast notify {
-		out {
-			Notification notification
-		}
-	}
-
 }
\ No newline at end of file
diff --git a/api/franca/navigation/mapviewer/Session.fidl b/api/franca/navigation/mapviewer/Session.fidl
index 9fbe92e..7f38ecb 100644
--- a/api/franca/navigation/mapviewer/Session.fidl
+++ b/api/franca/navigation/mapviewer/Session.fidl
@@ -27,7 +27,6 @@ interface Session {
 	}	
 
 	<** @description : createSession = This method creates a new session and retrieves a handle .
-		notify(SESSION_ERROR_NOMORESESSIONHANDLES) is emitted if no more session handles are available
 	**>
 	method createSession {
 		in {
@@ -43,16 +42,23 @@ interface Session {
 			<**	@description : sessionHandle **>
 			Handle sessionHandle
 		}
+		error {
+			OK
+			SESSION_ERROR_NOMORESESSIONHANDLES //no more session handles are available
+		}
 	}
 
 	<** @description : deleteSession = This method deletes a session and its associated resources .
-		notify(SESSION_ERROR_SESSIONNOTAVAILABLE) is emitted if an application tries to delete a session handle that is not available
 	**>
 	method deleteSession {
 		in {
 			<**	@description : sessionHandle **>
 			Handle sessionHandle
 		}
+		error {
+			OK
+			SESSION_ERROR_SESSIONNOTAVAILABLE //an application tries to delete a session handle that is not available
+		}
 	}
 
 	<**	@description : This method returns whether a given session handle is available or not (for example because it was deleted) .**>
@@ -83,14 +89,4 @@ interface Session {
 			Handle sessionHandle			
 		}
 	}
-
-	<**
-		@description : notify = This signal is emitted when something wrong occured when invoking the API 
-	**>
-	broadcast notify {
-		out {
-			Notification notification
-		}
-	}
-	
 }