Remove IdentifierLength settings

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/CNamingService.xtend

@@ -38,10 +38,6 @@ public class CNamingService extends DefaultNamingService {
 	var GeneratorEntry entry
 	
 	override void initializeNamingService(Statechart statechart) {
-		if (entry.identifierLength !== null) {
-			maxLength = entry.identifierLength
-		}
-		
 		if (entry.separator !== null) {
 			separator = entry.separator.charAt(0)
 		}
@@ -50,10 +46,6 @@ public class CNamingService extends DefaultNamingService {
 	}
 	
 	override void initializeNamingService(ExecutionFlow flow) {
-		if (entry.identifierLength !== null) {
-			maxLength = entry.identifierLength
-		}
-		
 		if (entry.separator !== null) {
 			separator = entry.separator.charAt(0)
 		}
@@ -62,10 +54,6 @@ public class CNamingService extends DefaultNamingService {
 	}
 	
 	override Map<NamedElement, String> getShortNameMap(ExecutionFlow flow) {
-		if (entry.identifierLength !== null) {
-			maxLength = entry.identifierLength
-		}
-		
 		if (entry.separator !== null) {
 			separator = entry.separator.charAt(0)
 		}
@@ -74,10 +62,6 @@ public class CNamingService extends DefaultNamingService {
 	}
 	
 	override Map<NamedElement, String> getShortNameMap(Statechart statechart) {
-		if (entry.identifierLength !== null) {
-			maxLength = entry.identifierLength
-		}
-		
 		if (entry.separator !== null) {
 			separator = entry.separator.charAt(0)
 		}

plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/naming/DefaultNamingService.xtend

@@ -82,7 +82,7 @@ class DefaultNamingService implements INamingService {
 	// from public class org.yakindu.sct.generator.c.features.CDefaultFeatureValueProvider extends		
 	private static final String VALID_IDENTIFIER_REGEX = "[_a-zA-Z][_a-zA-Z0-9]*";
 
-	var protected int maxLength = 0
+	val protected int maxLength = 0
 
 	var protected char separator = '_'
 
@@ -93,12 +93,10 @@ class DefaultNamingService implements INamingService {
 	var protected Statechart activeStatechart
 
 	new(int maxLength, char separator) {
-		this.maxLength = maxLength
 		this.separator = separator
 	}
 
 	new() {
-		this.maxLength = 0
 		this.separator = '_'
 	}
 
@@ -504,7 +502,6 @@ class DefaultNamingService implements INamingService {
 	}
 
 	override public setMaxLength(int length) {
-		maxLength = length
 	}
 
 	override public setSeparator(char sep) {

test-plugins/org.yakindu.sct.model.sexec.test/src/org/yakindu/sct/model/sexec/transformation/test/DefaultNamingServiceTest.java

@@ -1,9 +1,9 @@
-/** 
- * Copyright (c) 2015 committers of YAKINDU and others. 
- * 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 
+/**
+ * Copyright (c) 2015 committers of YAKINDU and others.
+ * 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:
  * committers of YAKINDU - initial API and implementation
  *
@@ -28,7 +28,6 @@ import org.yakindu.sct.test.models.SCTUnitTestModels;
 
 import com.google.inject.Inject;
 
-
 public class DefaultNamingServiceTest extends ModelSequencerTest {
 
 	@Inject
@@ -99,174 +98,13 @@ public class DefaultNamingServiceTest extends ModelSequencerTest {
 		}
 	}
 
-	@Test
-	public void testDefaultNamingServiceState_NameMatch_31() {
-
-		for (Statechart statechart : statecharts) {
-
-			// Transform statechart
-			ExecutionFlow flow = sequencer.transform(statechart);
-			flow = optimizer.transform(flow);
-
-			statechartNamingService.setMaxLength(31);
-			statechartNamingService.setSeparator('_');
-			flowNamingService.setMaxLength(31);
-			flowNamingService.setSeparator('_');
-
-			// Initialize naming services for statechart and ExecutionFlow
-			statechartNamingService.initializeNamingService(statechart);
-			flowNamingService.initializeNamingService(flow);
-
-			// Check for equality
-			checkNameEquality(flow, statechartNamingService, flowNamingService);
-		}
-	}
-
-	@Test
-	public void testDefaultNamingServiceState_NameMatch_15() {
-
-		for (Statechart statechart : statecharts) {
-
-			// Transform statechart
-			ExecutionFlow flow = sequencer.transform(statechart);
-			flow = optimizer.transform(flow);
-
-			statechartNamingService.setMaxLength(15);
-			statechartNamingService.setSeparator('_');
-			flowNamingService.setMaxLength(15);
-			flowNamingService.setSeparator('_');
-
-			// Initialize naming services for statechart and ExecutionFlow
-			statechartNamingService.initializeNamingService(statechart);
-			flowNamingService.initializeNamingService(flow);
-
-			// Check for equality
-			checkNameEquality(flow, statechartNamingService, flowNamingService);
-		}
-	}
-
-	@Test
-	public void testDefaultNamingServiceState_NameMatch_7() {
-
-		for (Statechart statechart : statecharts) {
-
-			// Transform statechart
-			ExecutionFlow flow = sequencer.transform(statechart);
-			flow = optimizer.transform(flow);
-
-			statechartNamingService.setMaxLength(7);
-			statechartNamingService.setSeparator('_');
-			flowNamingService.setMaxLength(7);
-			flowNamingService.setSeparator('_');
-
-			// Initialize naming services for statechart and ExecutionFlow
-			statechartNamingService.initializeNamingService(statechart);
-			flowNamingService.initializeNamingService(flow);
-
-			// Check for equality
-			checkNameEquality(flow, statechartNamingService, flowNamingService);
-		}
-	}
-
-	@Test
-	public void testDefaultNamingServiceState_NameMatch_4() {
-
-		for (Statechart statechart : statecharts) {
-
-			// Transform statechart
-			ExecutionFlow flow = sequencer.transform(statechart);
-			flow = optimizer.transform(flow);
-
-			statechartNamingService.setMaxLength(4);
-			statechartNamingService.setSeparator('_');
-			flowNamingService.setMaxLength(4);
-			flowNamingService.setSeparator('_');
-
-			// Initialize naming services for statechart and ExecutionFlow
-			statechartNamingService.initializeNamingService(statechart);
-			flowNamingService.initializeNamingService(flow);
-
-			// Check for equality
-			checkNameEquality(flow, statechartNamingService, flowNamingService);
-		}
-	}
-
-	@Test
-	public void testDefaultNamingServiceState_NameMatch_3() {
-
-		for (Statechart statechart : statecharts) {
-
-			// Transform statechart
-			ExecutionFlow flow = sequencer.transform(statechart);
-			flow = optimizer.transform(flow);
-
-			statechartNamingService.setMaxLength(3);
-			statechartNamingService.setSeparator('_');
-			flowNamingService.setMaxLength(3);
-			flowNamingService.setSeparator('_');
-
-			// Initialize naming services for statechart and ExecutionFlow
-			statechartNamingService.initializeNamingService(statechart);
-			flowNamingService.initializeNamingService(flow);
-
-			// Check for equality
-			checkNameEquality(flow, statechartNamingService, flowNamingService);
-		}
-	}
-
-	@Test
-	public void testDefaultNamingServiceState_NameMatch_2() {
-
-		for (Statechart statechart : statecharts) {
-			// Transform statechart
-			ExecutionFlow flow = sequencer.transform(statechart);
-			flow = optimizer.transform(flow);
-
-			statechartNamingService.setMaxLength(2);
-			statechartNamingService.setSeparator('_');
-			flowNamingService.setMaxLength(2);
-			flowNamingService.setSeparator('_');
-
-			// Initialize naming services for statechart and ExecutionFlow
-			statechartNamingService.initializeNamingService(statechart);
-			flowNamingService.initializeNamingService(flow);
-
-			// Check for equality
-			checkNameEquality(flow, statechartNamingService, flowNamingService);
-		}
-	}
-
-	@Test
-	public void testDefaultNamingServiceState_NameMatch_1() {
-
-		for (Statechart statechart : statecharts) {
-			// Transform statechart
-			ExecutionFlow flow = sequencer.transform(statechart);
-			flow = optimizer.transform(flow);
-
-			statechartNamingService.setMaxLength(1);
-			statechartNamingService.setSeparator('_');
-			flowNamingService.setMaxLength(1);
-			flowNamingService.setSeparator('_');
-
-			// Initialize naming services for statechart and ExecutionFlow
-			statechartNamingService.initializeNamingService(statechart);
-			flowNamingService.initializeNamingService(flow);
-
-			// Check for equality
-			checkNameEquality(flow, statechartNamingService, flowNamingService);
-		}
-	}
-
-	private void checkNameEquality(ExecutionFlow flow,
-			INamingService statechartNamingService,
+	private void checkNameEquality(ExecutionFlow flow, INamingService statechartNamingService,
 			INamingService flowNamingService) {
 
 		for (ExecutionState state : flow.getStates()) {
 			if (state.getSourceElement() instanceof State) {
 				assertEquals(flowNamingService.getShortName(state),
-						statechartNamingService.getShortName((State) state
-								.getSourceElement()));
+						statechartNamingService.getShortName((State) state.getSourceElement()));
 
 			}
 		}

test-plugins/org.yakindu.sct.model.sexec.test/src/org/yakindu/sct/model/sexec/transformation/test/TreeNamingServiceTest.java

@@ -1,9 +1,9 @@
-/** 
- * Copyright (c) 2016 committers of YAKINDU and others. 
- * 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 
+/**
+ * Copyright (c) 2016 committers of YAKINDU and others.
+ * 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:
  * @author René Beckmann (beckmann@itemis.de)
  *
@@ -84,7 +84,7 @@ public class TreeNamingServiceTest extends ModelSequencerTest {
 			ExecutionFlow flow = sequencer.transform(statechart);
 			flow = optimizer.transform(flow);
 
-			List<String> names = new ArrayList<String>();
+			List<String> names = new ArrayList<>();
 
 			executionflowNamingService.setMaxLength(15);
 			executionflowNamingService.setSeparator('_');
@@ -104,26 +104,6 @@ public class TreeNamingServiceTest extends ModelSequencerTest {
 		nameLengthTest(31);
 	}
 
-	@Test
-	public void nameLengthTest20() {
-		nameLengthTest(20);
-	}
-
-	@Test
-	public void nameLengthTest15() {
-		nameLengthTest(15);
-	}
-
-	@Test
-	public void nameLengthTest10() {
-		nameLengthTest(10);
-	}
-
-	@Test
-	public void nameLengthTest8() {
-		nameLengthTest(8);
-	}
-
 	@Test
 	public void optimizerCombinationsTest() {
 		Statechart toTest = null;
@@ -154,7 +134,7 @@ public class TreeNamingServiceTest extends ModelSequencerTest {
 
 			ExecutionFlow optimizedflow = optimizer.transform(flow);
 
-			List<String> names = new ArrayList<String>();
+			List<String> names = new ArrayList<>();
 
 			executionflowNamingService.initializeNamingService(optimizedflow);
 			for (ExecutionState state : flow.getStates()) {
@@ -169,9 +149,9 @@ public class TreeNamingServiceTest extends ModelSequencerTest {
 	public void statechartTest1() {
 		Statechart toTest = getNamingServiceStatechart();
 
-		List<String> names = new ArrayList<String>();
+		List<String> names = new ArrayList<>();
 
-		List<String> expectedNames = new ArrayList<String>(
+		List<String> expectedNames = new ArrayList<>(
 				Arrays.asList("main_region_StateA", "main_region_StateB", "second_region_StateA", "third_region_StateA",
 						"second_region_StateA_AnotherRegion_StateA", "second_region_StateA_AnotherRegion_StateB",
 						"third_region_StateA_AnotherRegion_StateA", "third_region_StateA_AnotherRegion_StateB"));
@@ -200,11 +180,11 @@ public class TreeNamingServiceTest extends ModelSequencerTest {
 	public void statechartTest2() {
 		Statechart toTest = getNamingServiceStatechart();
 
-		List<String> names = new ArrayList<String>();
+		List<String> names = new ArrayList<>();
 
 		// these names are shorter than 15 characters because there are more
 		// elements containing these names, e.g. state actions
-		List<String> expectedNames = new ArrayList<String>(Arrays.asList("mrgn_StA", "mrgn_StteB", "s_SA", "t_SA",
+		List<String> expectedNames = new ArrayList<>(Arrays.asList("mrgn_StA", "mrgn_StteB", "s_SA", "t_SA",
 				"t_SA_AR_SA", "t_SA_AR_StB", "s_SA_AR_SA", "s_SA_AR_StB"));
 
 		ExecutionFlow flow = optimizer.transform(sequencer.transform(toTest));
@@ -246,7 +226,7 @@ public class TreeNamingServiceTest extends ModelSequencerTest {
 			ExecutionFlow flow = sequencer.transform(statechart);
 			flow = optimizer.transform(flow);
 
-			List<String> names = new ArrayList<String>();
+			List<String> names = new ArrayList<>();
 
 			executionflowNamingService.setMaxLength(maxLength);
 			executionflowNamingService.setSeparator('_');