[room] fixed NamesAreUnique validation
Change-Id: I5107b1f89d2252cb5a4b4300366f63013fd7910f
diff --git a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/RoomRuntimeModule.java b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/RoomRuntimeModule.java
index 5508af5..ca4fe7c 100644
--- a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/RoomRuntimeModule.java
+++ b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/RoomRuntimeModule.java
@@ -18,11 +18,13 @@
import org.eclipse.etrice.core.linking.RoomConvertingLazyLinker;
import org.eclipse.etrice.core.naming.RoomFragmentProvider;
import org.eclipse.etrice.core.naming.RoomQualifiedNameProvider;
+import org.eclipse.etrice.core.validation.FQNAreUniqueValidationHelper;
import org.eclipse.etrice.core.validation.ValidatorExtensionManager;
import org.eclipse.xtext.conversion.IValueConverterService;
import org.eclipse.xtext.naming.IQualifiedNameProvider;
import org.eclipse.xtext.resource.IFragmentProvider;
import org.eclipse.xtext.scoping.impl.ImportUriResolver;
+import org.eclipse.xtext.validation.INamesAreUniqueValidationHelper;
import com.google.inject.Binder;
import com.google.inject.Provider;
@@ -92,4 +94,8 @@
public Class<? extends org.eclipse.xtext.linking.ILinker> bindILinker() {
return RoomConvertingLazyLinker.class;
}
+
+ public Class<? extends INamesAreUniqueValidationHelper> bindINamesAreUniqueValidationHelper(){
+ return FQNAreUniqueValidationHelper.class;
+ }
}
diff --git a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/validation/FQNAreUniqueValidationHelper.java b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/validation/FQNAreUniqueValidationHelper.java
new file mode 100644
index 0000000..a6c844e
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/validation/FQNAreUniqueValidationHelper.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2015 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Juergen Haug (initial contribution)
+ *
+ *******************************************************************************/
+
+package org.eclipse.etrice.core.validation;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.xtext.validation.NamesAreUniqueValidationHelper;
+
+/**
+ * Clustering is deactivated.<br>
+ * Names are unique: two objects sharing the same fqn prefix have distinct names.<br>
+ * Called by {@link org.eclipse.xtext.validation.NamesAreUniqueValidator NamesAreUniqueValidator}.
+ */
+public class FQNAreUniqueValidationHelper extends NamesAreUniqueValidationHelper {
+
+ @Override
+ protected EClass getAssociatedClusterType(EClass eClass) {
+ return EcorePackage.eINSTANCE.eClass();
+ }
+
+ @Override
+ protected String getTypeLabel(EClass eClass) {
+ return "";
+ }
+}
