Merge branch 'master' of https://github.com/Yakindu/statecharts.git

manual-tests/org.yakindu.sct.test.manual/testcases/sct_testcase_10_example_files.textile

@@ -1,5 +0,0 @@
-h1(#Test2). Yakindu SCT Testcase 09 - Templateproposals
-
-|_. Nr |_. Testname |_. Test Instructions |_. Postconditions |_. Status|
-| 10.1 | Create Example File | Select *File → New → Example…*.<p>Select *YAKINDU SCT Example → Statechart Examples*.</p><p>Click *Next*.</p><p>Select traffic_light.</p><p>Click *Finish*.</p> | The Trafficlight example is created into the workspace  | %{color:red}open% |
-

manual-tests/org.yakindu.sct.test.manual/testcases/sct_testcase_12_refactor.textile

@@ -9,7 +9,7 @@ h1(#Test2). Yakindu SCT Testcase 12 - Refactor
 | 12.2.3 | Simulate | Run simulation. | The behavior of the refactored model is equivalent to its behavior before refactoring. The state *LightSwitch* state is highlighted in red. Transitions between *LightOff* and *LightOn* can be observed in the new editor tab mentioned in T12.2. | %{color:red}open% |
 | 12.3 | Inline subdiagram | Select the *LightSwitch* state.<p>Right click, then select *Refactor → Inline Subdiagram*.</p> | See T12.1. | %{color:red}open% |
 | 12.3.1 | Simulate | Run simulation | Behavior should be the same as before re-factoring | %{color:red}open% |
-| 12.4 | Prepare statechart | - Delete the transition from LightOn to LightOff and the state behavior of both states <p>- make a new transition from LightOff to LigtOn <p>- Enter event keypress/light = true as trigger and action for both transitions  | A new transition with trigger and action keypress/light = true is created. The other transition has keypress/light = true as trigger and action | %{color:red}open% |
+| 12.4 | Prepare statechart | - Delete the transition from LightOn to LightOff and the state behavior of both states <p>- make a new transition from LightOff to LigtOn <p>- Enter event A.keypress/light = true as trigger and action for both transitions  | A new transition with trigger and action keypress/light = true is created. The other transition has keypress/light = true as trigger and action | %{color:red}open% |
 | 12.5| Fold Incoming Actions | Select LightOn state  <p> Right click on the state <p> Select Refactoring -> Fold Incoming Actions | the action is shown in in the state LightOn and only the trigger is shown in the transitions  | %{color:red}open% |
 | 12.6| Unfold Entry Actions | Select LightOn state  <p> Right click on the state <p> Select Refactoring -> Unfold Entry Actions | the action is shown behind the trigger again | %{color:red}open% |
 | 12.7| Fold Outgoing Actions | Select LightOff state  <p> Right click on the state <p> Select Refactoring -> Fold Outgoing Actions | the action is shown in in the state LightOff and only the trigger is shown in the transitions  | %{color:red}open% |

manual-tests/org.yakindu.sct.test.manual/testcases/sct_testcase_15_performance.textile

@@ -0,0 +1,12 @@
+h1(#Test2). Yakindu SCT Testcase 14 - Performance
+
+|_. Nr |_. Testname |_. Test Instructions |_. Postconditions |_. Status|
+| 15.1 | load model | Open statechart big_file.sct | new Statechart is in your Project inserted | |
+| 15.2 | performance check | add a new state in your statechart | works the editor smooth? What does it feel like? How long it needs to validate? | |
+| 15.3 | performance check | save the Statechart | It shouldn't need a long time | |
+| 15.4 | change preferences | Window->Preferences->YAKINDU SCT->Diagram Appearance <p> disable "Enable live validation" | | |
+| 15.5 | performance check |  add a new state in your statechart | There is no error marker at the state  | |
+| 15.6 | performance check | save the Statechart | It shouldn't need a long time. Error marker appears at the state | |
+
+
+

releng/org.yakindu.base.target/Luna.target

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Luna (SCT)" sequenceNumber="26">
+<?pde version="3.8"?><target name="Luna (SCT)" sequenceNumber="28">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.ide" version="4.4.2.M20150204-1700"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.4"/>
+<unit id="org.eclipse.jgit.feature.group" version="4.4.1.201607150455-r"/>
+<repository location="http://download.eclipse.org/egit/updates/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.xtext.sdk.feature.group" version="2.7.3.v201411190455"/>
 <unit id="org.eclipse.emf.compare.source.feature.group" version="3.0.2.201501201328"/>
 <unit id="org.eclipse.gmf.feature.group" version="1.8.1.201408201453"/>
 <unit id="org.eclipse.cdt.sdk.feature.group" version="8.6.0.201502131403"/>
@@ -16,14 +17,6 @@
 <repository location="http://download.eclipse.org/releases/luna"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.xtext.sdk.feature.group" version="2.8.4.v201508050135"/>
-<repository location="http://download.eclipse.org/releases/mars"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.jgit.feature.group" version="4.4.1.201607150455-r"/>
-<repository location="http://download.eclipse.org/egit/updates/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="com.google.gson" version="2.2.4.v201311231704"/>
 <unit id="com.google.inject" version="3.0.0.v201312141243"/>
 <unit id="com.google.inject.multibindings" version="3.0.0.v201402270930"/>
@@ -31,5 +24,9 @@
 <unit id="com.google.inject.multibindings.source" version="3.0.0.v201402270930"/>
 <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/"/>
 </location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.platform.ide" version="4.4.2.M20150204-1700"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.4"/>
+</location>
 </locations>
 </target>

releng/org.yakindu.sct.releng/pom.xml

@@ -105,13 +105,6 @@
 						<encoding>UTF-8</encoding>
 						<source>7.0</source>
 						<target>7.0</target>
-						<extraClasspathElements>
-							<extraClasspathElement>
-								<groupId>com.google.inject.extensions</groupId>
-								<artifactId>guice-multibindings</artifactId>
-								<version>3.0</version>
-							</extraClasspathElement>
-						</extraClasspathElements>
 					</configuration>
 				</plugin>
 				<plugin>
@@ -140,7 +133,7 @@
 				<plugin>
 					<groupId>org.eclipse.xtend</groupId>
 					<artifactId>xtend-maven-plugin</artifactId>
-					<version>2.9.1</version>
+					<version>${xtext-version}</version>
 					<configuration>
 						<!-- need to prefix by basedir to generate to currently built module -->
 						<outputDirectory>${basedir}/xtend-gen</outputDirectory>
@@ -232,6 +225,9 @@
 			<activation>
 				<activeByDefault>true</activeByDefault>
 			</activation>
+			<properties>
+				<xtext-version>2.9.1</xtext-version>
+			</properties>
 			<build>
 				<plugins>
 					<plugin>
@@ -258,6 +254,9 @@
 			<activation>
 				<activeByDefault>false</activeByDefault>
 			</activation>
+			<properties>
+				<xtext-version>2.7.3</xtext-version>
+			</properties>
 			<build>
 				<plugins>
 					<plugin>
@@ -284,6 +283,9 @@
 			<activation>
 				<activeByDefault>false</activeByDefault>
 			</activation>
+			<properties>
+				<xtext-version>2.10.0</xtext-version>
+			</properties>
 			<build>
 				<plugins>
 					<plugin>