Enable routing problem UI feedback for users

[simantics/district.git] / org.simantics.district.route / src / org / simantics / district / route / RouteJob.java

diff --git a/org.simantics.district.route/src/org/simantics/district/route/RouteJob.java b/org.simantics.district.route/src/org/simantics/district/route/RouteJob.java
index 897366ada886f17308fee48caeda0c8e3a043fee..b58f384422162016d071ad9915542537e91f3938 100644 (file)
--- a/org.simantics.district.route/src/org/simantics/district/route/RouteJob.java
+++ b/org.simantics.district.route/src/org/simantics/district/route/RouteJob.java
@@ -8,6 +8,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.osgi.util.NLS;
 import org.simantics.ObjectIdentitySchedulingRule;
 import org.simantics.db.Resource;
 import org.simantics.district.route.internal.Activator;
@@ -48,12 +49,15 @@ public class RouteJob extends Job {
                     return Status.OK_STATUS;
                 }
             } catch (RoutingException e) {
-                LOGGER.error("Routing failed for waypoints {} and router {}", waypoints, router, e);
+                LOGGER.error("Routing failed for waypoints {} and router '{}'", waypoints, router, e);
                 callback.completeExceptionally(e);
+                // This results in UI feedback of the error.
+                // Perhaps later we get rid of this and let the UI code handle the notifications.
+                return new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage());
             }
         }
         LOGGER.info("No router could calculate route between waypoints {}. Available routers: {}", waypoints, routers);
-        return Status.OK_STATUS;
+        return new Status(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind("No router could calculate route between waypoints {0}. Available routers: {1}", waypoints, routers));
     }
 
 }