Closedown

This commit is contained in:
boccioli_m
2017-10-13 09:43:04 +02:00
parent 0d08e406f6
commit 1cf318d9f0
4 changed files with 12 additions and 10 deletions

View File

@@ -63,6 +63,8 @@ public class NewTest extends javax.swing.JPanel {
public static String ALLOWED_CHARSET1 = "[a-z A-Z 0-9 . _ \\- \\[\\] () : , < > = \\$]*"; //les restricted set of chars
public static String ALLOWED_CHARSET2 = "[a-z A-Z 0-9 . _ \\- \\[\\] () : , \\$]*"; //more restricted set of chars
public static String ALLOWED_CHARSET3 = "[a-zA-Z0-9._ \\- \\$ , :]*"; //even more restricted set of chars
public static String VALUE_SEPARATOR = "|";
public static String PARAM_SEPARATOR = ";";
/**
* enumeration of table column indexes
@@ -786,7 +788,7 @@ public class NewTest extends javax.swing.JPanel {
value = (String) attributes.get("value");
description = (String) attributes.get("description");
//build the python code for getting the test parameter
sTestParameters = sTestParameters + name + ":" + value + ":" + description + ";" ;
sTestParameters = sTestParameters + name + VALUE_SEPARATOR + value + VALUE_SEPARATOR + description + PARAM_SEPARATOR ;
}
}
FileInputStream in = new FileInputStream(configFile);
@@ -857,10 +859,10 @@ public class NewTest extends javax.swing.JPanel {
if(param instanceof String){
name = (String) param;
HashMap attributes = (HashMap) hmTestParams.get(param);
value = attributes.get("value").toString().replace("\\:",":");
value = (String) attributes.get("value");
description = (String) attributes.get("description");
//build the python code for getting the test parameter
sTestParameters = sTestParameters + name + "&" + value + "&" + description + ";" ;
sTestParameters = sTestParameters + name + VALUE_SEPARATOR + value + VALUE_SEPARATOR + description + PARAM_SEPARATOR ;
}
}
FileInputStream in = new FileInputStream(configFile);