Merge pull request #69 from qbicsoftware/development

Prepare next version
qbicsoftware · Aug 4, 2023 · 01c320f · 01c320f
2 parents afbc171 + a5384bd
commit 01c320f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/java/life/qbic/portal/portlet/ProjectWizardUI.java b/src/main/java/life/qbic/portal/portlet/ProjectWizardUI.java
@@ -55,7 +55,7 @@
 public class ProjectWizardUI extends QBiCPortletUI {
 
   public static boolean development = false;
-  public static boolean v3RegistrationAPI = false;
+  public static boolean v3RegistrationAPI = true;
   public static String MSLabelingMethods;
   public static String tmpFolder;
 

diff --git a/src/main/java/life/qbic/projectwizard/views/MetadataUploadView.java b/src/main/java/life/qbic/projectwizard/views/MetadataUploadView.java
@@ -1187,8 +1187,9 @@ protected void createConditionWindow(ComboBox selectionBox) {
     TextField label = new TextField();
     label.setRequired(true);
     label.setStyleName(Styles.fieldTheme);
-    RegexpValidator factorLabelValidator = new RegexpValidator("([a-z]+_?[a-z]*)+([a-z]|[0-9]*)",
-        "Name must start with a lower case letter and contain only lower case letter words, which can be connected by underscores ('_'). It can end with one or more numbers.");
+    RegexpValidator factorLabelValidator = new RegexpValidator("[a-z]+[a-z0-9_]*",
+        "The name may only contain lower-case letters (a-z), "
+            + "numbers and underscores ('_'). It must start with a lower-case letter.");
     label.addValidator(factorLabelValidator);
     label.setValidationVisible(true);
     label.setImmediate(true);