From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sun, 5 Sep 2010 11:37:04 +0000 (+0100)
Subject: always insist on knowing the island name
X-Git-Tag: 0.9.9~19
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=jarrg-ian.git;a=commitdiff_plain;h=e057e83033ea929281de2171df40657650959ef6

always insist on knowing the island name
---

diff --git a/src/com/tedpearson/ypp/market/MarketUploader.java b/src/com/tedpearson/ypp/market/MarketUploader.java
index 4254f00..2466b44 100644
--- a/src/com/tedpearson/ypp/market/MarketUploader.java
+++ b/src/com/tedpearson/ypp/market/MarketUploader.java
@@ -438,6 +438,11 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 		    latch.await(2, java.util.concurrent.TimeUnit.SECONDS);
 		}
 
+		if (islandName == null) {
+		    error("Could not find island name in YPP user interface.");
+		    return;
+		}
+
 		progresslog("table check...");
 
 		String headings_expected[] = new String[]
@@ -497,11 +502,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 			progressNote(pm, "Yarrg: Uploading");
 			progresslog("yarrg upload...");
 
-			if (islandName != null) {
-				doneyarrg = runYarrg(yarrgts, oceanName, islandName, yarrgdata);
-			} else {
-				System.out.println("Couldn't upload to Yarrg - no island name found");
-			}
+			doneyarrg = runYarrg(yarrgts, oceanName, islandName, yarrgdata);
 			progresslog("yarrg done.");
 		}