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

README.md

@@ -19,7 +19,7 @@ The open source code generators coming with YAKINDU Statechart Tools do not impl
 In addition to the source code provided here on GitHub we also provide ready-tu-use builds for Windows, Linux and OS X along with an Eclipse update site. If you just want to use YAKINDU Statechart Tools we strongly recommend to go this way. 
 
 1. Dowload a package from our <a href="http://www.statecharts.org/download.html" target="_blank">download page</a>.
-2. Follow the <a href="https://github.com/Yakindu/statecharts/blob/master/plugins/org.yakindu.sct.doc.user/help/02_installation/installation.textile" target="_blank">installation instructions</a>.
+2. Follow the <a href="https://github.com/Yakindu/statecharts/blob/master/plugins/org.yakindu.sct.doc.user/src/Part1-Installation-Guide/00_installation.textile" target="_blank">installation instructions</a>.
 
 ## How to Contribute
 

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

@@ -4,7 +4,7 @@ h1(#Test2). Yakindu SCT Testcase 06 - Expression Language Proposals
 |_. Nr |_. Testname |_. Test Instructions |_. Postconditions |_. Status|
 | 6.1 | Extend statechart interface | Replace the statechart specification by the following:<p>&emsp;@namespace Staircase@</p><p>&emsp;@internal:@<br>&emsp;@var light : boolean@</p><p>&emsp;@interface A:@<br>&emsp;@in event keypress@</p><p>&emsp;@interface B:@<br>&emsp;@in event keypress@</p><p>Select transition with keypress trigger and double-click on trigger.</p><p>Replace "keypress" by "A.keypress" to qualify the event.</p> | No error messages are shown. | %{color:red}open% |
 | 6.2 | Create another statechart | Create a new statechart model and name it OtherStatechart.<p>Replace the default text in the definition section by the following:</p><p>&emsp;@namespace OtherStatechart@</p><p>&emsp;@interface A:@<br>&emsp;@out event e1@<br>&emsp;@in event e2@</p><p>&emsp;@interface B:@<br>&emsp;@out event e1@<br>&emsp;@in event e2@ | The new statechart OtherStatechart is created. It does not have any error markers. | %{color:red}open% |
-| 6.3 | Test state proposals | Select state LightOff.<p>Open properties view.</p><p>Place the cursor in front of the expression in the state specification and press *[Ctrl+Space]*.</p> | Only the following proposals should be displayed:<p>&emsp;- A<br>&emsp;- B<br>&emsp;- light<br>&emsp;- [<br>&emsp;- after<br>&emsp;- always<br>&emsp;- entry<br>&emsp;- every<br>&emsp;- exit<br>&emsp;- oncycle | %{color:red}open% |
+| 6.3 | Test state proposals | Select state LightOff.<p>Open properties view.</p><p>Place the cursor in front of the expression in the state specification and press *[Ctrl+Space]*.</p> | Only the following proposals should be displayed:<p>&emsp;- A<br>&emsp;- B<br>&emsp;- [<br>&emsp;- after<br>&emsp;- always<br>&emsp;- entry<br>&emsp;- every<br>&emsp;- exit<br>&emsp;- oncycle | %{color:red}open% |
 | 6.4 | Test transitions proposals | Select transition with trigger A.keypress.<p>Open properties view.</p><p>Move cursor in front of A.keypress and press *[Ctrl+Space]*.</p> | Only following proposals should be displayed:<p>&emsp;- A<br>&emsp;- B<br>&emsp;- #<br>&emsp;- /<br>&emsp;- [<br>&emsp;- after<br>&emsp;- always<br>&emsp;- default<br>&emsp;- else<br>&emsp;- every<br>&emsp;- oncycle| %{color:red}open% |
 | 6.5 | Test transitions proposals | Move cursor behind A.keypress and press *[Ctrl+Space]*. | Only following proposals should be displayed:<p>&emsp;- keypress<br>&emsp;- #<br>&emsp;- ,<br>&emsp;- .<br>&emsp;- /<br>&emsp;- [ | %{color:red}open% |
 

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

@@ -20,7 +20,7 @@ h1(#Test2). Yakindu SCT Testcase 08 - Genmodel
 | 8.4.2 | Setup Xpand Generator Model | Open the file StaircaseXpand.sgen and set the following features:<p>&emsp;- targetFolder = "src-gen-xpand"<br>&emsp;- templateProject = "TestProject.generator.xpand"<br>&emsp;- templatePath = "testproject::generator::xpand::TextGenerator::main"<p>Save the file</p> | Folder src-gen-xpand with generated code created. | %{color:red}open% |
 | 8.5 | Create Generator Model for Custom Xtend/Java Generator | Select TestProject in project explorer.<p>Select *File→New→Other* from the menu.</p><p>Select *YAKINDU SCT→Code Generator Model*.</p><p>Click *Next*.</p><p>As file name, enter StaircaseXtend.sgen.</p> <p>Click *Next*.</p><p>Select Custom Xtend2/Java-based Generator and check Staircase.sct.</p><p>Click on *Finish* button.</p> | File StaircaseXtend.sgen has been created with initial settings. | %{color:red}open% |
 | 8.5.1 | add Project to buildpath | Open the properties of the TestProject project (*rightclick → Properties or [Alt+Enter]*).<p>Select *Java Build Path*.</p><p>Select tab *Projects*.</p><p>Click *Add…*.</p><p>Add TestProject.generator.xtend.</p><p>Click *OK*.</p> | No errors occurred. | %{color:red}open% |
-| 8.5.2 | Setup Xtend Generator Model | Open the file StaircaseXtend.sgen and set the following features:<p>&emsp;- targetFolder = "src-gen-xtend"<br>&emsp;- templateProject = "TestProject.generator.xtend"<br>&emsp;- templatePath = "testproject.generator.xtend.XtendGenerator"</p><p>Save the file. | Folder src-gen-xtend with generated code created.</p> | %{color:red}open% |
+| 8.5.2 | Setup Xtend Generator Model | Open the file StaircaseXtend.sgen and set the following features:<p>&emsp;- targetFolder = "src-gen-xtend"<br>&emsp;- generatorProject = "TestProject.generator.xtend"<br>&emsp;- generatorPath = "testproject.generator.xtend.XtendGenerator"</p><p>Save the file. | Folder src-gen-xtend with generated code created.</p> | %{color:red}open% |
 
 
 

plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/features/EventBasedRunnableFeature.xtend

@@ -37,7 +37,8 @@ class EventBasedRunnableFeature {
 	}
 
 	def getNameSuffix(GeneratorEntry it) {
-		if (featureEventRunnable != null)
+		if (featureEventRunnable != null &&
+			featureEventRunnable.getParameterValue(IJavaFeatureConstants::VALUE_NAME_SUFFIX) != null)
 			featureEventRunnable.getParameterValue(IJavaFeatureConstants::VALUE_NAME_SUFFIX).stringValue
 		else
 			IJavaFeatureConstants::RUNNABLE_WRAPPER_NAME_SUFFIX_DEFAULT

releng/org.yakindu.sct.repository/category.xml

@@ -18,6 +18,7 @@
    <feature url="features/org.yakindu.sct.generator_0.0.0.jar" id="org.yakindu.sct.generator" version="0.0.0">
       <category name="YAKINDU SCT"/>
    </feature>
+   <!--
    <feature url="features/org.yakindu.sct.documentation_0.0.0.jar" id="org.yakindu.sct.documentation" version="0.0.0">
       <category name="YAKINDU SCT"/>
    </feature>
@@ -33,6 +34,7 @@
    <feature url="features/org.yakindu.sct.editor_0.0.0.jar" id="org.yakindu.sct.editor" version="0.0.0">
       <category name="YAKINDU SCT"/>
    </feature>
+   -->
    <category-def name="YAKINDU SCT" label="YAKINDU SCT">
       <description>
          YAKINDU Statechart Tools (SCT)