git-svn-id: http://taverna.googlecode.com/svn/taverna/ui/net.sf.taverna.t2.ui-activities/tags/ui-activities-1.0.1/beanshell-activity-ui@9683 bf327186-88b3-11dd-a302-d386e5130c1c
diff --git a/pom.xml b/pom.xml
index ae95d5b..ae5dacd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sf.taverna.t2</groupId>
<artifactId>ui-activities</artifactId>
- <version>1.0</version>
+ <version>1.0.1</version>
</parent>
<groupId>net.sf.taverna.t2.ui-activities</groupId>
<artifactId>beanshell-activity-ui</artifactId>
diff --git a/src/main/java/net/sf/taverna/t2/activities/beanshell/views/BeanshellConfigView.java b/src/main/java/net/sf/taverna/t2/activities/beanshell/views/BeanshellConfigView.java
index 2070933..d27a2f8 100644
--- a/src/main/java/net/sf/taverna/t2/activities/beanshell/views/BeanshellConfigView.java
+++ b/src/main/java/net/sf/taverna/t2/activities/beanshell/views/BeanshellConfigView.java
@@ -101,6 +101,9 @@
@SuppressWarnings("serial")
public class BeanshellConfigView extends ActivityConfigurationPanel<BeanshellActivity, BeanshellActivityConfigurationBean> {
+ private static final String VALID_NAME_REGEX = "[\\p{L}\\p{Digit}_]+";
+
+
private static Logger logger = Logger.getLogger(BeanshellConfigView.class);
@@ -1012,6 +1015,9 @@
if (inputPortNames.contains(name)) {
text += "Two input ports have the name " + name + "\n";
result = false;
+ } else if (!name.matches(VALID_NAME_REGEX)){
+ text += "Input port name " + name + " is invalid\n";
+ result = false;
} else {
inputPortNames.add(name);
}
@@ -1019,13 +1025,12 @@
Set<String> outputPortNames = new HashSet<String>();
for (BeanshellOutputViewer v : outputViewList) {
String name = v.getNameField().getText();
- if (inputPortNames.contains(name)) {
- text += "An input and an output port are named " + name + "\n";
- result = false;
- }
if (outputPortNames.contains(name)) {
text += "Two output ports have the name " + name + "\n";
result = false;
+ } else if (!name.matches(VALID_NAME_REGEX)){
+ text += "Output port name " + name + " is invalid\n";
+ result = false;
} else {
outputPortNames.add(name);
}
