From d6e498f2ea88f0b7354c16a3d29bd1e7b35ea19a Mon Sep 17 00:00:00 2001 From: Marc Dichmann Date: Mon, 27 Aug 2018 15:33:50 +0200 Subject: [PATCH] Change the regex for experiments --- .gitignore | 5 +++++ .../projectwizard/control/ExperimentImportController.java | 5 +++-- .../life/qbic/projectwizard/control/WizardController.java | 5 +++-- 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4e3f911 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf \ No newline at end of file diff --git a/projectwizard-portlet/src/main/java/life/qbic/projectwizard/control/ExperimentImportController.java b/projectwizard-portlet/src/main/java/life/qbic/projectwizard/control/ExperimentImportController.java index 8d74781..b9037d6 100644 --- a/projectwizard-portlet/src/main/java/life/qbic/projectwizard/control/ExperimentImportController.java +++ b/projectwizard-portlet/src/main/java/life/qbic/projectwizard/control/ExperimentImportController.java @@ -693,8 +693,9 @@ private void fixSpecialExperiments(Map specialExpToExpCode) { // add project code validators TextField f = projectInfoComponent.getProjectField(); CompositeValidator vd = new CompositeValidator(); - RegexpValidator p = new RegexpValidator("Q[A-Xa-x0-9]{4}", - "Project must have length of 5, start with Q and not contain Y or Z"); + //RegexpValidator p = new RegexpValidator("Q[A-Xa-x0-9]{4}", + // "Project must have length of 5, start with Q and not contain Y or Z"); + RegexpValidator p = new RegexpValidator("[A-Z]+", "Project must only contain upper case letters"); vd.addValidator(p); vd.addValidator(new ProjectNameValidator(openbis)); f.addValidator(vd); diff --git a/projectwizard-portlet/src/main/java/life/qbic/projectwizard/control/WizardController.java b/projectwizard-portlet/src/main/java/life/qbic/projectwizard/control/WizardController.java index 8a234ef..1ad7f9f 100644 --- a/projectwizard-portlet/src/main/java/life/qbic/projectwizard/control/WizardController.java +++ b/projectwizard-portlet/src/main/java/life/qbic/projectwizard/control/WizardController.java @@ -808,8 +808,9 @@ public void valueChange(ValueChangeEvent event) { TextField f = contextStep.getProjectCodeField(); CompositeValidator vd = new CompositeValidator(); - RegexpValidator p = new RegexpValidator("Q[A-Xa-x0-9]{4}", - "Project must have length of 5, start with Q and not contain Y or Z"); + //RegexpValidator p = new RegexpValidator("Q[A-Xa-x0-9]{4}", + // "Project must have length of 5, start with Q and not contain Y or Z"); + RegexpValidator p = new RegexpValidator("[A-Z]+", "Project must only contain upper case letters"); vd.addValidator(p); vd.addValidator(new ProjectNameValidator(openbis)); f.addValidator(vd);