X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Ffunction%2Fsrtm%2FLookupSrtmFunction.java;fp=tim%2Fprune%2Ffunction%2Fsrtm%2FLookupSrtmFunction.java;h=22ee8311a11c91222f58475dfdd2df6e0f750ca2;hb=649c5da6ee1bbc590699e11a92316ece2ea8512d;hp=1bf26cd8646c9b36ad8761f07b74c55f0636a978;hpb=eebbb64b5d63f9eea43a0dff908c30361a376768;p=GpsPrune.git

diff --git a/tim/prune/function/srtm/LookupSrtmFunction.java b/tim/prune/function/srtm/LookupSrtmFunction.java
index 1bf26cd..22ee831 100644
--- a/tim/prune/function/srtm/LookupSrtmFunction.java
+++ b/tim/prune/function/srtm/LookupSrtmFunction.java
@@ -104,6 +104,7 @@ public class LookupSrtmFunction extends GenericFunction implements Runnable
 		cancelButton.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
 				_cancelled = true;
+				_dialog.dispose();
 			}
 		});
 		buttonPanel.add(cancelButton);
@@ -178,6 +179,7 @@ public class LookupSrtmFunction extends GenericFunction implements Runnable
 		_progressBar.setMaximum(inTileList.size());
 		_progressBar.setIndeterminate(inTileList.size() <= 1);
 		_progressBar.setValue(0);
+		String errorMessage = null;
 		// Get urls for each tile
 		URL[] urls = TileFinder.getUrls(inTileList);
 		for (int t=0; t<inTileList.size() && !_cancelled; t++)
@@ -185,8 +187,8 @@ public class LookupSrtmFunction extends GenericFunction implements Runnable
 			if (urls[t] != null)
 			{
 				SrtmTile tile = inTileList.get(t);
-				// System.out.println("tile " + t + " of " + tileList.size() + " = " + urls[t].toString());
-				try {
+				try
+				{
 					_progressBar.setValue(t);
 					final int ARRLENGTH = 1201*1201;
 					int[] heights = new int[ARRLENGTH];
@@ -247,11 +249,12 @@ public class LookupSrtmFunction extends GenericFunction implements Runnable
 					}
 				}
 				catch (IOException ioe) {
-					//System.err.println("eek - " + ioe.getMessage());
+					errorMessage = ioe.getClass().getName() + " - " + ioe.getMessage();
 				}
 			}
 		}
 		_dialog.dispose();
+		if (_cancelled) {return;}
 		if (numAltitudesFound > 0)
 		{
 			// Inform app including undo information
@@ -260,6 +263,9 @@ public class LookupSrtmFunction extends GenericFunction implements Runnable
 			_app.completeFunction(undo, I18nManager.getText("confirm.lookupsrtm1") + " " + numAltitudesFound
 				+ " " + I18nManager.getText("confirm.lookupsrtm2"));
 		}
+		else if (errorMessage != null) {
+			_app.showErrorMessageNoLookup(getNameKey(), errorMessage);
+		}
 		else if (inTileList.size() > 0) {
 			_app.showErrorMessage(getNameKey(), "error.lookupsrtm.nonefound");
 		}