From 08493bf78cc4f9ba9d63d11cd02577821b414ea7 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@digia.com>
Date: Wed, 30 Oct 2013 15:23:55 +0100
Subject: [PATCH] QmlDesigner.ImportManager: Catch exception

Something might go wrong during the rewrite
and we should catch this instead of just crashing.

Change-Id: Ic8ac6637d8c1f0c8aad86161386c0ee2e2e53fd6
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
---
 .../importmanager/importmanagerview.cpp       | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/plugins/qmldesigner/components/importmanager/importmanagerview.cpp b/src/plugins/qmldesigner/components/importmanager/importmanagerview.cpp
index 576a34f4c90..5d91bfdcc78 100644
--- a/src/plugins/qmldesigner/components/importmanager/importmanagerview.cpp
+++ b/src/plugins/qmldesigner/components/importmanager/importmanagerview.cpp
@@ -30,6 +30,9 @@
 #include "importmanagerview.h"
 #include "importswidget.h"
 
+#include <rewritingexception.h>
+
+#include <QMessageBox>
 
 namespace QmlDesigner {
 
@@ -244,14 +247,24 @@ void ImportManagerView::scriptFunctionsChanged(const ModelNode &/*node*/, const
 
 void ImportManagerView::removeImport(const Import &import)
 {
-    if (model())
-        model()->changeImports(QList<Import>(), QList<Import>() << import);
+    try {
+        if (model())
+            model()->changeImports(QList<Import>(), QList<Import>() << import);
+    }
+    catch (RewritingException &e) {
+        QMessageBox::warning(0, "Error", e.description());
+    }
 }
 
 void ImportManagerView::addImport(const Import &import)
 {
-    if (model())
-        model()->changeImports(QList<Import>() << import, QList<Import>());
+    try {
+        if (model())
+            model()->changeImports(QList<Import>() << import, QList<Import>());
+    }
+    catch (RewritingException &e) {
+        QMessageBox::warning(0, "Error", e.description());
+    }
 }
 
 } // namespace QmlDesigner