bug fixes in the generator and build management

parent b95a5da2
......@@ -108,7 +108,7 @@ class ConfigGenerator extends AbstractGenerator {
switch el {
Stage: {
// add stage type
importSet.add(el.type.toString);
importSet.add(el.type.importedNamespace.toString);
// add parameters
if (el.parameter != null) {
importSet.add(el.parameter.qualifiedNameList.name1);
......@@ -129,7 +129,7 @@ class ConfigGenerator extends AbstractGenerator {
}
}
ImportDeclaration: {
importSet.add(el.importedNamespace);
importSet.add(el.importedNamespace.toString);
}
}
}
......@@ -164,7 +164,7 @@ class ConfigGenerator extends AbstractGenerator {
/*** create a private field for a stage
tried to use final but the init method would be unable to set those in the constructor */
def compilePrivateAttribute(Stage s) '''
private final «s.type.toString.cutNameFromQualifiedName»«s.compileParameter» «s.name»;
private final «s.type.importedNamespace.toString.cutNameFromQualifiedName»«s.compileParameter» «s.name»;
'''
/*** create <param> tags for a stage */
......@@ -198,7 +198,7 @@ class ConfigGenerator extends AbstractGenerator {
/*** create a getter for a stage*/
def compileGetter(Stage s) '''
«IF !s.private»
public «s.type.toString.cutNameFromQualifiedName»«s.compileParameter» get«s.name.toFirstUpper»() {
public «s.type.importedNamespace.toString.cutNameFromQualifiedName»«s.compileParameter» get«s.name.toFirstUpper»() {
return «s.name»;
}
«ENDIF»
......@@ -291,7 +291,7 @@ class ConfigGenerator extends AbstractGenerator {
/*** dummy call to initialize a stage */
def compileInitStage(Stage s) '''
«s.name» = new «s.type»«s.compileParameter»(«s.compileArguments»);
«s.name» = new «s.type.importedNamespace.toString.cutNameFromQualifiedName»«s.compileParameter»(«s.compileArguments»);
'''
def compileArguments(Stage s) {
......
......@@ -8,11 +8,11 @@ Bundle-ActivationPolicy: lazy
Require-Bundle: javax.inject,
com.google.inject,
org.eclipse.xtext.xbase.lib,
org.eclipse.elk.core,
org.eclipse.elk.core;bundle-version="0.1.0",
org.eclipse.elk.graph,
org.eclipse.elk.alg.layered,
de.cau.cs.kieler.klighd.krendering.extensions,
de.cau.cs.kieler.klighd,
de.cau.cs.kieler.klighd;bundle-version="0.10.0",
de.cau.cs.kieler.klighd.ui,
de.cau.cs.kieler.klighd.piccolo,
org.eclipse.ui,
......
......@@ -37,7 +37,6 @@
<import plugin="de.cau.se.teetime.configuration.dsl" version="0.1.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.core"/>
<import plugin="org.eclipse.core.contenttype"/>
<import plugin="de.cau.cs.kieler.klighd.krendering"/>
<import plugin="de.cau.cs.kieler.klighd.ui.contrib3x"/>
</requires>
......
......@@ -13,5 +13,4 @@
</category-def>
<repository-reference location="http://download.eclipse.org/elk/updates/releases/0.1.0/" enabled="true" />
<repository-reference location="http://rtsys.informatik.uni-kiel.de/~kieler/updatesite/nightly/pragmatics/" enabled="true" />
<repository-reference location="http://rtsys.informatik.uni-kiel.de/~kieler/updatesite/nightly/pragmatics/" enabled="true" />
</site>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment