[system_design] use common check for names in elements of strongly ty…

…ped enums.
roboterclubaachen · Feb 15, 2015 · da3f72a · salkinium · Feb 15, 2015 · da3f72a
1 parent b91583f
commit da3f72a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/tools/system_design/xmlparser/type.py b/tools/system_design/xmlparser/type.py
@@ -129,8 +129,7 @@ def __init__(self, node, stronglyTyped):
 				if not re.match("^[0-9A-Z_]*$", self.name):
 					raise ParserException("Attribute name of element in enum has to be `UPPER_UNDERSCORE_STYLE` (found: '%s')" % (self.name))
 			else:
-				if not all(part.istitle() for part in self.name.split(' ')):
-					raise ParserException("Attribute name of element in enum has to be `Capitalized Spaced Style` (found: '%s')" % (self.name))
+				utils.check_name(self.name)
 
 			self.string = node.get('string')
 			if self.string is None:

diff --git a/tools/system_design/xmlparser/utils.py b/tools/system_design/xmlparser/utils.py
@@ -12,7 +12,7 @@ def check_name(name):
 	
 	"""
 	if not re.match("^([A-Z]?[a-z0-9]* )*([A-Z]?[a-z0-9]*)$", name):
-		raise ParserException("Error in name '%s'. Check Spelling or Case. Allowed are only Names matching '^([A-Z]?[a-z0-9]* )*([A-Z]?[a-z0-9]*)$' " % name)
+		raise ParserException("Error in name '%s'. Check spelling or case. Names must be 'som How spaced Style' matching '^([A-Z]?[a-z0-9]* )*([A-Z]?[a-z0-9]*)$' " % name)
 
 class SortedDictionary(dict):
 	"""