static utility methods converted to class methods to be able to use

inheritance and overriding in super classes.
This was done mainly for
* BaseHelpers.java
* RoomHelpers.java
and had a lot of impacts on the whole code base

6 files changed, 30 insertions, 24 deletions

diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestCodeInheritance.java b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestCodeInheritance.java
index 14ab0a1b8..6fa0d8345 100644
--- a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestCodeInheritance.java
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestCodeInheritance.java
@@ -42,7 +42,8 @@ public class TestCodeInheritance extends TestInstanceModelBuilderBase {
 	private HashMap<EClass, ArrayList<EObject>> derivedInstances;
 	private ExpandedActorClass base;
 	private ExpandedActorClass derived;
-
+	private RoomHelpers roomHelpers = new RoomHelpers();
+	
 	@Before
 	public void setUp() {
 		prepare();
@@ -99,26 +100,26 @@ public class TestCodeInheritance extends TestInstanceModelBuilderBase {
 		State s = getState(derived, "BaseEntryExit");
 		assertTrue("is ExpandedRefinedState", s instanceof ExpandedRefinedState);
 		ExpandedRefinedState rs = (ExpandedRefinedState) s;
-		assertEquals("entry code", "// derived entry\n", RoomHelpers.getDetailCode(rs.getEntryCode()));
+		assertEquals("entry code", "// derived entry\n", roomHelpers.getDetailCode(rs.getEntryCode()));
 		assertNull("exit code", rs.getExitCode());
-		assertEquals("inherited entry", "// base entry\n", RoomHelpers.getDetailCode(rs.getInheritedEntry()));
-		assertEquals("inherited exit", "// base exit\n", RoomHelpers.getDetailCode(rs.getInheritedExit()));
+		assertEquals("inherited entry", "// base entry\n", roomHelpers.getDetailCode(rs.getInheritedEntry()));
+		assertEquals("inherited exit", "// base exit\n", roomHelpers.getDetailCode(rs.getInheritedExit()));
 		
 		s = getState(derived, "Base");
 		assertTrue("is ExpandedRefinedState", s instanceof ExpandedRefinedState);
 		rs = (ExpandedRefinedState) s;
 		assertNull("entry code", rs.getEntryCode());
-		assertEquals("exit code", "// derived exit\n", RoomHelpers.getDetailCode(rs.getExitCode()));
-		assertEquals("inherited entry", "", RoomHelpers.getDetailCode(rs.getInheritedEntry()));
-		assertEquals("inherited exit", "", RoomHelpers.getDetailCode(rs.getInheritedExit()));
+		assertEquals("exit code", "// derived exit\n", roomHelpers.getDetailCode(rs.getExitCode()));
+		assertEquals("inherited entry", "", roomHelpers.getDetailCode(rs.getInheritedEntry()));
+		assertEquals("inherited exit", "", roomHelpers.getDetailCode(rs.getInheritedExit()));
 		
 		s = getState(derived, "BaseSub");
 		assertTrue("is ExpandedRefinedState", s instanceof ExpandedRefinedState);
 		rs = (ExpandedRefinedState) s;
-		assertEquals("entry code", "// derived entry\n", RoomHelpers.getDetailCode(rs.getEntryCode()));
+		assertEquals("entry code", "// derived entry\n", roomHelpers.getDetailCode(rs.getEntryCode()));
 		assertNull("exit code", rs.getExitCode());
-		assertEquals("inherited entry", "", RoomHelpers.getDetailCode(rs.getInheritedEntry()));
-		assertEquals("inherited exit", "", RoomHelpers.getDetailCode(rs.getInheritedExit()));
+		assertEquals("inherited entry", "", roomHelpers.getDetailCode(rs.getInheritedEntry()));
+		assertEquals("inherited exit", "", roomHelpers.getDetailCode(rs.getInheritedExit()));
 	}
 
 }
diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestInstanceModelBuilderBase.java b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestInstanceModelBuilderBase.java
index 5bbbb0240..4240717b1 100644
--- a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestInstanceModelBuilderBase.java
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestInstanceModelBuilderBase.java
@@ -66,12 +66,12 @@ public class TestInstanceModelBuilderBase {
 
 		@Override
 		public void error(String msg, EObject source, EStructuralFeature feature) {
-			fail(msg+RoomNameProvider.getLocation(source));
+			fail(msg+roomNameProvider.getLocation(source));
 		}
 
 		@Override
 		public void error(String msg, EObject source, EStructuralFeature feature, int index) {
-			fail(msg+RoomNameProvider.getLocation(source));
+			fail(msg+roomNameProvider.getLocation(source));
 		}
 
 		@Override
@@ -83,7 +83,8 @@ public class TestInstanceModelBuilderBase {
 
 	private String basePath;
 	protected HashMap<EClass, ArrayList<EObject>> instances;
-
+	private RoomNameProvider roomNameProvider = new RoomNameProvider();
+	
 	protected void prepare() {
 		try {
 			URL modelsDir = GenmodelTestsActivator.getInstance().getBundle().getEntry("models");
@@ -150,7 +151,7 @@ public class TestInstanceModelBuilderBase {
 		for (EObject obj : objects) {
 			if (obj instanceof StateGraphItem) {
 				StateGraphItem item = (StateGraphItem) obj;
-				if (RoomNameProvider.getFullPath(item).equals(path))
+				if (roomNameProvider.getFullPath(item).equals(path))
 					return item;
 			}
 		}
diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestMultipleConnectedChoicepoint.java b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestMultipleConnectedChoicepoint.java
index 2695bfaf8..403cdb277 100644
--- a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestMultipleConnectedChoicepoint.java
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestMultipleConnectedChoicepoint.java
@@ -45,7 +45,8 @@ public class TestMultipleConnectedChoicepoint extends
 	
 	private Root root;
 	private ExpandedActorClass xpac;
-
+	private RoomNameProvider roomNameProvider = new RoomNameProvider();
+	
 	@Before
 	public void setUp() {
 		prepare();
@@ -107,7 +108,7 @@ public class TestMultipleConnectedChoicepoint extends
 	public void testGraph() {
 		ArrayList<EObject> cps = instances.get(RoomPackage.eINSTANCE.getChoicePoint());
 		ChoicePoint cp = (ChoicePoint) cps.get(0);
-		assertEquals("choicepoint name", "cp0", RoomNameProvider.getFullPath(cp));
+		assertEquals("choicepoint name", "cp0", roomNameProvider.getFullPath(cp));
 		assertEquals("number of incoming transitions", 2, xpac.getIncomingTransitions(cp).size());
 		assertEquals("number of outgoing transitions", 2, xpac.getOutgoingTransitions(cp).size());
 	}
diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStates.java b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStates.java
index 0930e86b6..af9d06580 100644
--- a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStates.java
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStates.java
@@ -33,6 +33,7 @@ import org.eclipse.etrice.core.room.Transition;
 public class TestStates extends TestInstanceModelBuilderBase {
 	
 	private Root root;
+	private RoomNameProvider roomNameProvider = new RoomNameProvider();
 	
 	@Before
 	public void setUp() {
@@ -90,7 +91,7 @@ public class TestStates extends TestInstanceModelBuilderBase {
 		ArrayList<EObject> cps = instances.get(RoomPackage.eINSTANCE.getChoicePoint());
 		
 		ChoicePoint cp = (ChoicePoint) cps.get(0);
-		assertEquals("choicepoint name", "CP1", RoomNameProvider.getFullPath(cp));
+		assertEquals("choicepoint name", "CP1", roomNameProvider.getFullPath(cp));
 		assertEquals("number of incoming transitions", 1, xpac.getIncomingTransitions(cp).size());
 		assertEquals("number of outgoing transitions", 3, xpac.getOutgoingTransitions(cp).size());
 		
@@ -111,6 +112,6 @@ public class TestStates extends TestInstanceModelBuilderBase {
 		ExpandedActorClass xpac = root.getXpActorClasses().get(0);
 		TransitionChain chain = xpac.getChain(t);
 		assertNotNull("chain", chain);
-		assertEquals("chain name", "TRANS_tr5_FROM_tp0_TO_State3_tp1_BY_afct", RoomNameProvider.getFullPath(chain.getTransition()));
+		assertEquals("chain name", "TRANS_tr5_FROM_tp0_TO_State3_tp1_BY_afct", roomNameProvider.getFullPath(chain.getTransition()));
 	}
 }
diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStatesAndTriggers.java b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStatesAndTriggers.java
index b2ed50684..ef0914522 100644
--- a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStatesAndTriggers.java
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStatesAndTriggers.java
@@ -35,6 +35,7 @@ public class TestStatesAndTriggers extends TestInstanceModelBuilderBase {
 	
 	private Root root;
 	private ExpandedActorClass xpac;
+	private RoomNameProvider roomNameProvider = new RoomNameProvider();
 	
 	@Before
 	public void setUp() {
@@ -97,7 +98,7 @@ public class TestStatesAndTriggers extends TestInstanceModelBuilderBase {
 		ArrayList<EObject> cps = instances.get(RoomPackage.eINSTANCE.getChoicePoint());
 		
 		ChoicePoint cp = (ChoicePoint) cps.get(0);
-		assertEquals("choicepoint name", "CP1", RoomNameProvider.getFullPath(cp));
+		assertEquals("choicepoint name", "CP1", roomNameProvider.getFullPath(cp));
 		assertEquals("number of incoming transitions", 1, xpac.getIncomingTransitions(cp).size());
 		assertEquals("number of outgoing transitions", 3, xpac.getOutgoingTransitions(cp).size());
 		
@@ -117,7 +118,7 @@ public class TestStatesAndTriggers extends TestInstanceModelBuilderBase {
 
 		TransitionChain chain = xpac.getChain(t);
 		assertNotNull("chain", chain);
-		assertEquals("chain name", "TRANS_tr5_FROM_tp0_TO_State3_tp1_BY_afct", RoomNameProvider.getFullPath(chain.getTransition()));
+		assertEquals("chain name", "TRANS_tr5_FROM_tp0_TO_State3_tp1_BY_afct", roomNameProvider.getFullPath(chain.getTransition()));
 	}
 	
 	@Test
diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStatesInheritance.java b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStatesInheritance.java
index e1d2a004c..d9fe5fca0 100644
--- a/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStatesInheritance.java
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/src/org/eclipse/etrice/core/genmodel/TestStatesInheritance.java
@@ -34,7 +34,8 @@ public class TestStatesInheritance extends TestInstanceModelBuilderBase {
 	
 	private Root root;
 	private ExpandedActorClass xpac;
-
+	private RoomNameProvider roomNameProvider = new RoomNameProvider();
+	
 	@Before
 	public void setUp() {
 		prepare();
@@ -108,7 +109,7 @@ public class TestStatesInheritance extends TestInstanceModelBuilderBase {
 		ArrayList<EObject> cps = instances.get(RoomPackage.eINSTANCE.getChoicePoint());
 		
 		ChoicePoint cp = (ChoicePoint) cps.get(0);
-		assertEquals("choicepoint name", "CP1", RoomNameProvider.getFullPath(cp));
+		assertEquals("choicepoint name", "CP1", roomNameProvider.getFullPath(cp));
 		assertEquals("number of incoming transitions", 1, xpac.getIncomingTransitions(cp).size());
 		assertEquals("number of outgoing transitions", 4, xpac.getOutgoingTransitions(cp).size());
 		
@@ -128,13 +129,13 @@ public class TestStatesInheritance extends TestInstanceModelBuilderBase {
 
 		TransitionChain chain = xpac.getChain(t);
 		assertNotNull("chain", chain);
-		assertEquals("chain name", "TRANS_tr5_FROM_tp0_TO_State3_tp1_BY_afct", RoomNameProvider.getFullPath(chain.getTransition()));
+		assertEquals("chain name", "TRANS_tr5_FROM_tp0_TO_State3_tp1_BY_afct", roomNameProvider.getFullPath(chain.getTransition()));
 		
 		t = (Transition) getStateGraphItem(cts, "State3_TRANS_tr8_FROM_tp6_TO_State2");
 		assertNotNull("transition", t);
 
 		chain = xpac.getChain(t);
 		assertNotNull("chain", chain);
-		assertEquals("chain name", "TRANS_tr12_FROM_State5_TO_State3_tp6_BY_aport", RoomNameProvider.getFullPath(chain.getTransition()));
+		assertEquals("chain name", "TRANS_tr12_FROM_State5_TO_State3_tp6_BY_aport", roomNameProvider.getFullPath(chain.getTransition()));
 	}
 }