From 56b92576f3689fc01687f001e7dbf35a7da34f78 Mon Sep 17 00:00:00 2001 From: rjy7 Date: Tue, 13 Apr 2010 20:27:05 +0000 Subject: [PATCH] NIHVIVO-375 Merging from rel-1.0-maint branch: Add a case for both existing org and new org name empty to custom form validation. Small change to personHasPosition validator. --- .../n3editing/PersonHasPositionValidator.java | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasPositionValidator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasPositionValidator.java index a3e3849a5..10ede2228 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasPositionValidator.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasPositionValidator.java @@ -8,6 +8,11 @@ import java.util.Map; import com.hp.hpl.jena.rdf.model.Literal; public class PersonHasPositionValidator implements N3Validator { + + private static String DUPLICATE_ERROR = "Must choose an existing organization or create a new one, not both."; + private static String MISSING_ORG_ERROR = "Must either choose an existing organization or create a new one."; + private static String MISSING_ORG_TYPE_ERROR = "Must select a type for the new organization."; + private static String MISSING_ORG_NAME_ERROR = "Must select a name for the new organization."; public Map validate(EditConfiguration editConfig, EditSubmission editSub){ // Map existingUris = editConfig.getUrisInScope(); @@ -25,18 +30,21 @@ public class PersonHasPositionValidator implements N3Validator { if( "".equals(organizationUri)) organizationUri = null; - System.out.println("newOrgName " + newOrgName); - System.out.println("newOrgType " + newOrgType); - System.out.println("organizationUri " + organizationUri); +// System.out.println("newOrgName " + newOrgName); +// System.out.println("newOrgType " + newOrgType); +// System.out.println("organizationUri " + organizationUri); Map errors = new HashMap(); if( organizationUri != null && (newOrgName != null || newOrgType != null) ){ - errors.put("newOrgName", "Must choose from an existing orginization or create a new one, not both."); - errors.put("organizationUri", "Must choose from an existing orginizations or create a new one, not both."); + errors.put("newOrgName", DUPLICATE_ERROR); + errors.put("organizationUri", DUPLICATE_ERROR); + } else if ( organizationUri == null && newOrgName == null && newOrgType == null) { + errors.put("newOrgName", MISSING_ORG_ERROR); + errors.put("organizationUri", MISSING_ORG_ERROR); }else if( organizationUri == null && newOrgName != null && newOrgType == null) { - errors.put("newOrgType", "Must select a type for the new organization"); + errors.put("newOrgType", MISSING_ORG_TYPE_ERROR); }else if( organizationUri == null && newOrgName == null && newOrgType != null) { - errors.put("newOrgName", "Must select a name for the new organization"); + errors.put("newOrgName", MISSING_ORG_NAME_ERROR); } if( errors.size() != 0 )