updated record analyzer and test generator to support new kieker project structure

de.cau.cs.se.kieker.record.analyser/META-INF/MANIFEST.MF

@@ -13,6 +13,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.xtext.xbase.lib;visibility:=reexport,
+ org.eclipse.emf.ecore.xcore.lib,
  org.eclipse.core.resources;bundle-version="3.8.101",
  org.eclipse.jdt;bundle-version="3.9.1",
  org.eclipse.jdt.core;bundle-version="3.9.2",

de.cau.cs.se.kieker.record.analyser/build.properties

-source.. = src/, src-gen/
+source.. = src/,\
+	src-gen/,\
+	xtend-gen/
 output.. = bin/
 bin.includes = plugin.xml,\
                META-INF/,\

de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/Model.java

@@ -13,17 +13,16 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link de.cau.cs.se.kieker.record.analyser.model.Model#getRecords <em>Records</em>}</li>
  * </ul>
- * </p>
  *
  * @see de.cau.cs.se.kieker.record.analyser.model.ModelPackage#getModel()
  * @model
  * @generated
  */
-public interface Model extends EObject
-{
+public interface Model extends EObject {
 	/**
 	 * Returns the value of the '<em><b>Records</b></em>' containment reference list.
 	 * The list contents are of type {@link de.cau.cs.se.kieker.record.analyser.model.Record}.

de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/ModelFactory.java

@@ -12,8 +12,7 @@ import org.eclipse.emf.ecore.EFactory;
  * @see de.cau.cs.se.kieker.record.analyser.model.ModelPackage
  * @generated
  */
-public interface ModelFactory extends EFactory
-{
+public interface ModelFactory extends EFactory {
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->

de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/ModelPackage.java

@@ -24,8 +24,7 @@ import org.eclipse.emf.ecore.EReference;
  *        annotation="http://www.eclipse.org/emf/2002/GenModel basePackage='de.cau.cs.se.kieker.record.analyser'"
  * @generated
  */
-public interface ModelPackage extends EPackage
-{
+public interface ModelPackage extends EPackage {
 	/**
 	 * The package name.
 	 * <!-- begin-user-doc -->
@@ -335,8 +334,7 @@ public interface ModelPackage extends EPackage
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  interface Literals
-  {
+	interface Literals {
 		/**
 		 * The meta object literal for the '{@link de.cau.cs.se.kieker.record.analyser.model.impl.ModelImpl <em>Model</em>}' class.
 		 * <!-- begin-user-doc -->

de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/Parameter.java

@@ -11,18 +11,17 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link de.cau.cs.se.kieker.record.analyser.model.Parameter#getDtype <em>Dtype</em>}</li>
  *   <li>{@link de.cau.cs.se.kieker.record.analyser.model.Parameter#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see de.cau.cs.se.kieker.record.analyser.model.ModelPackage#getParameter()
  * @model
  * @generated
  */
-public interface Parameter extends EObject
-{
+public interface Parameter extends EObject {
 	/**
 	 * Returns the value of the '<em><b>Dtype</b></em>' attribute.
 	 * <!-- begin-user-doc -->

de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/Record.java

@@ -13,20 +13,19 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link de.cau.cs.se.kieker.record.analyser.model.Record#getName <em>Name</em>}</li>
  *   <li>{@link de.cau.cs.se.kieker.record.analyser.model.Record#isAbstractClass <em>Abstract Class</em>}</li>
  *   <li>{@link de.cau.cs.se.kieker.record.analyser.model.Record#getParameters <em>Parameters</em>}</li>
  *   <li>{@link de.cau.cs.se.kieker.record.analyser.model.Record#getParent <em>Parent</em>}</li>
  * </ul>
- * </p>
  *
  * @see de.cau.cs.se.kieker.record.analyser.model.ModelPackage#getRecord()
  * @model
  * @generated
  */
-public interface Record extends EObject
-{
+public interface Record extends EObject {
 	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->

de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/impl/ModelFactoryImpl.java

@@ -18,26 +18,21 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
  * <!-- end-user-doc -->
  * @generated
  */
-public class ModelFactoryImpl extends EFactoryImpl implements ModelFactory
-{
+public class ModelFactoryImpl extends EFactoryImpl implements ModelFactory {
 	/**
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public static ModelFactory init()
-  {
-    try
-    {
+	public static ModelFactory init() {
+		try {
 			ModelFactory theModelFactory = (ModelFactory)EPackage.Registry.INSTANCE.getEFactory(ModelPackage.eNS_URI);
-      if (theModelFactory != null)
-      {
+			if (theModelFactory != null) {
 				return theModelFactory;
 			}
 		}
-    catch (Exception exception)
-    {
+		catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new ModelFactoryImpl();
@@ -49,8 +44,7 @@ public class ModelFactoryImpl extends EFactoryImpl implements ModelFactory
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public ModelFactoryImpl()
-  {
+	public ModelFactoryImpl() {
 		super();
 	}
 
@@ -60,10 +54,8 @@ public class ModelFactoryImpl extends EFactoryImpl implements ModelFactory
 	 * @generated
 	 */
 	@Override
-  public EObject create(EClass eClass)
-  {
-    switch (eClass.getClassifierID())
-    {
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
 			case ModelPackage.MODEL: return createModel();
 			case ModelPackage.RECORD: return createRecord();
 			case ModelPackage.PARAMETER: return createParameter();
@@ -77,8 +69,7 @@ public class ModelFactoryImpl extends EFactoryImpl implements ModelFactory
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public Model createModel()
-  {
+	public Model createModel() {
 		ModelImpl model = new ModelImpl();
 		return model;
 	}
@@ -88,8 +79,7 @@ public class ModelFactoryImpl extends EFactoryImpl implements ModelFactory
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public Record createRecord()
-  {
+	public Record createRecord() {
 		RecordImpl record = new RecordImpl();
 		return record;
 	}
@@ -99,8 +89,7 @@ public class ModelFactoryImpl extends EFactoryImpl implements ModelFactory
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public Parameter createParameter()
-  {
+	public Parameter createParameter() {
 		ParameterImpl parameter = new ParameterImpl();
 		return parameter;
 	}
@@ -110,8 +99,7 @@ public class ModelFactoryImpl extends EFactoryImpl implements ModelFactory
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public ModelPackage getModelPackage()
-  {
+	public ModelPackage getModelPackage() {
 		return (ModelPackage)getEPackage();
 	}
 
@@ -122,8 +110,7 @@ public class ModelFactoryImpl extends EFactoryImpl implements ModelFactory
 	 * @generated
 	 */
 	@Deprecated
-  public static ModelPackage getPackage()
-  {
+	public static ModelPackage getPackage() {
 		return ModelPackage.eINSTANCE;
 	}
 

de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/impl/ModelImpl.java

@@ -26,15 +26,14 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link de.cau.cs.se.kieker.record.analyser.model.impl.ModelImpl#getRecords <em>Records</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
-public class ModelImpl extends MinimalEObjectImpl.Container implements Model
-{
+public class ModelImpl extends MinimalEObjectImpl.Container implements Model {
 	/**
 	 * The cached value of the '{@link #getRecords() <em>Records</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
@@ -50,8 +49,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  protected ModelImpl()
-  {
+	protected ModelImpl() {
 		super();
 	}
 
@@ -61,8 +59,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model
 	 * @generated
 	 */
 	@Override
-  protected EClass eStaticClass()
-  {
+	protected EClass eStaticClass() {
 		return ModelPackage.Literals.MODEL;
 	}
 
@@ -71,10 +68,8 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public EList<Record> getRecords()
-  {
-    if (records == null)
-    {
+	public EList<Record> getRecords() {
+		if (records == null) {
 			records = new EObjectContainmentEList<Record>(Record.class, this, ModelPackage.MODEL__RECORDS);
 		}
 		return records;
@@ -86,10 +81,8 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model
 	 * @generated
 	 */
 	@Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
 			case ModelPackage.MODEL__RECORDS:
 				return ((InternalEList<?>)getRecords()).basicRemove(otherEnd, msgs);
 		}
@@ -102,10 +95,8 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model
 	 * @generated
 	 */
 	@Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case ModelPackage.MODEL__RECORDS:
 				return getRecords();
 		}
@@ -119,10 +110,8 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case ModelPackage.MODEL__RECORDS:
 				getRecords().clear();
 				getRecords().addAll((Collection<? extends Record>)newValue);
@@ -137,10 +126,8 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model
 	 * @generated
 	 */
 	@Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case ModelPackage.MODEL__RECORDS:
 				getRecords().clear();
 				return;
@@ -154,10 +141,8 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model
 	 * @generated
 	 */
 	@Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case ModelPackage.MODEL__RECORDS:
 				return records != null && !records.isEmpty();
 		}

de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/impl/ModelPackageImpl.java

@@ -22,8 +22,7 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
  * <!-- end-user-doc -->
  * @generated
  */
-public class ModelPackageImpl extends EPackageImpl implements ModelPackage
-{
+public class ModelPackageImpl extends EPackageImpl implements ModelPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -60,8 +59,7 @@ public class ModelPackageImpl extends EPackageImpl implements ModelPackage
 	 * @see #init()
 	 * @generated
 	 */
-  private ModelPackageImpl()
-  {
+	private ModelPackageImpl() {
 		super(eNS_URI, ModelFactory.eINSTANCE);
 	}
 
@@ -84,8 +82,7 @@ public class ModelPackageImpl extends EPackageImpl implements ModelPackage
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
-  public static ModelPackage init()
-  {
+	public static ModelPackage init() {
 		if (isInited) return (ModelPackage)EPackage.Registry.INSTANCE.getEPackage(ModelPackage.eNS_URI);
 
 		// Obtain or create and register package
@@ -116,8 +113,7 @@ public class ModelPackageImpl extends EPackageImpl implements ModelPackage
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public EClass getModel()
-  {
+	public EClass getModel() {
 		return modelEClass;
 	}
 
@@ -126,8 +122,7 @@ public class ModelPackageImpl extends EPackageImpl implements ModelPackage
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public EReference getModel_Records()
-  {
+	public EReference getModel_Records() {
 		return (EReference)modelEClass.getEStructuralFeatures().get(0);
 	}
 
@@ -136,8 +131,7 @@ public class ModelPackageImpl extends EPackageImpl implements ModelPackage
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public EClass getRecord()
-  {
+	public EClass getRecord() {
 		return recordEClass;
 	}
 
@@ -146,8 +140,7 @@ public class ModelPackageImpl extends EPackageImpl implements ModelPackage
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public EAttribute getRecord_Name()
-  {
+	public EAttribute getRecord_Name() {
 		return (EAttribute)recordEClass.getEStructuralFeatures().get(0);
 	}
 
@@ -156,8 +149,7 @@ public class ModelPackageImpl extends EPackageImpl implements ModelPackage
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public EAttribute getRecord_AbstractClass()
-  {
+	public EAttribute getRecord_AbstractClass() {
 		return (EAttribute)recordEClass.getEStructuralFeatures().get(1);
 	}
 
@@ -166,8 +158,7 @@ public class ModelPackageImpl extends EPackageImpl implements ModelPackage
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public EReference getRecord_Parameters()
-  {
+	public EReference getRecord_Parameters() {
 		return (EReference)recordEClass.getEStructuralFeatures().get(2);
 	}
 
@@ -176,8 +167,7 @@ public class ModelPackageImpl extends EPackageImpl implements ModelPackage
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public EReference getRecord_Parent()
-  {
+	public EReference getRecord_Parent() {
 		return (EReference)recordEClass.getEStructuralFeatures().get(3);
 	}
 
@@ -186,8 +176,7 @@ public class ModelPackageImpl extends EPackageImpl implements ModelPackage
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public EClass getParameter()
-  {
+	public EClass getParameter() {
 		return parameterEClass;
 	}
 
@@ -196,8 +185,7 @@ public class ModelPackageImpl extends EPackageImpl implements ModelPackage
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public EAttribute getParameter_Dtype()
-  {
+	public EAttribute getParameter_Dtype() {
 		return (EAttribute)parameterEClass.getEStructuralFeatures().get(0);
 	}
 
@@ -206,8 +194,7 @@ public class ModelPackageImpl extends EPackageImpl implements ModelPackage
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public EAttribute getParameter_Name()
-  {
+	public EAttribute getParameter_Name() {
 		return (EAttribute)parameterEClass.getEStructuralFeatures().get(1);
 	}
 
@@ -216,8 +203,7 @@ public class ModelPackageImpl extends EPackageImpl implements ModelPackage
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public ModelFactory getModelFactory()
-  {
+	public ModelFactory getModelFactory() {
 		return (ModelFactory)getEFactoryInstance();
 	}
 
@@ -235,8 +221,7 @@ public class ModelPackageImpl extends EPackageImpl implements ModelPackage
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public void createPackageContents()
-  {
+	public void createPackageContents() {
 		if (isCreated) return;
 		isCreated = true;
 
@@ -269,8 +254,7 @@ public class ModelPackageImpl extends EPackageImpl implements ModelPackage
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public void initializePackageContents()
-  {
+	public void initializePackageContents() {
 		if (isInitialized) return;
 		isInitialized = true;
 

de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/impl/ParameterImpl.java

@@ -18,16 +18,15 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link de.cau.cs.se.kieker.record.analyser.model.impl.ParameterImpl#getDtype <em>Dtype</em>}</li>
  *   <li>{@link de.cau.cs.se.kieker.record.analyser.model.impl.ParameterImpl#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
-public class ParameterImpl extends MinimalEObjectImpl.Container implements Parameter
-{
+public class ParameterImpl extends MinimalEObjectImpl.Container implements Parameter {
 	/**
 	 * The default value of the '{@link #getDtype() <em>Dtype</em>}' attribute.
 	 * <!-- begin-user-doc -->
@@ -73,8 +72,7 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  protected ParameterImpl()
-  {
+	protected ParameterImpl() {
 		super();
 	}
 
@@ -84,8 +82,7 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param
 	 * @generated
 	 */
 	@Override
-  protected EClass eStaticClass()
-  {
+	protected EClass eStaticClass() {
 		return ModelPackage.Literals.PARAMETER;
 	}
 
@@ -94,8 +91,7 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public String getDtype()
-  {
+	public String getDtype() {
 		return dtype;
 	}
 
@@ -104,8 +100,7 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public void setDtype(String newDtype)
-  {
+	public void setDtype(String newDtype) {
 		String oldDtype = dtype;
 		dtype = newDtype;
 		if (eNotificationRequired())
@@ -117,8 +112,7 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public String getName()
-  {
+	public String getName() {
 		return name;
 	}
 
@@ -127,8 +121,7 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public void setName(String newName)
-  {
+	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
 		if (eNotificationRequired())
@@ -141,10 +134,8 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param
 	 * @generated
 	 */
 	@Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case ModelPackage.PARAMETER__DTYPE:
 				return getDtype();
 			case ModelPackage.PARAMETER__NAME:
@@ -159,10 +150,8 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param
 	 * @generated
 	 */
 	@Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case ModelPackage.PARAMETER__DTYPE:
 				setDtype((String)newValue);
 				return;
@@ -179,10 +168,8 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param
 	 * @generated
 	 */
 	@Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case ModelPackage.PARAMETER__DTYPE:
 				setDtype(DTYPE_EDEFAULT);
 				return;
@@ -199,10 +186,8 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param
 	 * @generated
 	 */
 	@Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case ModelPackage.PARAMETER__DTYPE:
 				return DTYPE_EDEFAULT == null ? dtype != null : !DTYPE_EDEFAULT.equals(dtype);
 			case ModelPackage.PARAMETER__NAME:
@@ -217,8 +202,7 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param
 	 * @generated
 	 */
 	@Override
-  public String toString()
-  {
+	public String toString() {
 		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());

de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/impl/RecordImpl.java

@@ -28,18 +28,17 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link de.cau.cs.se.kieker.record.analyser.model.impl.RecordImpl#getName <em>Name</em>}</li>
  *   <li>{@link de.cau.cs.se.kieker.record.analyser.model.impl.RecordImpl#isAbstractClass <em>Abstract Class</em>}</li>
  *   <li>{@link de.cau.cs.se.kieker.record.analyser.model.impl.RecordImpl#getParameters <em>Parameters</em>}</li>
  *   <li>{@link de.cau.cs.se.kieker.record.analyser.model.impl.RecordImpl#getParent <em>Parent</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
-public class RecordImpl extends MinimalEObjectImpl.Container implements Record
-{
+public class RecordImpl extends MinimalEObjectImpl.Container implements Record {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
@@ -105,8 +104,7 @@ public class RecordImpl extends MinimalEObjectImpl.Container implements Record
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  protected RecordImpl()
-  {
+	protected RecordImpl() {
 		super();
 	}
 
@@ -116,8 +114,7 @@ public class RecordImpl extends MinimalEObjectImpl.Container implements Record
 	 * @generated
 	 */
 	@Override
-  protected EClass eStaticClass()
-  {
+	protected EClass eStaticClass() {
 		return ModelPackage.Literals.RECORD;
 	}
 
@@ -126,8 +123,7 @@ public class RecordImpl extends MinimalEObjectImpl.Container implements Record
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public String getName()
-  {
+	public String getName() {
 		return name;
 	}
 
@@ -136,8 +132,7 @@ public class RecordImpl extends MinimalEObjectImpl.Container implements Record
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public void setName(String newName)
-  {
+	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
 		if (eNotificationRequired())
@@ -149,8 +144,7 @@ public class RecordImpl extends MinimalEObjectImpl.Container implements Record
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public boolean isAbstractClass()
-  {
+	public boolean isAbstractClass() {
 		return abstractClass;
 	}
 
@@ -159,8 +153,7 @@ public class RecordImpl extends MinimalEObjectImpl.Container implements Record
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public void setAbstractClass(boolean newAbstractClass)
-  {
+	public void setAbstractClass(boolean newAbstractClass) {
 		boolean oldAbstractClass = abstractClass;
 		abstractClass = newAbstractClass;
 		if (eNotificationRequired())
@@ -172,10 +165,8 @@ public class RecordImpl extends MinimalEObjectImpl.Container implements Record
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public EList<Parameter> getParameters()
-  {
-    if (parameters == null)
-    {
+	public EList<Parameter> getParameters() {
+		if (parameters == null) {
 			parameters = new EObjectContainmentEList<Parameter>(Parameter.class, this, ModelPackage.RECORD__PARAMETERS);
 		}
 		return parameters;
@@ -186,14 +177,11 @@ public class RecordImpl extends MinimalEObjectImpl.Container implements Record
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public Record getParent()
-  {
-    if (parent != null && parent.eIsProxy())
-    {
+	public Record getParent() {
+		if (parent != null && parent.eIsProxy()) {
 			InternalEObject oldParent = (InternalEObject)parent;
 			parent = (Record)eResolveProxy(oldParent);
-      if (parent != oldParent)
-      {
+			if (parent != oldParent) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModelPackage.RECORD__PARENT, oldParent, parent));
 			}
@@ -206,8 +194,7 @@ public class RecordImpl extends MinimalEObjectImpl.Container implements Record
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public Record basicGetParent()
-  {
+	public Record basicGetParent() {
 		return parent;
 	}
 
@@ -216,8 +203,7 @@ public class RecordImpl extends MinimalEObjectImpl.Container implements Record
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public void setParent(Record newParent)
-  {
+	public void setParent(Record newParent) {
 		Record oldParent = parent;
 		parent = newParent;
 		if (eNotificationRequired())
@@ -230,10 +216,8 @@ public class RecordImpl extends MinimalEObjectImpl.Container implements Record
 	 * @generated
 	 */
 	@Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
 			case ModelPackage.RECORD__PARAMETERS:
 				return ((InternalEList<?>)getParameters()).basicRemove(otherEnd, msgs);
 		}
@@ -246,10 +230,8 @@ public class RecordImpl extends MinimalEObjectImpl.Container implements Record
 	 * @generated
 	 */
 	@Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 			case ModelPackage.RECORD__NAME:
 				return getName();
 			case ModelPackage.RECORD__ABSTRACT_CLASS:
@@ -270,10 +252,8 @@ public class RecordImpl extends MinimalEObjectImpl.Container implements Record
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 			case ModelPackage.RECORD__NAME:
 				setName((String)newValue);
 				return;
@@ -297,10 +277,8 @@ public class RecordImpl extends MinimalEObjectImpl.Container implements Record
 	 * @generated
 	 */
 	@Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
+	public void eUnset(int featureID) {
+		switch (featureID) {
 			case ModelPackage.RECORD__NAME:
 				setName(NAME_EDEFAULT);
 				return;
@@ -323,10 +301,8 @@ public class RecordImpl extends MinimalEObjectImpl.Container implements Record
 	 * @generated
 	 */
 	@Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 			case ModelPackage.RECORD__NAME:
 				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
 			case ModelPackage.RECORD__ABSTRACT_CLASS:
@@ -345,8 +321,7 @@ public class RecordImpl extends MinimalEObjectImpl.Container implements Record
 	 * @generated
 	 */
 	@Override
-  public String toString()
-  {
+	public String toString() {
 		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());

de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/util/ModelAdapterFactory.java

@@ -19,8 +19,7 @@ import org.eclipse.emf.ecore.EObject;
  * @see de.cau.cs.se.kieker.record.analyser.model.ModelPackage
  * @generated
  */
-public class ModelAdapterFactory extends AdapterFactoryImpl
-{
+public class ModelAdapterFactory extends AdapterFactoryImpl {
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
@@ -35,10 +34,8 @@ public class ModelAdapterFactory extends AdapterFactoryImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public ModelAdapterFactory()
-  {
-    if (modelPackage == null)
-    {
+	public ModelAdapterFactory() {
+		if (modelPackage == null) {
 			modelPackage = ModelPackage.eINSTANCE;
 		}
 	}
@@ -52,14 +49,11 @@ public class ModelAdapterFactory extends AdapterFactoryImpl
 	 * @generated
 	 */
 	@Override
-  public boolean isFactoryForType(Object object)
-  {
-    if (object == modelPackage)
-    {
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
 			return true;
 		}
-    if (object instanceof EObject)
-    {
+		if (object instanceof EObject) {
 			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
@@ -72,26 +66,21 @@ public class ModelAdapterFactory extends AdapterFactoryImpl
 	 * @generated
 	 */
 	protected ModelSwitch<Adapter> modelSwitch =
-    new ModelSwitch<Adapter>()
-    {
+		new ModelSwitch<Adapter>() {
 			@Override
-      public Adapter caseModel(Model object)
-      {
+			public Adapter caseModel(Model object) {
 				return createModelAdapter();
 			}
 			@Override
-      public Adapter caseRecord(Record object)
-      {
+			public Adapter caseRecord(Record object) {
 				return createRecordAdapter();
 			}
 			@Override
-      public Adapter caseParameter(Parameter object)
-      {
+			public Adapter caseParameter(Parameter object) {
 				return createParameterAdapter();
 			}
 			@Override
-      public Adapter defaultCase(EObject object)
-      {
+			public Adapter defaultCase(EObject object) {
 				return createEObjectAdapter();
 			}
 		};
@@ -105,8 +94,7 @@ public class ModelAdapterFactory extends AdapterFactoryImpl
 	 * @generated
 	 */
 	@Override
-  public Adapter createAdapter(Notifier target)
-  {
+	public Adapter createAdapter(Notifier target) {
 		return modelSwitch.doSwitch((EObject)target);
 	}
 
@@ -121,8 +109,7 @@ public class ModelAdapterFactory extends AdapterFactoryImpl
 	 * @see de.cau.cs.se.kieker.record.analyser.model.Model
 	 * @generated
 	 */
-  public Adapter createModelAdapter()
-  {
+	public Adapter createModelAdapter() {
 		return null;
 	}
 
@@ -136,8 +123,7 @@ public class ModelAdapterFactory extends AdapterFactoryImpl
 	 * @see de.cau.cs.se.kieker.record.analyser.model.Record
 	 * @generated
 	 */
-  public Adapter createRecordAdapter()
-  {
+	public Adapter createRecordAdapter() {
 		return null;
 	}
 
@@ -151,8 +137,7 @@ public class ModelAdapterFactory extends AdapterFactoryImpl
 	 * @see de.cau.cs.se.kieker.record.analyser.model.Parameter
 	 * @generated
 	 */
-  public Adapter createParameterAdapter()
-  {
+	public Adapter createParameterAdapter() {
 		return null;
 	}
 
@@ -164,8 +149,7 @@ public class ModelAdapterFactory extends AdapterFactoryImpl
 	 * @return the new adapter.
 	 * @generated
 	 */
-  public Adapter createEObjectAdapter()
-  {
+	public Adapter createEObjectAdapter() {
 		return null;
 	}
 

de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/util/ModelSwitch.java

@@ -22,8 +22,7 @@ import org.eclipse.emf.ecore.util.Switch;
  * @see de.cau.cs.se.kieker.record.analyser.model.ModelPackage
  * @generated
  */
-public class ModelSwitch<T> extends Switch<T>
-{
+public class ModelSwitch<T> extends Switch<T> {
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
@@ -38,10 +37,8 @@ public class ModelSwitch<T> extends Switch<T>
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-  public ModelSwitch()
-  {
-    if (modelPackage == null)
-    {
+	public ModelSwitch() {
+		if (modelPackage == null) {
 			modelPackage = ModelPackage.eINSTANCE;
 		}
 	}
@@ -50,13 +47,12 @@ public class ModelSwitch<T> extends Switch<T>
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-   * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
 	@Override
-  protected boolean isSwitchFor(EPackage ePackage)
-  {
+	protected boolean isSwitchFor(EPackage ePackage) {
 		return ePackage == modelPackage;
 	}
 
@@ -68,26 +64,21 @@ public class ModelSwitch<T> extends Switch<T>
 	 * @generated
 	 */
 	@Override
-  protected T doSwitch(int classifierID, EObject theEObject)
-  {
-    switch (classifierID)
-    {
-      case ModelPackage.MODEL:
-      {
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case ModelPackage.MODEL: {
 				Model model = (Model)theEObject;
 				T result = caseModel(model);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-      case ModelPackage.RECORD:
-      {
+			case ModelPackage.RECORD: {
 				Record record = (Record)theEObject;
 				T result = caseRecord(record);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-      case ModelPackage.PARAMETER:
-      {
+			case ModelPackage.PARAMETER: {
 				Parameter parameter = (Parameter)theEObject;
 				T result = caseParameter(parameter);
 				if (result == null) result = defaultCase(theEObject);
@@ -108,8 +99,7 @@ public class ModelSwitch<T> extends Switch<T>
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-  public T caseModel(Model object)
-  {
+	public T caseModel(Model object) {
 		return null;
 	}
 
@@ -124,8 +114,7 @@ public class ModelSwitch<T> extends Switch<T>
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-  public T caseRecord(Record object)
-  {
+	public T caseRecord(Record object) {
 		return null;
 	}
 
@@ -140,8 +129,7 @@ public class ModelSwitch<T> extends Switch<T>
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-  public T caseParameter(Parameter object)
-  {
+	public T caseParameter(Parameter object) {
 		return null;
 	}
 
@@ -157,8 +145,7 @@ public class ModelSwitch<T> extends Switch<T>
 	 * @generated
 	 */
 	@Override
-  public T defaultCase(EObject object)
-  {
+	public T defaultCase(EObject object) {
 		return null;
 	}
 

de.cau.cs.se.kieker.record.analyser/src/de/cau/cs/se/kieker/record/analyser/generator/UnitTestGenerator.xtend

@@ -52,9 +52,9 @@ class UnitTestGenerator {
 			/**
 			 * Test API of {@link «record.name»}.
 			 * 
-			 * @author Reiner Jung
+			 * @author API Checker
 			 * 
-			 * @since 1.10
+			 * @since 1.12
 			 */
 			public class Test«record.className»PropertyOrder extends AbstractKiekerTest {
 			

de.cau.cs.se.kieker.record.analyser/src/de/cau/cs/se/kieker/record/analyser/handlers/KiekerRecordSignatureExtractorHandler.java

@@ -40,13 +40,13 @@ import de.cau.cs.se.kieker.record.analyser.model.Record;
 
 public class KiekerRecordSignatureExtractorHandler extends AbstractHandler {
 
-	private static final String KIEKER_PROJECT_NAME = "Kieker";
+	private static final String KIEKER_PROJECT_NAME = "kieker-common";
 	private static final String KIEKER_PACKAGE_ROOT = "kieker.common.record";
 	private static final Object KIEKER_TYPES_FIELD = "TYPES";
 	private static final Object KIEKER_SIZE_FIELD = "SIZE";
 	private static final Object KIEKER_API_ROOT_RECORD = KIEKER_PACKAGE_ROOT + ".AbstractMonitoringRecord";
 	private static final Object KIEKER_API_REGISTRY_RECORD = KIEKER_PACKAGE_ROOT + ".misc.RegistryRecord";
-	private static final String KIEKER_TEST_PACKAGE_ROOT_PATH = "test-gen/api";
+	private static final String KIEKER_TEST_PACKAGE_ROOT_PATH = "test-gen";
 
 	/**
 	 * Main handler method to be executed when the handle is triggered.

de.cau.cs.se.kieker.record.analyser/xtend-gen/de/cau/cs/se/kieker/record/analyser/generator/UnitTestGenerator.java

 package de.cau.cs.se.kieker.record.analyser.generator;
 
-import com.google.common.base.Objects;
 import de.cau.cs.se.kieker.record.analyser.model.Parameter;
 import de.cau.cs.se.kieker.record.analyser.model.Record;
 import java.util.ArrayList;
@@ -123,13 +122,13 @@ public class UnitTestGenerator {
     _builder.append("* ");
     _builder.newLine();
     _builder.append(" ");
-    _builder.append("* @author Reiner Jung");
+    _builder.append("* @author API Checker");
     _builder.newLine();
     _builder.append(" ");
     _builder.append("* ");
     _builder.newLine();
     _builder.append(" ");
-    _builder.append("* @since 1.10");
+    _builder.append("* @since 1.12");
     _builder.newLine();
     _builder.append(" ");
     _builder.append("*/");
@@ -155,14 +154,14 @@ public class UnitTestGenerator {
     _builder.append("\t");
     EList<Parameter> _parameters = record.getParameters();
     final Function1<Parameter, CharSequence> _function = new Function1<Parameter, CharSequence>() {
+      @Override
       public CharSequence apply(final Parameter it) {
-        CharSequence _createConstant = UnitTestGenerator.this.createConstant(it);
-        return _createConstant;
+        return UnitTestGenerator.this.createConstant(it);
       }
     };
     List<CharSequence> _map = ListExtensions.<Parameter, CharSequence>map(_parameters, _function);
     String _join = IterableExtensions.join(_map);
-    _builder.append(_join, "	");
+    _builder.append(_join, "\t");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t\t\t\t\t\t");
     _builder.newLine();
@@ -178,7 +177,7 @@ public class UnitTestGenerator {
     _builder.append("\t");
     _builder.append("public Test");
     String _className_1 = this.getClassName(record);
-    _builder.append(_className_1, "	");
+    _builder.append(_className_1, "\t");
     _builder.append("PropertyOrder() {");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t");
@@ -194,7 +193,7 @@ public class UnitTestGenerator {
     _builder.append("\t ");
     _builder.append("* Test property order processing of {@link ");
     String _name_2 = record.getName();
-    _builder.append(_name_2, "	 ");
+    _builder.append(_name_2, "\t ");
     _builder.append("} constructors and");
     _builder.newLineIfNotEmpty();
     _builder.append("\t ");
@@ -209,7 +208,7 @@ public class UnitTestGenerator {
     _builder.append("\t");
     _builder.append("public void test");
     String _className_2 = this.getClassName(record);
-    _builder.append(_className_2, "	");
+    _builder.append(_className_2, "\t");
     _builder.append("PropertyOrder() { // NOPMD");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t");
@@ -221,14 +220,14 @@ public class UnitTestGenerator {
     _builder.append("\t\t\t");
     EList<Parameter> _parameters_1 = record.getParameters();
     final Function1<Parameter, CharSequence> _function_1 = new Function1<Parameter, CharSequence>() {
+      @Override
       public CharSequence apply(final Parameter it) {
-        CharSequence _createConstantName = UnitTestGenerator.this.createConstantName(it);
-        return _createConstantName;
+        return UnitTestGenerator.this.createConstantName(it);
       }
     };
     List<CharSequence> _map_1 = ListExtensions.<Parameter, CharSequence>map(_parameters_1, _function_1);
     String _join_1 = IterableExtensions.join(_map_1, ",\n");
-    _builder.append(_join_1, "			");
+    _builder.append(_join_1, "\t\t\t");
     _builder.append(",");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t");
@@ -237,7 +236,7 @@ public class UnitTestGenerator {
     _builder.append("\t\t");
     _builder.append("final ByteBuffer inputBuffer = APIEvaluationFunctions.createByteBuffer(");
     String _className_3 = this.getClassName(record);
-    _builder.append(_className_3, "		");
+    _builder.append(_className_3, "\t\t");
     _builder.append(".SIZE, ");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t\t");
@@ -248,23 +247,23 @@ public class UnitTestGenerator {
     _builder.append("\t\t");
     _builder.append("final ");
     String _className_4 = this.getClassName(record);
-    _builder.append(_className_4, "		");
+    _builder.append(_className_4, "\t\t");
     _builder.append(" recordInitParameter = new ");
     String _className_5 = this.getClassName(record);
-    _builder.append(_className_5, "		");
+    _builder.append(_className_5, "\t\t");
     _builder.append("(");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t\t");
     EList<Parameter> _parameters_2 = record.getParameters();
     final Function1<Parameter, CharSequence> _function_2 = new Function1<Parameter, CharSequence>() {
+      @Override
       public CharSequence apply(final Parameter it) {
-        CharSequence _createConstantName = UnitTestGenerator.this.createConstantName(it);
-        return _createConstantName;
+        return UnitTestGenerator.this.createConstantName(it);
       }
     };
     List<CharSequence> _map_2 = ListExtensions.<Parameter, CharSequence>map(_parameters_2, _function_2);
     String _join_2 = IterableExtensions.join(_map_2, ",\n");
-    _builder.append(_join_2, "			");
+    _builder.append(_join_2, "\t\t\t");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t");
     _builder.append(");");
@@ -272,19 +271,19 @@ public class UnitTestGenerator {
     _builder.append("\t\t");
     _builder.append("final ");
     String _className_6 = this.getClassName(record);
-    _builder.append(_className_6, "		");
+    _builder.append(_className_6, "\t\t");
     _builder.append(" recordInitBuffer = new ");
     String _className_7 = this.getClassName(record);
-    _builder.append(_className_7, "		");
+    _builder.append(_className_7, "\t\t");
     _builder.append("(inputBuffer, this.makeStringRegistry());");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t");
     _builder.append("final ");
     String _className_8 = this.getClassName(record);
-    _builder.append(_className_8, "		");
+    _builder.append(_className_8, "\t\t");
     _builder.append(" recordInitArray = new ");
     String _className_9 = this.getClassName(record);
-    _builder.append(_className_9, "		");
+    _builder.append(_className_9, "\t\t");
     _builder.append("(values);");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t");
@@ -292,19 +291,19 @@ public class UnitTestGenerator {
     _builder.append("\t\t");
     _builder.append("this.assert");
     String _className_10 = this.getClassName(record);
-    _builder.append(_className_10, "		");
+    _builder.append(_className_10, "\t\t");
     _builder.append("(recordInitParameter);");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t");
     _builder.append("this.assert");
     String _className_11 = this.getClassName(record);
-    _builder.append(_className_11, "		");
+    _builder.append(_className_11, "\t\t");
     _builder.append("(recordInitBuffer);");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t");
     _builder.append("this.assert");
     String _className_12 = this.getClassName(record);
-    _builder.append(_className_12, "		");
+    _builder.append(_className_12, "\t\t");
     _builder.append("(recordInitArray);");
     _builder.newLineIfNotEmpty();
     _builder.newLine();
@@ -336,7 +335,7 @@ public class UnitTestGenerator {
     _builder.append("\t\t");
     _builder.append("final ByteBuffer outputBufferParameter = ByteBuffer.allocate(");
     String _className_13 = this.getClassName(record);
-    _builder.append(_className_13, "		");
+    _builder.append(_className_13, "\t\t");
     _builder.append(".SIZE);");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t");
@@ -349,7 +348,7 @@ public class UnitTestGenerator {
     _builder.append("\t\t");
     _builder.append("final ByteBuffer outputBufferBuffer = ByteBuffer.allocate(");
     String _className_14 = this.getClassName(record);
-    _builder.append(_className_14, "		");
+    _builder.append(_className_14, "\t\t");
     _builder.append(".SIZE);");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t");
@@ -362,7 +361,7 @@ public class UnitTestGenerator {
     _builder.append("\t\t");
     _builder.append("final ByteBuffer outputBufferArray = ByteBuffer.allocate(");
     String _className_15 = this.getClassName(record);
-    _builder.append(_className_15, "		");
+    _builder.append(_className_15, "\t\t");
     _builder.append(".SIZE);");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t");
@@ -381,7 +380,7 @@ public class UnitTestGenerator {
     _builder.append("\t ");
     _builder.append("* Assertions for ");
     String _className_16 = this.getClassName(record);
-    _builder.append(_className_16, "	 ");
+    _builder.append(_className_16, "\t ");
     _builder.append(".");
     _builder.newLineIfNotEmpty();
     _builder.append("\t ");
@@ -390,10 +389,10 @@ public class UnitTestGenerator {
     _builder.append("\t");
     _builder.append("private void assert");
     String _className_17 = this.getClassName(record);
-    _builder.append(_className_17, "	");
+    _builder.append(_className_17, "\t");
     _builder.append("(final ");
     String _className_18 = this.getClassName(record);
-    _builder.append(_className_18, "	");
+    _builder.append(_className_18, "\t");
     _builder.append(" record) {");
     _builder.newLineIfNotEmpty();
     {
@@ -408,19 +407,19 @@ public class UnitTestGenerator {
           } else {
             String _dtype_1 = parameter.getDtype();
             boolean _equals_1 = "double".equals(_dtype_1);
-            _or = (_equals || _equals_1);
+            _or = _equals_1;
           }
           if (_or) {
             _builder.append("\t\t");
             _builder.append("Assert.assertEquals(\"\'");
             String _name_3 = parameter.getName();
-            _builder.append(_name_3, "		");
+            _builder.append(_name_3, "\t\t");
             _builder.append("\' value assertion failed.\", record.get");
             String _methodName = this.getMethodName(parameter);
-            _builder.append(_methodName, "		");
+            _builder.append(_methodName, "\t\t");
             _builder.append("(), ");
             CharSequence _createConstantName = this.createConstantName(parameter);
-            _builder.append(_createConstantName, "		");
+            _builder.append(_createConstantName, "\t\t");
             _builder.append(", 0.1);");
             _builder.newLineIfNotEmpty();
           } else {
@@ -430,26 +429,26 @@ public class UnitTestGenerator {
               _builder.append("\t\t");
               _builder.append("Assert.assertEquals(\"\'");
               String _name_4 = parameter.getName();
-              _builder.append(_name_4, "		");
+              _builder.append(_name_4, "\t\t");
               _builder.append("\' value assertion failed.\", record.is");
               String _methodName_1 = this.getMethodName(parameter);
-              _builder.append(_methodName_1, "		");
+              _builder.append(_methodName_1, "\t\t");
               _builder.append("(), ");
               CharSequence _createConstantName_1 = this.createConstantName(parameter);
-              _builder.append(_createConstantName_1, "		");
+              _builder.append(_createConstantName_1, "\t\t");
               _builder.append(");");
               _builder.newLineIfNotEmpty();
             } else {
               _builder.append("\t\t");
               _builder.append("Assert.assertEquals(\"\'");
               String _name_5 = parameter.getName();
-              _builder.append(_name_5, "		");
+              _builder.append(_name_5, "\t\t");
               _builder.append("\' value assertion failed.\", record.get");
               String _methodName_2 = this.getMethodName(parameter);
-              _builder.append(_methodName_2, "		");
+              _builder.append(_methodName_2, "\t\t");
               _builder.append("(), ");
               CharSequence _createConstantName_2 = this.createConstantName(parameter);
-              _builder.append(_createConstantName_2, "		");
+              _builder.append(_createConstantName_2, "\t\t");
               _builder.append(");");
               _builder.newLineIfNotEmpty();
             }
@@ -483,10 +482,10 @@ public class UnitTestGenerator {
     {
       EList<Parameter> _parameters_4 = record.getParameters();
       final Function1<Parameter, Boolean> _function_3 = new Function1<Parameter, Boolean>() {
+        @Override
         public Boolean apply(final Parameter it) {
           String _dtype = it.getDtype();
-          boolean _equals = "String".equals(_dtype);
-          return Boolean.valueOf(_equals);
+          return Boolean.valueOf("String".equals(_dtype));
         }
       };
       Iterable<Parameter> _filter = IterableExtensions.<Parameter>filter(_parameters_4, _function_3);
@@ -494,7 +493,7 @@ public class UnitTestGenerator {
         _builder.append("\t\t");
         _builder.append("stringRegistry.get(");
         CharSequence _createConstantName_3 = this.createConstantName(parameter_1);
-        _builder.append(_createConstantName_3, "		");
+        _builder.append(_createConstantName_3, "\t\t");
         _builder.append(");");
         _builder.newLineIfNotEmpty();
       }
@@ -530,16 +529,14 @@ public class UnitTestGenerator {
           System.out.println("found");
           String _name_3 = parameter.getName();
           String _substring = _name_3.substring(1);
-          String _firstUpper = StringExtensions.toFirstUpper(_substring);
-          _xblockexpression_1 = (_firstUpper);
+          _xblockexpression_1 = StringExtensions.toFirstUpper(_substring);
         }
         _xifexpression = _xblockexpression_1;
       } else {
         String _name_3 = parameter.getName();
-        String _firstUpper = StringExtensions.toFirstUpper(_name_3);
-        _xifexpression = _firstUpper;
+        _xifexpression = StringExtensions.toFirstUpper(_name_3);
       }
-      _xblockexpression = (_xifexpression);
+      _xblockexpression = _xifexpression;
     }
     return _xblockexpression;
   }
@@ -568,101 +565,59 @@ public class UnitTestGenerator {
   public CharSequence createConstantValue(final Parameter parameter) {
     CharSequence _switchResult = null;
     String _dtype = parameter.getDtype();
-    final String _switchValue = _dtype;
-    boolean _matched = false;
-    if (!_matched) {
-      if (Objects.equal(_switchValue,"boolean")) {
-        _matched=true;
+    switch (_dtype) {
+      case "boolean":
         StringConcatenation _builder = new StringConcatenation();
-        boolean _not = (!this.booleanCounter);
-        boolean _booleanCounter = this.booleanCounter = _not;
-        _builder.append(_booleanCounter, "");
+        _builder.append(this.booleanCounter = (!this.booleanCounter), "");
         _switchResult = _builder;
-      }
-    }
-    if (!_matched) {
-      if (Objects.equal(_switchValue,"byte")) {
-        _matched=true;
+        break;
+      case "byte":
         StringConcatenation _builder_1 = new StringConcatenation();
-        int _plus = (this.byteCounter + 1);
-        int _byteCounter = this.byteCounter = _plus;
-        _builder_1.append(_byteCounter, "");
+        _builder_1.append(this.byteCounter = (this.byteCounter + 1), "");
         _switchResult = _builder_1;
-      }
-    }
-    if (!_matched) {
-      if (Objects.equal(_switchValue,"char")) {
-        _matched=true;
+        break;
+      case "char":
         StringConcatenation _builder_2 = new StringConcatenation();
         int _numericValue = Character.getNumericValue(this.charCounter);
-        int _plus_1 = (_numericValue + 1);
-        char _charCounter = this.charCounter = ((char) _plus_1);
-        _builder_2.append(_charCounter, "");
+        int _plus = (_numericValue + 1);
+        _builder_2.append(this.charCounter = ((char) _plus), "");
         _switchResult = _builder_2;
-      }
-    }
-    if (!_matched) {
-      if (Objects.equal(_switchValue,"double")) {
-        _matched=true;
+        break;
+      case "double":
         StringConcatenation _builder_3 = new StringConcatenation();
-        double _plus_2 = (this.doubleCounter + 1.0);
-        double _doubleCounter = this.doubleCounter = _plus_2;
-        _builder_3.append(_doubleCounter, "");
+        _builder_3.append(this.doubleCounter = (this.doubleCounter + 1.0), "");
         _switchResult = _builder_3;
-      }
-    }
-    if (!_matched) {
-      if (Objects.equal(_switchValue,"float")) {
-        _matched=true;
+        break;
+      case "float":
         StringConcatenation _builder_4 = new StringConcatenation();
-        float _plus_3 = (this.floatCounter + 1);
-        float _floatCounter = this.floatCounter = _plus_3;
-        _builder_4.append(_floatCounter, "");
+        _builder_4.append(this.floatCounter = (this.floatCounter + 1), "");
         _builder_4.append("f");
         _switchResult = _builder_4;
-      }
-    }
-    if (!_matched) {
-      if (Objects.equal(_switchValue,"int")) {
-        _matched=true;
+        break;
+      case "int":
         StringConcatenation _builder_5 = new StringConcatenation();
-        int _plus_4 = (this.intCounter + 1);
-        int _intCounter = this.intCounter = _plus_4;
-        _builder_5.append(_intCounter, "");
+        _builder_5.append(this.intCounter = (this.intCounter + 1), "");
         _switchResult = _builder_5;
-      }
-    }
-    if (!_matched) {
-      if (Objects.equal(_switchValue,"long")) {
-        _matched=true;
+        break;
+      case "long":
         StringConcatenation _builder_6 = new StringConcatenation();
-        long _plus_5 = (this.longCounter + 1);
-        long _longCounter = this.longCounter = _plus_5;
-        _builder_6.append(_longCounter, "");
+        _builder_6.append(this.longCounter = (this.longCounter + 1), "");
         _builder_6.append("L");
         _switchResult = _builder_6;
-      }
-    }
-    if (!_matched) {
-      if (Objects.equal(_switchValue,"short")) {
-        _matched=true;
+        break;
+      case "short":
         StringConcatenation _builder_7 = new StringConcatenation();
-        int _plus_6 = (this.shortCounter + 1);
-        int _shortCounter = this.shortCounter = _plus_6;
-        _builder_7.append(_shortCounter, "");
+        _builder_7.append(this.shortCounter = (this.shortCounter + 1), "");
         _switchResult = _builder_7;
-      }
-    }
-    if (!_matched) {
-      if (Objects.equal(_switchValue,"String")) {
-        _matched=true;
+        break;
+      case "String":
         StringConcatenation _builder_8 = new StringConcatenation();
         _builder_8.append("\"<");
         String _name = parameter.getName();
         _builder_8.append(_name, "");
         _builder_8.append(">\"");
         _switchResult = _builder_8;
-      }
+        break;
     }
     return _switchResult;
   }
@@ -688,8 +643,7 @@ public class UnitTestGenerator {
   public String getPackageName(final Record record) {
     String _name = record.getName();
     String[] _split = _name.split("\\.");
-    ArrayList<String> _arrayList = new ArrayList<String>(((Collection<? extends String>)Conversions.doWrapArray(_split)));
-    final List<String> path = _arrayList;
+    final List<String> path = new ArrayList<String>((Collection<? extends String>)Conversions.doWrapArray(_split));
     int _length = ((Object[])Conversions.unwrapArray(path, Object.class)).length;
     int _minus = (_length - 1);
     path.remove(_minus);
@@ -705,14 +659,14 @@ public class UnitTestGenerator {
       } else {
         String _get_1 = path.get(1);
         boolean _equals_1 = _get_1.equals("common");
-        _and_1 = (_equals && _equals_1);
+        _and_1 = _equals_1;
       }
       if (!_and_1) {
         _and = false;
       } else {
         String _get_2 = path.get(2);
         boolean _equals_2 = _get_2.equals("record");
-        _and = (_and_1 && _equals_2);
+        _and = _equals_2;
       }
       if (_and) {
         path.remove(0);