diff --git a/d4dj_rankTracker.jar b/d4dj_rankTracker.jar index 921609a..54a0524 100644 Binary files a/d4dj_rankTracker.jar and b/d4dj_rankTracker.jar differ diff --git a/src/main/java/d4dj/d4dj/App.java b/src/main/java/d4dj/d4dj/App.java index 549fe45..e5a8842 100644 --- a/src/main/java/d4dj/d4dj/App.java +++ b/src/main/java/d4dj/d4dj/App.java @@ -21,6 +21,7 @@ import java.util.Scanner; import javax.imageio.ImageIO; +import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.NameValuePair; @@ -360,18 +361,40 @@ public class App System.out.println(Arrays.toString(t20scores)); System.out.println(Arrays.toString(lowerTierScores)); - + boolean error1=false; for (int i=0;i<20;i++) { - new Thread( - new SubmitThread(t20names[i],t20desc[i],t20scores[i],EVENT,i+1)) - .start(); + if (!StringUtils.isNumeric(t20scores[i])) { + error1=true; + break; + } } - int[] ranks = new int[] {50,100,500,1000,2000,5000,10000,20000,30000,50000}; - for (int j=0;j<10;j++) { - new Thread( - new SubmitThread(lowerTierNames[j],lowerTierDesc[j],lowerTierScores[j],EVENT,ranks[j])) - .start(); + boolean error2=false; + for (int i=0;i<10;i++) { + if (!StringUtils.isNumeric(lowerTierScores[i])) { + error2=true; + break; + } + } + + if (!error1) { + for (int i=0;i<20;i++) { + new Thread( + new SubmitThread(t20names[i],t20desc[i],t20scores[i],EVENT,i+1)) + .start(); + } + } else { + System.out.println("Cannot submit t20 scores. Invalid array params."); } + int[] ranks = new int[] {50,100,500,1000,2000,5000,10000,20000,30000,50000}; + if (!error2) { + for (int j=0;j<10;j++) { + new Thread( + new SubmitThread(lowerTierNames[j],lowerTierDesc[j],lowerTierScores[j],EVENT,ranks[j])) + .start(); + } + } else { + System.out.println("Cannot submit lower tier scores. Invalid array params."); + } } diff --git a/target/classes/d4dj/d4dj/App.class b/target/classes/d4dj/d4dj/App.class index 3a7884a..66009ad 100644 Binary files a/target/classes/d4dj/d4dj/App.class and b/target/classes/d4dj/d4dj/App.class differ diff --git a/target/classes/d4dj/d4dj/SubmitThread.class b/target/classes/d4dj/d4dj/SubmitThread.class index 3acf2ba..3f3de61 100644 Binary files a/target/classes/d4dj/d4dj/SubmitThread.class and b/target/classes/d4dj/d4dj/SubmitThread.class differ