X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=src%2Fcom%2Ftedpearson%2Fypp%2Fmarket%2FMarketUploader.java;h=1b111cf1494bad083bdfde5483051fd49c8d3993;hb=bc8471453c90b29dc162119866f0f2b73dec5081;hp=f1f78e15a10b17382b77016946a21054bfc71385;hpb=7434e7c58877886b38fcabda7413a884cd29cf50;p=jarrg-ian.git
diff --git a/src/com/tedpearson/ypp/market/MarketUploader.java b/src/com/tedpearson/ypp/market/MarketUploader.java
index f1f78e1..1b111cf 100644
--- a/src/com/tedpearson/ypp/market/MarketUploader.java
+++ b/src/com/tedpearson/ypp/market/MarketUploader.java
@@ -88,6 +88,15 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
return Integer.parseInt(str);
}
}
+
+ private void progressNote(ProgressMonitor pm, String s) {
+ String arb = null;
+ if (arbitrageResult != null)
+ arb = arbitrageResult.getText();
+ if (arb != null && arb.length() != 0)
+ s = "" + arb + "
" + s;
+ pm.setNote(s);
+ }
/**
* An abstract market offer, entailing a commodity being bought or sold by
@@ -444,7 +453,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
}
if (uploadToYarrg && yarrgts != null) {
- pm.setNote("Yarrg: Preparing data");
+ progressNote(pm, "Yarrg: Preparing data");
pm.setProgress(10);
StringBuilder yarrgsb = new StringBuilder();
@@ -464,7 +473,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
yarrgdata = yarrgsb.toString();
- pm.setNote("Yarrg: Uploading");
+ progressNote(pm, "Yarrg: Uploading");
if (islandName != null) {
doneyarrg = runYarrg(yarrgts, oceanName, islandName, yarrgdata);
@@ -474,7 +483,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
}
if (uploadToPCTB) {
- pm.setNote("PCTB: Getting stall names");
+ progressNote(pm, "PCTB: Getting stall names");
pm.setProgress(20);
if(pm.isCanceled()) {
return;
@@ -483,7 +492,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
TreeSet sells = new TreeSet();
LinkedHashMap stallMap = getStallMap(data);
pm.setProgress(40);
- pm.setNote("PCTB: Sorting offers");
+ progressNote(pm, "PCTB: Sorting offers");
if(pm.isCanceled()) {
return;
}
@@ -500,7 +509,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
ByteArrayOutputStream outStream = new ByteArrayOutputStream();
pm.setProgress(60);
- pm.setNote("PCTB: Sending data");
+ progressNote(pm, "PCTB: Sending data");
if(pm.isCanceled()) {
return;
}
@@ -518,7 +527,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
if(pm.isCanceled()) {
return;
}
- pm.setNote("PCTB: Waiting ...");
+ progressNote(pm, "PCTB: Waiting ...");
donepctb = finishUpload(in);
}
pm.setProgress(100);
@@ -1037,8 +1046,8 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
}
}
- private @SuppressWarnings("unchecked") void calculateArbitrage(ArrayList> data)
- {
+ private @SuppressWarnings("unchecked")
+ void calculateArbitrage(ArrayList> data) {
int arbitrage = 0;
ArrayList> arb_bs = null;
String lastcommod = null;
@@ -1070,7 +1079,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
}
arbitrage += calculateArbitrageCommodity(arb_bs);
if (arbitrage != 0) {
- arbitrageResult.setText("arbitrage: "+arbitrage+" poe");
+ arbitrageResult.setText("arbitrage: "+arbitrage+" poe");
} else {
arbitrageResult.setText("no arbitrage");
}