[497744] Catch a space character appearing illegally in a custom type definition.
Change-Id: Ibca4e6c202a9b030e5defdc5362626b07593a7d0
Signed-off-by: Paul Leacu <pleacu@redhat.com>
diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/validation/SyntaxCheckerUtils.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/validation/SyntaxCheckerUtils.java
index e837c66..4cbd64c 100644
--- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/validation/SyntaxCheckerUtils.java
+++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/validation/SyntaxCheckerUtils.java
@@ -220,11 +220,14 @@
int brackets = 0;
int parts = 0;
char last = 0;
+ Boolean bracketSeen = false;
for (char c : name.toCharArray()) {
if (c==' ') {
if (!part.isEmpty()) {
- if (!isJavaPackageName(part))
+ if ((!isJavaPackageName(part)) || !(bracketSeen)) {
+ invalidChar = c;
return false;
+ }
++parts;
part = ""; //$NON-NLS-1$
}
@@ -232,7 +235,9 @@
}
if (c=='<') {
++brackets;
+ bracketSeen = true;
if (last!='<' && last!=',' && !isJavaPackageName(part)) {
+ invalidChar = c;
return false;
}
part = ""; //$NON-NLS-1$
@@ -245,6 +250,7 @@
return false;
}
if (last!='>' && !isJavaPackageName(part)) {
+ invalidChar = c;
return false;
}
part = ""; //$NON-NLS-1$
