diff InstructionsPanel.java @ 37:0e030f32a6e2

Allow alphanumeric subject IDs

--- a/InstructionsPanel.java	Wed Nov 14 21:53:01 2012 +0000
+++ b/InstructionsPanel.java	Fri Nov 16 10:17:19 2012 +0000
@@ -11,11 +11,12 @@
 import javax.swing.*;
 import javax.swing.text.*;
 import java.io.*;
+import java.util.regex.Pattern;
 
 public class InstructionsPanel extends JPanel { 
 
     /* invalid subject id */ 
-    public static final int INVALID_SUBJECT_ID = -1000; 
+    public static final String INVALID_SUBJECT_ID = "----"; 
 
     /* variables */ 
     private ExperimentGui gui; 
@@ -51,13 +52,14 @@
 
     /* methods */ 
 
-    public int getSubjectID() {
-        int subjID;
-        try {
-            subjID = Integer.parseInt(subjectIDField.getText());
-        } catch (NumberFormatException e) {
+    public String getSubjectID() {
+	String subjID = subjectIDField.getText();
+	Pattern nonAlphaNum = Pattern.compile("[^a-zA-Z0-9]");
+	
+	if (nonAlphaNum.matcher(subjID).find()) {
             subjID = INVALID_SUBJECT_ID; 
         }
+
         return subjID; 
     }