catch up with branch daily
Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/org.eclipse.osbp.xtext.chart/emf-gen/org/eclipse/osbp/xtext/chart/ChartDSLPackage.java b/org.eclipse.osbp.xtext.chart/emf-gen/org/eclipse/osbp/xtext/chart/ChartDSLPackage.java
index a8ba4e8..893ba85 100644
--- a/org.eclipse.osbp.xtext.chart/emf-gen/org/eclipse/osbp/xtext/chart/ChartDSLPackage.java
+++ b/org.eclipse.osbp.xtext.chart/emf-gen/org/eclipse/osbp/xtext/chart/ChartDSLPackage.java
@@ -249,7 +249,7 @@
* @generated
* @ordered
*/
- int CHART_PACKAGE___ERESOLVE_PROXY__OBJECT = OSBPTypesPackage.LPACKAGE___ERESOLVE_PROXY__INTERNALEOBJECT;
+ int CHART_PACKAGE___ERESOLVE_PROXY__INTERNALEOBJECT = OSBPTypesPackage.LPACKAGE___ERESOLVE_PROXY__INTERNALEOBJECT;
/**
* The number of operations of the '<em>Chart Package</em>' class.
diff --git a/org.eclipse.osbp.xtext.chart/src/org/eclipse/osbp/xtext/chart/jvmmodel/ChartDSLJvmModelInferrer.xtend b/org.eclipse.osbp.xtext.chart/src/org/eclipse/osbp/xtext/chart/jvmmodel/ChartDSLJvmModelInferrer.xtend
index 7371570..67a7da1 100644
--- a/org.eclipse.osbp.xtext.chart/src/org/eclipse/osbp/xtext/chart/jvmmodel/ChartDSLJvmModelInferrer.xtend
+++ b/org.eclipse.osbp.xtext.chart/src/org/eclipse/osbp/xtext/chart/jvmmodel/ChartDSLJvmModelInferrer.xtend
@@ -213,6 +213,7 @@
annotations += _annotationTypesBuilder.annotationRef(PostConstruct)
body = [append(
'''
+ super.initView();
user.addUserLocaleListener(this);
filterGenerator.addFilterChangeListener(this);
eventDispatcher.addEventReceiver(this);''')]
@@ -226,7 +227,8 @@
'''
user.removeUserLocaleListener(this);
filterGenerator.removeFilterChangeListener(this);
- eventDispatcher.removeEventReceiver(this);''')]
+ eventDispatcher.removeEventReceiver(this);
+ super.destroyView();''')]
])
// create view
type.members += chart.toMethod("createView", _typeReferenceBuilder.typeRef(Void::TYPE), [
@@ -361,9 +363,10 @@
def String createComponents(Chart chart) {
var body = ""
if (chart.source !== null) {
+ var isCube = ((chart.source as ChartDatamart).datamartRef.source instanceof DatamartCube)
body = '''
«body»// get the results
- final DerivedCellSet cellSet = datamartInstance.getResults(getTaskOperativeDtoClass(), getTaskInitialOperativeDtos());
+ final DerivedCellSet cellSet = datamartInstance.getResults(«IF !isCube»false, getTaskOperativeDtoClass(), getTaskInitialOperativeDtos()«ENDIF»);
getCoordinateSystem().clear();
charts.clear();
if (cellSet == null) {
diff --git a/org.eclipse.osbp.xtext.chart/xtend-gen/org/eclipse/osbp/xtext/chart/jvmmodel/ChartDSLJvmModelInferrer.java b/org.eclipse.osbp.xtext.chart/xtend-gen/org/eclipse/osbp/xtext/chart/jvmmodel/ChartDSLJvmModelInferrer.java
index def380e..9141513 100644
--- a/org.eclipse.osbp.xtext.chart/xtend-gen/org/eclipse/osbp/xtext/chart/jvmmodel/ChartDSLJvmModelInferrer.java
+++ b/org.eclipse.osbp.xtext.chart/xtend-gen/org/eclipse/osbp/xtext/chart/jvmmodel/ChartDSLJvmModelInferrer.java
@@ -306,6 +306,8 @@
this._jvmTypesBuilder.<JvmAnnotationReference>operator_add(_annotations, _annotationRef);
final Procedure1<ITreeAppendable> _function_1 = (ITreeAppendable it_1) -> {
StringConcatenation _builder = new StringConcatenation();
+ _builder.append("super.initView();");
+ _builder.newLine();
_builder.append("user.addUserLocaleListener(this);");
_builder.newLine();
_builder.append("filterGenerator.addFilterChangeListener(this);");
@@ -329,6 +331,8 @@
_builder.append("filterGenerator.removeFilterChangeListener(this);");
_builder.newLine();
_builder.append("eventDispatcher.removeEventReceiver(this);");
+ _builder.newLine();
+ _builder.append("super.destroyView();");
it_1.append(_builder);
};
this._jvmTypesBuilder.setBody(it, _function_2);
@@ -610,12 +614,21 @@
ChartDatamart _source = chart.getSource();
boolean _tripleNotEquals = (_source != null);
if (_tripleNotEquals) {
+ ChartDatamart _source_1 = chart.getSource();
+ DatamartSource _source_2 = ((ChartDatamart) _source_1).getDatamartRef().getSource();
+ boolean isCube = (_source_2 instanceof DatamartCube);
StringConcatenation _builder = new StringConcatenation();
_builder.append(body);
_builder.append("// get the results");
_builder.newLineIfNotEmpty();
- _builder.append("final DerivedCellSet cellSet = datamartInstance.getResults(getTaskOperativeDtoClass(), getTaskInitialOperativeDtos());");
- _builder.newLine();
+ _builder.append("final DerivedCellSet cellSet = datamartInstance.getResults(");
+ {
+ if ((!isCube)) {
+ _builder.append("false, getTaskOperativeDtoClass(), getTaskInitialOperativeDtos()");
+ }
+ }
+ _builder.append(");");
+ _builder.newLineIfNotEmpty();
_builder.append("getCoordinateSystem().clear();");
_builder.newLine();
_builder.append("charts.clear();");
