[core.room] checking names for valid IDs

1 files changed, 11 insertions, 1 deletions

diff --git a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/validation/ValidationUtil.java b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/validation/ValidationUtil.java
index 571c0d163..ff6f76e1b 100644
--- a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/validation/ValidationUtil.java
+++ b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/validation/ValidationUtil.java
@@ -840,6 +840,9 @@ public class ValidationUtil {
 		if (name.isEmpty())

 			return Result.error("name must not be empty");

 		

+		if (!isValidID(name))

+			return Result.error("name is no valid ID");

+		

 		if (item.eContainer() instanceof ActorClass) {

 			ArrayList<InterfaceItem> all = new ArrayList<InterfaceItem>();

 			ActorClass ac = (ActorClass) item.eContainer();

@@ -882,9 +885,12 @@ public class ValidationUtil {
 	}

 	

 	public static Result isUniqueName(StateGraphItem s, String name) {

-		if (name.isEmpty())

+		if (name.trim().isEmpty())

 			return Result.error("name must not be empty");

 		

+		if (!isValidID(name))

+			return Result.error("name is no valid ID");

+		

 		StateGraph sg = (StateGraph) s.eContainer();

 		Set<String> names = RoomHelpers.getAllNames(sg, s);

 		

@@ -980,4 +986,8 @@ public class ValidationUtil {
 		

 		return errors;

 	}

+	

+	public static boolean isValidID(String name) {

+		return !name.matches("\\^?[a-zA-Z_][a-zA-Z_0-9]*");

+	}

 }