[generator.doc] generate also system and instance tree for system

4 files changed, 154 insertions, 113 deletions

diff --git a/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/gen/DocGen.xtend b/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/gen/DocGen.xtend
index ca5203a3b..712196bb5 100644
--- a/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/gen/DocGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/gen/DocGen.xtend
@@ -14,34 +14,35 @@ package org.eclipse.etrice.generator.doc.gen
 
 import com.google.inject.Inject
 import com.google.inject.Singleton
-import java.util.List
 import java.io.File
-import org.eclipse.etrice.core.room.RoomModel
-import org.eclipse.etrice.core.room.Documentation
+import java.util.List
+import org.eclipse.etrice.core.genmodel.base.ILogger
+import org.eclipse.etrice.core.genmodel.etricegen.Root
 import org.eclipse.etrice.core.room.ActorClass
-import org.eclipse.etrice.core.room.SubSystemClass
-import org.eclipse.etrice.core.room.ProtocolClass
+import org.eclipse.etrice.core.room.Attribute
 import org.eclipse.etrice.core.room.CompoundProtocolClass
 import org.eclipse.etrice.core.room.DataClass
-import org.eclipse.etrice.core.room.State
-import org.eclipse.etrice.core.room.Attribute
+import org.eclipse.etrice.core.room.Documentation
+import org.eclipse.etrice.core.room.LogicalSystem
+import org.eclipse.etrice.core.room.ProtocolClass
+import org.eclipse.etrice.core.room.RoomModel
 import org.eclipse.etrice.core.room.StandardOperation
+import org.eclipse.etrice.core.room.State
+import org.eclipse.etrice.core.room.SubSystemClass
+import org.eclipse.etrice.generator.generic.RoomExtensions
+import org.eclipse.xtext.generator.JavaIoFileSystemAccess
+
 import static extension org.eclipse.etrice.core.room.util.RoomHelpers.*
 import static extension org.eclipse.etrice.generator.base.CodegenHelpers.*
-import org.eclipse.etrice.core.genmodel.base.ILogger
-import org.eclipse.etrice.generator.base.IRoomGenerator
-import org.eclipse.etrice.core.genmodel.etricegen.Root
-import org.eclipse.xtext.generator.JavaIoFileSystemAccess
-import org.eclipse.etrice.generator.generic.RoomExtensions
 
 @Singleton
-class DocGen implements IRoomGenerator {
+class DocGen {
 
 	@Inject extension JavaIoFileSystemAccess fileAccess
 	@Inject extension RoomExtensions roomExt
 	@Inject ILogger logger
 	
-	override doGenerate(Root root) {
+	def doGenerate(Root root) {
 		for (model: root.models) {
 			var path = model.docGenerationTargetPath
 			var file = model.name+".tex"
@@ -51,7 +52,7 @@ class DocGen implements IRoomGenerator {
 		}
 	}
 	
-	def generateModelDoc(Root root, RoomModel model) {'''
+	def private generateModelDoc(Root root, RoomModel model) {'''
 		\documentclass[titlepage]{article}
 		\usepackage{graphicx}
 		\usepackage[a4paper,text={160mm,255mm},centering,headsep=5mm,footskip=10mm]{geometry}
@@ -106,7 +107,7 @@ class DocGen implements IRoomGenerator {
 		 \setcounter{tocdepth}{100}
 
 
-		\title{«model.name» Modeldocumentation}
+		\title{«model.name» Model Documentation}
 		\date{\today}
 		\author{generated by eTrice}
 		
@@ -120,6 +121,8 @@ class DocGen implements IRoomGenerator {
 		\newpage
 		\section{Model Description}
 		«model.docu.generateDocText»
+		\section{Logical System Description}
+		«root.generateAllLogicalSystemDocs(model)»
 		\section{Subsystem Description}
 		«root.generateAllSubSysClassDocs(model)»
 		\section{Protocol Class Description}
@@ -132,21 +135,38 @@ class DocGen implements IRoomGenerator {
 	'''
 	}
 	
-	def generateAllSubSysClassDocs(Root root, RoomModel model){'''
+	def private generateAllLogicalSystemDocs(Root root, RoomModel model){'''
+	«FOR sys : model.systems»
+		«root.generateLogicalSystemDoc(model, sys)»
+	«ENDFOR»
+	'''
+	}
+	
+	def private generateLogicalSystemDoc(Root root, RoomModel model, LogicalSystem system) {
+		var filenamei = model.docGenerationTargetPath + "images\\" + system.name + "_instanceTree.jpg"
+		filenamei = filenamei.replaceAll("\\\\","/");
+		var latexFilenamei = filenamei.replaceAll("/","//") 
+		'''
+		\level{2}{«system.name»}
+		«system.docu.generateDocText»
+		\level{3}{Instance Tree}
+		«IF fileExists(filenamei).equals("true")»
+			«includeGraphics(latexFilenamei,"0.5",system.name + " Instance Tree")»
+		«ENDIF»
+		'''
+	}
+	
+	def private generateAllSubSysClassDocs(Root root, RoomModel model){'''
 	«FOR ssc : model.subSystemClasses»
 		«root.generateSubSysClassDoc(model, ssc)»
 	«ENDFOR»
 	'''
 	}
 
-	def generateSubSysClassDoc(Root root, RoomModel model, SubSystemClass ssc) {
+	def private generateSubSysClassDoc(Root root, RoomModel model, SubSystemClass ssc) {
 		var filename = model.docGenerationTargetPath + "images\\" + ssc.name + "_structure.jpg"
 		filename = filename.replaceAll("\\\\","/");
 		var latexFilename = filename.replaceAll("/","//")
-
-		var filenamei = model.docGenerationTargetPath + "images\\" + ssc.name + "_instanceTree.jpg"
-		filenamei = filenamei.replaceAll("\\\\","/");
-		var latexFilenamei = filenamei.replaceAll("/","//") 
 		
 		'''
 		\level{2}{«ssc.name»}
@@ -155,20 +175,16 @@ class DocGen implements IRoomGenerator {
 		«IF fileExists(filename).equals("true")»
 			«includeGraphics(latexFilename,"0.4",ssc.name + " Structure")»
 		«ENDIF»
-		\level{3}{Instance Tree}
-		«IF fileExists(filename).equals("true")»
-			«includeGraphics(latexFilenamei,"0.5",ssc.name + " Instance Tree")»
-		«ENDIF»
 		'''
 	}
 	
-	def generateAllDataClassDocs(Root root, RoomModel model){'''
+	def private generateAllDataClassDocs(Root root, RoomModel model){'''
 		«FOR dc : model.dataClasses»
 			«root.generateDataClassDoc(dc)»
 		«ENDFOR»		
 	'''}
 
-	def generateDataClassDoc(Root root, DataClass dc) {'''
+	def private generateDataClassDoc(Root root, DataClass dc) {'''
 		\level{2} {«dc.name»}
 		«dc.docu.generateDocText»
 		\level{3}{Attributes}
@@ -179,14 +195,14 @@ class DocGen implements IRoomGenerator {
 	'''	
 	}
 
-	def generateAllProtocolClassDocs(Root root, RoomModel model) {'''
+	def private generateAllProtocolClassDocs(Root root, RoomModel model) {'''
 		«FOR pc : model.protocolClasses»
 			«root.generateProtocolClassDoc(pc)»
 		«ENDFOR»
 	'''	
 	}
 	
-	def dispatch generateProtocolClassDoc(Root root, ProtocolClass pc) {'''
+	def private dispatch generateProtocolClassDoc(Root root, ProtocolClass pc) {'''
 		\level{2} {«pc.name»}
 		«pc.docu.generateDocText»
 		\level{3}{Incoming Messages}
@@ -214,7 +230,7 @@ class DocGen implements IRoomGenerator {
 	'''	
 	}
 	
-	def dispatch generateProtocolClassDoc(Root root, CompoundProtocolClass pc) {'''
+	def private dispatch generateProtocolClassDoc(Root root, CompoundProtocolClass pc) {'''
 		\level{2} {«pc.name»}
 		«pc.docu.generateDocText»
 		\level{3}{Sub Protocols}
@@ -231,14 +247,14 @@ class DocGen implements IRoomGenerator {
 	'''
 	}
 	
-	def generateAllActorClassDocs(Root root, RoomModel model) {'''
+	def private generateAllActorClassDocs(Root root, RoomModel model) {'''
 		«FOR ac : model.actorClasses»
 			«root.generateActorClassDoc(model,ac)»
 		«ENDFOR»			
 		'''
 	}
 	
-	def generateActorClassDoc(Root root, RoomModel model, ActorClass ac) {
+	def private generateActorClassDoc(Root root, RoomModel model, ActorClass ac) {
 		var filename = model.docGenerationTargetPath + "images\\" + ac.name + "_structure.jpg"
 		filename = filename.replaceAll("\\\\","/");
 		var latexFilename = filename.replaceAll("/","//") 
@@ -263,7 +279,7 @@ class DocGen implements IRoomGenerator {
 		'''
 	}
 
-	def generateFsmDoc(RoomModel model, ActorClass ac){
+	def private generateFsmDoc(RoomModel model, ActorClass ac){
 		var filename = model.docGenerationTargetPath + "images\\" + ac.name + "_behavior.jpg"
 		filename = filename.replaceAll("\\\\","/");
 		var latexFilename = filename.replaceAll("/","//")
@@ -302,7 +318,7 @@ class DocGen implements IRoomGenerator {
 		'''
 	}
 		
-	def String generateStateDoc(RoomModel model, ActorClass ac, State state){
+	def private String generateStateDoc(RoomModel model, ActorClass ac, State state){
 		var filename = model.docGenerationTargetPath + "images\\" + ac.name + "_" + state.genStatePathName + "_behavior.jpg"
 		filename = filename.replaceAll("\\\\","/");
 		var latexFilename = filename.replaceAll("/","//"); 
@@ -342,7 +358,7 @@ class DocGen implements IRoomGenerator {
 		'''		
 	}
 
-	def generateAttributesDoc(List<Attribute> attributes) {
+	def private generateAttributesDoc(List<Attribute> attributes) {
 		'''
 		«IF !attributes.empty»
 			\begin{tabular}[ht]{|l|l|l|}
@@ -358,7 +374,7 @@ class DocGen implements IRoomGenerator {
 		'''
 		}
 	
-	def generateOperationsDoc(List<StandardOperation> operations) {
+	def private generateOperationsDoc(List<StandardOperation> operations) {
 		'''
 		«FOR op : operations»
 			\begin{tabular}[ht]{|l|l|}
@@ -383,14 +399,14 @@ class DocGen implements IRoomGenerator {
 		'''
 	}
 	
-	def generateDocText(Documentation doc){'''
+	def private generateDocText(Documentation doc){'''
 		«IF doc!=null»
 			«doc.lines.join()»
 		«ENDIF»		
 		'''
 	}
 	
-	def fileExists(String f){
+	def private fileExists(String f){
 		val file = new File(f);
 		val exist = file.exists();
 		
@@ -405,7 +421,7 @@ class DocGen implements IRoomGenerator {
 		}
 	}
 		
-	def includeGraphics(String filename, String scale, String caption){
+	def private includeGraphics(String filename, String scale, String caption){
 		var latexCaption = caption.replaceAll("_","\\\\_");
 		'''
 			\begin{center}
@@ -414,8 +430,4 @@ class DocGen implements IRoomGenerator {
 			\end{center}
 		'''
 	}
-
-	def irgendwas(Root root, ActorClass ac){		
-		return ac.name + ".bla"
-	}
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/gen/InstanceDiagramGen.xtend b/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/gen/InstanceDiagramGen.xtend
index 095148609..af7428690 100644
--- a/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/gen/InstanceDiagramGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.doc/src/org/eclipse/etrice/generator/doc/gen/InstanceDiagramGen.xtend
@@ -14,29 +14,28 @@ package org.eclipse.etrice.generator.doc.gen
 
 import com.google.inject.Inject
 import com.google.inject.Singleton
+import java.io.File
+import org.eclipse.etrice.core.etmap.util.ETMapUtil
 import org.eclipse.etrice.core.genmodel.base.ILogger
+import org.eclipse.etrice.core.genmodel.etricegen.AbstractInstance
 import org.eclipse.etrice.core.genmodel.etricegen.ActorInstance
+import org.eclipse.etrice.core.genmodel.etricegen.ActorInterfaceInstance
 import org.eclipse.etrice.core.genmodel.etricegen.Root
 import org.eclipse.etrice.core.genmodel.etricegen.StructureInstance
 import org.eclipse.etrice.core.genmodel.etricegen.SystemInstance
-import org.eclipse.etrice.core.etmap.util.ETMapUtil
-import org.eclipse.etrice.generator.base.IRoomGenerator
 import org.eclipse.etrice.generator.generic.RoomExtensions
 import org.eclipse.xtext.generator.JavaIoFileSystemAccess
 
 import static java.lang.Runtime.*
-import java.io.File
-import org.eclipse.etrice.core.genmodel.etricegen.AbstractInstance
-import org.eclipse.etrice.core.genmodel.etricegen.ActorInterfaceInstance
 
 @Singleton
-class InstanceDiagramGen implements IRoomGenerator {
+class InstanceDiagramGen {
 
 	@Inject extension JavaIoFileSystemAccess fileAccess
 	@Inject extension RoomExtensions roomExt
 	@Inject ILogger logger
 	
-	override doGenerate(Root root) {
+	def doGenerate(Root root) {
 		for (model: root.models) {
 			var path = model.docGenerationTargetPath+ "/images"
 			fileAccess.setOutputPath(path)
@@ -53,7 +52,7 @@ class InstanceDiagramGen implements IRoomGenerator {
 	
 	// generate batch file to convert .dot to .jpg
 	// dot -Tjpg -oSS.jpg SS.dot	
-	def generate2jpg(Root root){
+	def private generate2jpg(Root root){
 		'''
 			«FOR sys : root.systemInstances»
 				dot -Tjpg -o «sys.name»_instanceTree.jpg «sys.name»_instanceTree.dot
@@ -61,7 +60,7 @@ class InstanceDiagramGen implements IRoomGenerator {
 		'''
 	}
 	
-	def generate(Root root, SystemInstance sys) {
+	def private generate(Root root, SystemInstance sys) {
 		'''
 			digraph «sys.name» {
 				rankdir=TD;
@@ -78,7 +77,7 @@ class InstanceDiagramGen implements IRoomGenerator {
 		'''
 	}
 	
-	def String instance(AbstractInstance ai) {
+	def private String instance(AbstractInstance ai) {
 		val parent = ai.eContainer as StructureInstance
 		val pthread = ETMapUtil::getPhysicalThread(ai)
 		val tname = if (pthread==null) "?" else pthread.name
@@ -99,7 +98,7 @@ class InstanceDiagramGen implements IRoomGenerator {
 		'''
 	}
 
- 	def runDot2Jpg(String path, String bat){
+ 	def private runDot2Jpg(String path, String bat){
  		var wdir = new File(path)
  		try {
 			val p = getRuntime.exec("cmd /C "+bat, null, wdir)
diff --git a/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/DocGen.java b/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/DocGen.java
index d5bbb8b51..6ae6a3215 100644
--- a/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/DocGen.java
+++ b/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/DocGen.java
@@ -27,6 +27,7 @@ import org.eclipse.etrice.core.room.DataClass;
 import org.eclipse.etrice.core.room.DataType;
 import org.eclipse.etrice.core.room.Documentation;
 import org.eclipse.etrice.core.room.GeneralProtocolClass;
+import org.eclipse.etrice.core.room.LogicalSystem;
 import org.eclipse.etrice.core.room.Message;
 import org.eclipse.etrice.core.room.ProtocolClass;
 import org.eclipse.etrice.core.room.RefableType;
@@ -39,7 +40,6 @@ import org.eclipse.etrice.core.room.SubSystemClass;
 import org.eclipse.etrice.core.room.VarDecl;
 import org.eclipse.etrice.core.room.util.RoomHelpers;
 import org.eclipse.etrice.generator.base.CodegenHelpers;
-import org.eclipse.etrice.generator.base.IRoomGenerator;
 import org.eclipse.etrice.generator.generic.RoomExtensions;
 import org.eclipse.xtend2.lib.StringConcatenation;
 import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
@@ -48,7 +48,7 @@ import org.eclipse.xtext.xbase.lib.IterableExtensions;
 
 @Singleton
 @SuppressWarnings("all")
-public class DocGen implements IRoomGenerator {
+public class DocGen {
   @Inject
   @Extension
   private JavaIoFileSystemAccess fileAccess;
@@ -79,7 +79,7 @@ public class DocGen implements IRoomGenerator {
     }
   }
   
-  public CharSequence generateModelDoc(final Root root, final RoomModel model) {
+  private CharSequence generateModelDoc(final Root root, final RoomModel model) {
     StringConcatenation _builder = new StringConcatenation();
     _builder.append("\\documentclass[titlepage]{article}");
     _builder.newLine();
@@ -224,7 +224,7 @@ public class DocGen implements IRoomGenerator {
     _builder.append("\\title{");
     String _name = model.getName();
     _builder.append(_name, "");
-    _builder.append(" Modeldocumentation}");
+    _builder.append(" Model Documentation}");
     _builder.newLineIfNotEmpty();
     _builder.append("\\date{\\today}");
     _builder.newLine();
@@ -252,6 +252,11 @@ public class DocGen implements IRoomGenerator {
     CharSequence _generateDocText = this.generateDocText(_docu);
     _builder.append(_generateDocText, "");
     _builder.newLineIfNotEmpty();
+    _builder.append("\\section{Logical System Description}");
+    _builder.newLine();
+    CharSequence _generateAllLogicalSystemDocs = this.generateAllLogicalSystemDocs(root, model);
+    _builder.append(_generateAllLogicalSystemDocs, "");
+    _builder.newLineIfNotEmpty();
     _builder.append("\\section{Subsystem Description}");
     _builder.newLine();
     CharSequence _generateAllSubSysClassDocs = this.generateAllSubSysClassDocs(root, model);
@@ -277,7 +282,59 @@ public class DocGen implements IRoomGenerator {
     return _builder;
   }
   
-  public CharSequence generateAllSubSysClassDocs(final Root root, final RoomModel model) {
+  private CharSequence generateAllLogicalSystemDocs(final Root root, final RoomModel model) {
+    StringConcatenation _builder = new StringConcatenation();
+    {
+      EList<LogicalSystem> _systems = model.getSystems();
+      for(final LogicalSystem sys : _systems) {
+        CharSequence _generateLogicalSystemDoc = this.generateLogicalSystemDoc(root, model, sys);
+        _builder.append(_generateLogicalSystemDoc, "");
+        _builder.newLineIfNotEmpty();
+      }
+    }
+    return _builder;
+  }
+  
+  private CharSequence generateLogicalSystemDoc(final Root root, final RoomModel model, final LogicalSystem system) {
+    CharSequence _xblockexpression = null;
+    {
+      String _docGenerationTargetPath = this.roomExt.getDocGenerationTargetPath(model);
+      String _plus = (_docGenerationTargetPath + "images\\");
+      String _name = system.getName();
+      String _plus_1 = (_plus + _name);
+      String filenamei = (_plus_1 + "_instanceTree.jpg");
+      String _replaceAll = filenamei.replaceAll("\\\\", "/");
+      filenamei = _replaceAll;
+      String latexFilenamei = filenamei.replaceAll("/", "//");
+      StringConcatenation _builder = new StringConcatenation();
+      _builder.append("\\level{2}{");
+      String _name_1 = system.getName();
+      _builder.append(_name_1, "");
+      _builder.append("}");
+      _builder.newLineIfNotEmpty();
+      Documentation _docu = system.getDocu();
+      CharSequence _generateDocText = this.generateDocText(_docu);
+      _builder.append(_generateDocText, "");
+      _builder.newLineIfNotEmpty();
+      _builder.append("\\level{3}{Instance Tree}");
+      _builder.newLine();
+      {
+        String _fileExists = this.fileExists(filenamei);
+        boolean _equals = _fileExists.equals("true");
+        if (_equals) {
+          String _name_2 = system.getName();
+          String _plus_2 = (_name_2 + " Instance Tree");
+          CharSequence _includeGraphics = this.includeGraphics(latexFilenamei, "0.5", _plus_2);
+          _builder.append(_includeGraphics, "");
+          _builder.newLineIfNotEmpty();
+        }
+      }
+      _xblockexpression = (_builder);
+    }
+    return _xblockexpression;
+  }
+  
+  private CharSequence generateAllSubSysClassDocs(final Root root, final RoomModel model) {
     StringConcatenation _builder = new StringConcatenation();
     {
       EList<SubSystemClass> _subSystemClasses = model.getSubSystemClasses();
@@ -290,7 +347,7 @@ public class DocGen implements IRoomGenerator {
     return _builder;
   }
   
-  public CharSequence generateSubSysClassDoc(final Root root, final RoomModel model, final SubSystemClass ssc) {
+  private CharSequence generateSubSysClassDoc(final Root root, final RoomModel model, final SubSystemClass ssc) {
     CharSequence _xblockexpression = null;
     {
       String _docGenerationTargetPath = this.roomExt.getDocGenerationTargetPath(model);
@@ -301,18 +358,10 @@ public class DocGen implements IRoomGenerator {
       String _replaceAll = filename.replaceAll("\\\\", "/");
       filename = _replaceAll;
       String latexFilename = filename.replaceAll("/", "//");
-      String _docGenerationTargetPath_1 = this.roomExt.getDocGenerationTargetPath(model);
-      String _plus_2 = (_docGenerationTargetPath_1 + "images\\");
-      String _name_1 = ssc.getName();
-      String _plus_3 = (_plus_2 + _name_1);
-      String filenamei = (_plus_3 + "_instanceTree.jpg");
-      String _replaceAll_1 = filenamei.replaceAll("\\\\", "/");
-      filenamei = _replaceAll_1;
-      String latexFilenamei = filenamei.replaceAll("/", "//");
       StringConcatenation _builder = new StringConcatenation();
       _builder.append("\\level{2}{");
-      String _name_2 = ssc.getName();
-      _builder.append(_name_2, "");
+      String _name_1 = ssc.getName();
+      _builder.append(_name_1, "");
       _builder.append("}");
       _builder.newLineIfNotEmpty();
       Documentation _docu = ssc.getDocu();
@@ -325,32 +374,19 @@ public class DocGen implements IRoomGenerator {
         String _fileExists = this.fileExists(filename);
         boolean _equals = _fileExists.equals("true");
         if (_equals) {
-          String _name_3 = ssc.getName();
-          String _plus_4 = (_name_3 + " Structure");
-          CharSequence _includeGraphics = this.includeGraphics(latexFilename, "0.4", _plus_4);
+          String _name_2 = ssc.getName();
+          String _plus_2 = (_name_2 + " Structure");
+          CharSequence _includeGraphics = this.includeGraphics(latexFilename, "0.4", _plus_2);
           _builder.append(_includeGraphics, "");
           _builder.newLineIfNotEmpty();
         }
       }
-      _builder.append("\\level{3}{Instance Tree}");
-      _builder.newLine();
-      {
-        String _fileExists_1 = this.fileExists(filename);
-        boolean _equals_1 = _fileExists_1.equals("true");
-        if (_equals_1) {
-          String _name_4 = ssc.getName();
-          String _plus_5 = (_name_4 + " Instance Tree");
-          CharSequence _includeGraphics_1 = this.includeGraphics(latexFilenamei, "0.5", _plus_5);
-          _builder.append(_includeGraphics_1, "");
-          _builder.newLineIfNotEmpty();
-        }
-      }
       _xblockexpression = (_builder);
     }
     return _xblockexpression;
   }
   
-  public CharSequence generateAllDataClassDocs(final Root root, final RoomModel model) {
+  private CharSequence generateAllDataClassDocs(final Root root, final RoomModel model) {
     StringConcatenation _builder = new StringConcatenation();
     {
       EList<DataClass> _dataClasses = model.getDataClasses();
@@ -363,7 +399,7 @@ public class DocGen implements IRoomGenerator {
     return _builder;
   }
   
-  public CharSequence generateDataClassDoc(final Root root, final DataClass dc) {
+  private CharSequence generateDataClassDoc(final Root root, final DataClass dc) {
     StringConcatenation _builder = new StringConcatenation();
     _builder.append("\\level{2} {");
     String _name = dc.getName();
@@ -390,7 +426,7 @@ public class DocGen implements IRoomGenerator {
     return _builder;
   }
   
-  public CharSequence generateAllProtocolClassDocs(final Root root, final RoomModel model) {
+  private CharSequence generateAllProtocolClassDocs(final Root root, final RoomModel model) {
     StringConcatenation _builder = new StringConcatenation();
     {
       EList<GeneralProtocolClass> _protocolClasses = model.getProtocolClasses();
@@ -403,7 +439,7 @@ public class DocGen implements IRoomGenerator {
     return _builder;
   }
   
-  protected CharSequence _generateProtocolClassDoc(final Root root, final ProtocolClass pc) {
+  private CharSequence _generateProtocolClassDoc(final Root root, final ProtocolClass pc) {
     StringConcatenation _builder = new StringConcatenation();
     _builder.append("\t");
     _builder.append("\\level{2} {");
@@ -516,7 +552,7 @@ public class DocGen implements IRoomGenerator {
     return _builder;
   }
   
-  protected CharSequence _generateProtocolClassDoc(final Root root, final CompoundProtocolClass pc) {
+  private CharSequence _generateProtocolClassDoc(final Root root, final CompoundProtocolClass pc) {
     StringConcatenation _builder = new StringConcatenation();
     _builder.append("\\level{2} {");
     String _name = pc.getName();
@@ -558,7 +594,7 @@ public class DocGen implements IRoomGenerator {
     return _builder;
   }
   
-  public CharSequence generateAllActorClassDocs(final Root root, final RoomModel model) {
+  private CharSequence generateAllActorClassDocs(final Root root, final RoomModel model) {
     StringConcatenation _builder = new StringConcatenation();
     {
       EList<ActorClass> _actorClasses = model.getActorClasses();
@@ -571,7 +607,7 @@ public class DocGen implements IRoomGenerator {
     return _builder;
   }
   
-  public CharSequence generateActorClassDoc(final Root root, final RoomModel model, final ActorClass ac) {
+  private CharSequence generateActorClassDoc(final Root root, final RoomModel model, final ActorClass ac) {
     CharSequence _xblockexpression = null;
     {
       String _docGenerationTargetPath = this.roomExt.getDocGenerationTargetPath(model);
@@ -635,7 +671,7 @@ public class DocGen implements IRoomGenerator {
     return _xblockexpression;
   }
   
-  public CharSequence generateFsmDoc(final RoomModel model, final ActorClass ac) {
+  private CharSequence generateFsmDoc(final RoomModel model, final ActorClass ac) {
     CharSequence _xblockexpression = null;
     {
       String _docGenerationTargetPath = this.roomExt.getDocGenerationTargetPath(model);
@@ -738,7 +774,7 @@ public class DocGen implements IRoomGenerator {
     return _xblockexpression;
   }
   
-  public String generateStateDoc(final RoomModel model, final ActorClass ac, final State state) {
+  private String generateStateDoc(final RoomModel model, final ActorClass ac, final State state) {
     String _xblockexpression = null;
     {
       String _docGenerationTargetPath = this.roomExt.getDocGenerationTargetPath(model);
@@ -853,7 +889,7 @@ public class DocGen implements IRoomGenerator {
     return _xblockexpression;
   }
   
-  public CharSequence generateAttributesDoc(final List<Attribute> attributes) {
+  private CharSequence generateAttributesDoc(final List<Attribute> attributes) {
     StringConcatenation _builder = new StringConcatenation();
     {
       boolean _isEmpty = attributes.isEmpty();
@@ -893,7 +929,7 @@ public class DocGen implements IRoomGenerator {
     return _builder;
   }
   
-  public CharSequence generateOperationsDoc(final List<StandardOperation> operations) {
+  private CharSequence generateOperationsDoc(final List<StandardOperation> operations) {
     StringConcatenation _builder = new StringConcatenation();
     {
       for(final StandardOperation op : operations) {
@@ -995,7 +1031,7 @@ public class DocGen implements IRoomGenerator {
     return _builder;
   }
   
-  public CharSequence generateDocText(final Documentation doc) {
+  private CharSequence generateDocText(final Documentation doc) {
     StringConcatenation _builder = new StringConcatenation();
     {
       boolean _notEquals = (!Objects.equal(doc, null));
@@ -1009,7 +1045,7 @@ public class DocGen implements IRoomGenerator {
     return _builder;
   }
   
-  public String fileExists(final String f) {
+  private String fileExists(final String f) {
     File _file = new File(f);
     final File file = _file;
     final boolean exist = file.exists();
@@ -1025,7 +1061,7 @@ public class DocGen implements IRoomGenerator {
     }
   }
   
-  public CharSequence includeGraphics(final String filename, final String scale, final String caption) {
+  private CharSequence includeGraphics(final String filename, final String scale, final String caption) {
     CharSequence _xblockexpression = null;
     {
       String latexCaption = caption.replaceAll("_", "\\\\_");
@@ -1049,12 +1085,7 @@ public class DocGen implements IRoomGenerator {
     return _xblockexpression;
   }
   
-  public String irgendwas(final Root root, final ActorClass ac) {
-    String _name = ac.getName();
-    return (_name + ".bla");
-  }
-  
-  public CharSequence generateProtocolClassDoc(final Root root, final GeneralProtocolClass pc) {
+  private CharSequence generateProtocolClassDoc(final Root root, final GeneralProtocolClass pc) {
     if (pc instanceof CompoundProtocolClass) {
       return _generateProtocolClassDoc(root, (CompoundProtocolClass)pc);
     } else if (pc instanceof ProtocolClass) {
diff --git a/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/InstanceDiagramGen.java b/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/InstanceDiagramGen.java
index bda6af115..29d6d22ec 100644
--- a/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/InstanceDiagramGen.java
+++ b/plugins/org.eclipse.etrice.generator.doc/xtend-gen/org/eclipse/etrice/generator/doc/gen/InstanceDiagramGen.java
@@ -30,7 +30,6 @@ import org.eclipse.etrice.core.genmodel.etricegen.SystemInstance;
 import org.eclipse.etrice.core.room.ActorClass;
 import org.eclipse.etrice.core.room.RoomModel;
 import org.eclipse.etrice.core.room.SubSystemClass;
-import org.eclipse.etrice.generator.base.IRoomGenerator;
 import org.eclipse.etrice.generator.generic.RoomExtensions;
 import org.eclipse.xtend2.lib.StringConcatenation;
 import org.eclipse.xtext.generator.JavaIoFileSystemAccess;
@@ -39,7 +38,7 @@ import org.eclipse.xtext.xbase.lib.Extension;
 
 @Singleton
 @SuppressWarnings("all")
-public class InstanceDiagramGen implements IRoomGenerator {
+public class InstanceDiagramGen {
   @Inject
   @Extension
   private JavaIoFileSystemAccess fileAccess;
@@ -80,7 +79,7 @@ public class InstanceDiagramGen implements IRoomGenerator {
     }
   }
   
-  public CharSequence generate2jpg(final Root root) {
+  private CharSequence generate2jpg(final Root root) {
     StringConcatenation _builder = new StringConcatenation();
     {
       EList<SystemInstance> _systemInstances = root.getSystemInstances();
@@ -98,7 +97,7 @@ public class InstanceDiagramGen implements IRoomGenerator {
     return _builder;
   }
   
-  public CharSequence generate(final Root root, final SystemInstance sys) {
+  private CharSequence generate(final Root root, final SystemInstance sys) {
     StringConcatenation _builder = new StringConcatenation();
     _builder.append("digraph ");
     String _name = sys.getName();
@@ -165,7 +164,7 @@ public class InstanceDiagramGen implements IRoomGenerator {
     return _builder;
   }
   
-  public String instance(final AbstractInstance ai) {
+  private String instance(final AbstractInstance ai) {
     String _xblockexpression = null;
     {
       EObject _eContainer = ai.eContainer();
@@ -264,7 +263,7 @@ public class InstanceDiagramGen implements IRoomGenerator {
     return _xblockexpression;
   }
   
-  public void runDot2Jpg(final String path, final String bat) {
+  private void runDot2Jpg(final String path, final String bat) {
     File _file = new File(path);
     File wdir = _file;
     try {