diff options
Diffstat (limited to 'org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/TableDSLJvmModelInferrer.java')
| -rw-r--r-- | org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/TableDSLJvmModelInferrer.java | 464 |
1 files changed, 328 insertions, 136 deletions
diff --git a/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/TableDSLJvmModelInferrer.java b/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/TableDSLJvmModelInferrer.java index 93a0eea..55f196d 100644 --- a/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/TableDSLJvmModelInferrer.java +++ b/org.eclipse.osbp.xtext.table/xtend-gen/org/eclipse/osbp/xtext/table/jvmmodel/TableDSLJvmModelInferrer.java @@ -816,7 +816,7 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer { } } { - if ((((!this.isGrid(table)) && (!this.isEmbedded(table))) && (this.isTask(table) || this.isCube(table)))) { + if (((!this.isGrid(table)) && (!this.isEmbedded(table)))) { _builder.append("filterGenerator.addFilterChangeListener(this);"); _builder.newLine(); } @@ -1449,25 +1449,13 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer { _builder.newLine(); _builder.append("\t\t\t"); _builder.append("\t"); - _builder.append("List<DatamartPrimary<?>> primaryKeys = datamartInstance.getPrimaryList();"); - _builder.newLine(); - _builder.append("\t\t\t"); - _builder.append("\t"); - _builder.append("for(DatamartPrimary key : primaryKeys) {"); + _builder.append("if(datamartInstance.contains(event.getData().get(EventDispatcherDataTag.ID))) {"); _builder.newLine(); _builder.append("\t\t\t"); _builder.append("\t\t"); - _builder.append("if(key.contains(event.getData().get(EventDispatcherDataTag.ID))) {"); - _builder.newLine(); - _builder.append("\t\t\t"); - _builder.append("\t\t\t"); _builder.append("dataRefresh();"); _builder.newLine(); _builder.append("\t\t\t"); - _builder.append("\t\t"); - _builder.append("}"); - _builder.newLine(); - _builder.append("\t\t\t"); _builder.append("\t"); _builder.append("}"); _builder.newLine(); @@ -1532,67 +1520,175 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer { _builder.append("break;"); _builder.newLine(); body = _builder.toString(); - StringConcatenation _builder_1 = new StringConcatenation(); - _builder_1.append(body); - _builder_1.newLineIfNotEmpty(); - _builder_1.append("\t"); - _builder_1.append("}"); - _builder_1.newLine(); - body = _builder_1.toString(); + if ((((!this.isEmbedded(table)) && (table.getTabletype().getToolbar() != null)) && (table.getTabletype().getToolbar().eContainer() != null))) { + StringConcatenation _builder_1 = new StringConcatenation(); + _builder_1.append(body); + _builder_1.newLineIfNotEmpty(); + _builder_1.append("\t"); + _builder_1.append("case ACTION:"); + _builder_1.newLine(); + _builder_1.append("\t\t"); + _builder_1.append("if (toolbarUUID.equals(event.getTopic()) && event.getData().containsKey(EventDispatcherDataTag.BUTTON_ID)) {"); + _builder_1.newLine(); + _builder_1.append("\t\t\t"); + _builder_1.append("Object id = event.getData().get(EventDispatcherDataTag.BUTTON_ID);"); + _builder_1.newLine(); + _builder_1.append("\t\t\t"); + _builder_1.append("if (id instanceof TableActionEnum) {"); + _builder_1.newLine(); + _builder_1.append("\t\t\t\t"); + _builder_1.append("TableActionEnum enumId = (TableActionEnum) id;"); + _builder_1.newLine(); + _builder_1.append("\t\t\t\t"); + _builder_1.append("switch (enumId) {"); + _builder_1.newLine(); + _builder_1.append("\t\t\t\t"); + _builder_1.append("case EXPORT_EXCEL:"); + _builder_1.newLine(); + _builder_1.append("\t\t\t\t\t"); + _builder_1.append("for(CellSetFilterTable table:tables) {"); + _builder_1.newLine(); + _builder_1.append("\t\t\t\t\t\t"); + _builder_1.append("ExcelExport excelExport = new ExcelExport(table, themeResourceService);"); + _builder_1.newLine(); + _builder_1.append("\t\t "); + _builder_1.append("excelExport.excludeCollapsedColumns();"); + _builder_1.newLine(); + _builder_1.append("\t\t "); + _builder_1.append("excelExport.setReportTitle(layoutManager.getCaption());"); + _builder_1.newLine(); + _builder_1.append("\t\t "); + _builder_1.append("excelExport.export();"); + _builder_1.newLine(); + _builder_1.append("\t\t "); + _builder_1.append("}"); + _builder_1.newLine(); + _builder_1.append("\t "); + _builder_1.append("break;"); + _builder_1.newLine(); + _builder_1.append("\t\t\t\t"); + _builder_1.append("case EXPORT_CSV:"); + _builder_1.newLine(); + _builder_1.append("\t\t\t\t\t"); + _builder_1.append("for(CellSetFilterTable table:tables) {"); + _builder_1.newLine(); + _builder_1.append("\t\t\t\t\t\t"); + _builder_1.append("CsvExport csvExport = new CsvExport(table, themeResourceService);"); + _builder_1.newLine(); + _builder_1.append("\t\t "); + _builder_1.append("csvExport.excludeCollapsedColumns();"); + _builder_1.newLine(); + _builder_1.append("\t\t "); + _builder_1.append("csvExport.setReportTitle(layoutManager.getCaption());"); + _builder_1.newLine(); + _builder_1.append("\t\t "); + _builder_1.append("csvExport.export();"); + _builder_1.newLine(); + _builder_1.append("\t\t "); + _builder_1.append("}"); + _builder_1.newLine(); + _builder_1.append("\t "); + _builder_1.append("break;"); + _builder_1.newLine(); + _builder_1.append("\t\t\t\t"); + _builder_1.append("case EXPORT_PDF:"); + _builder_1.newLine(); + _builder_1.append("\t\t\t\t\t"); + _builder_1.append("for(CellSetFilterTable table:tables) {"); + _builder_1.newLine(); + _builder_1.append("\t\t\t\t\t\t"); + _builder_1.append("PdfExport pdfExport = new PdfExport(table, themeResourceService);"); + _builder_1.newLine(); + _builder_1.append("\t\t "); + _builder_1.append("pdfExport.excludeCollapsedColumns();"); + _builder_1.newLine(); + _builder_1.append("\t\t "); + _builder_1.append("pdfExport.setReportTitle(layoutManager.getCaption());"); + _builder_1.newLine(); + _builder_1.append("\t\t "); + _builder_1.append("pdfExport.export();"); + _builder_1.newLine(); + _builder_1.append("\t\t "); + _builder_1.append("}"); + _builder_1.newLine(); + _builder_1.append("\t\t\t\t\t"); + _builder_1.append("break;"); + _builder_1.newLine(); + _builder_1.append("\t\t\t\t"); + _builder_1.append("}"); + _builder_1.newLine(); + _builder_1.append("\t\t\t"); + _builder_1.append("}"); + _builder_1.newLine(); + _builder_1.append("\t\t"); + _builder_1.append("}"); + _builder_1.newLine(); + _builder_1.append("\t\t"); + _builder_1.append("break;"); + _builder_1.newLine(); + body = _builder_1.toString(); + } + StringConcatenation _builder_2 = new StringConcatenation(); + _builder_2.append(body); + _builder_2.newLineIfNotEmpty(); + _builder_2.append("\t"); + _builder_2.append("}"); + _builder_2.newLine(); + body = _builder_2.toString(); } else { boolean _isGrid = this.isGrid(table); if (_isGrid) { - StringConcatenation _builder_2 = new StringConcatenation(); - _builder_2.append(body); - _builder_2.newLineIfNotEmpty(); - _builder_2.append("switch(event.getCommand()) {"); - _builder_2.newLine(); - _builder_2.append("\t"); - _builder_2.append("case SAVE:"); - _builder_2.newLine(); - _builder_2.append("\t"); - _builder_2.append("case DELETE:"); - _builder_2.newLine(); - _builder_2.append("\t"); - _builder_2.append("case REFRESH:"); - _builder_2.newLine(); - _builder_2.append("\t\t"); - _builder_2.append("if(!event.getSender().equals(\""); + StringConcatenation _builder_3 = new StringConcatenation(); + _builder_3.append(body); + _builder_3.newLineIfNotEmpty(); + _builder_3.append("switch(event.getCommand()) {"); + _builder_3.newLine(); + _builder_3.append("\t"); + _builder_3.append("case SAVE:"); + _builder_3.newLine(); + _builder_3.append("\t"); + _builder_3.append("case DELETE:"); + _builder_3.newLine(); + _builder_3.append("\t"); + _builder_3.append("case REFRESH:"); + _builder_3.newLine(); + _builder_3.append("\t\t"); + _builder_3.append("if(!event.getSender().equals(\""); QualifiedName _fullyQualifiedName_5 = this._iQualifiedNameProvider.getFullyQualifiedName(table); - _builder_2.append(_fullyQualifiedName_5, "\t\t"); - _builder_2.append("\")) {"); - _builder_2.newLineIfNotEmpty(); + _builder_3.append(_fullyQualifiedName_5, "\t\t"); + _builder_3.append("\")) {"); + _builder_3.newLineIfNotEmpty(); { Set<LEntity> _findRequestedEntities_2 = this.findRequestedEntities(table); for(final LEntity e_2 : _findRequestedEntities_2) { - _builder_2.append("\t\t\t"); - _builder_2.append("if(event.getTopic().equals(\""); + _builder_3.append("\t\t\t"); + _builder_3.append("if(event.getTopic().equals(\""); QualifiedName _fullyQualifiedName_6 = this._iQualifiedNameProvider.getFullyQualifiedName(e_2); - _builder_2.append(_fullyQualifiedName_6, "\t\t\t"); - _builder_2.append("\")){"); - _builder_2.newLineIfNotEmpty(); - _builder_2.append("\t\t\t"); - _builder_2.append("\t"); - _builder_2.append("// TODO: GridRefresh"); - _builder_2.newLine(); - _builder_2.append("\t\t\t"); - _builder_2.append("\t"); - _builder_2.append("grid.refreshData();"); - _builder_2.newLine(); - _builder_2.append("\t\t\t"); - _builder_2.append("}"); - _builder_2.newLine(); + _builder_3.append(_fullyQualifiedName_6, "\t\t\t"); + _builder_3.append("\")){"); + _builder_3.newLineIfNotEmpty(); + _builder_3.append("\t\t\t"); + _builder_3.append("\t"); + _builder_3.append("// TODO: GridRefresh"); + _builder_3.newLine(); + _builder_3.append("\t\t\t"); + _builder_3.append("\t"); + _builder_3.append("grid.refreshData();"); + _builder_3.newLine(); + _builder_3.append("\t\t\t"); + _builder_3.append("}"); + _builder_3.newLine(); } } - _builder_2.append("\t\t"); - _builder_2.append("}"); - _builder_2.newLine(); - _builder_2.append("\t\t"); - _builder_2.append("break;"); - _builder_2.newLine(); - _builder_2.append("}"); - _builder_2.newLine(); - body = _builder_2.toString(); + _builder_3.append("\t\t"); + _builder_3.append("}"); + _builder_3.newLine(); + _builder_3.append("\t\t"); + _builder_3.append("break;"); + _builder_3.newLine(); + _builder_3.append("}"); + _builder_3.newLine(); + body = _builder_3.toString(); } } return body; @@ -5915,7 +6011,19 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer { _builder.newLine(); _builder.append("\t\t"); _builder.append("\t"); - _builder.append("b.setEnabled(table.getValue() != null);"); + _builder.append("b.setEnabled(table.getValue() != null && "); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("\t\t"); + _builder.append("(dataSourceContainer.getTaskStatus(selection).equals(BPMStatus.Created) ||"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("\t\t"); + _builder.append("dataSourceContainer.getTaskStatus(selection).equals(BPMStatus.Ready) ||"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("\t\t"); + _builder.append("dataSourceContainer.getTaskStatus(selection).equals(BPMStatus.Suspended)));"); _builder.newLine(); _builder.append("\t\t"); _builder.append("}"); @@ -5970,69 +6078,77 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer { boolean _tripleNotEquals = (_primaryKeyAttribute != null); if (_tripleNotEquals) { _builder_1.append("\t\t"); - _builder_1.append("Object idObj = dataSourceContainer.getValueByProperty(selection, \""); - String _lowerCase = alias.toLowerCase(); - _builder_1.append(_lowerCase, "\t\t"); - _builder_1.append("\");"); - _builder_1.newLineIfNotEmpty(); - _builder_1.append("\t\t"); - _builder_1.append("MPerspective perspective = getContext().get(MPerspective.class);"); + _builder_1.append("if(selection != -1) {"); _builder_1.newLine(); _builder_1.append("\t\t"); - _builder_1.append("EventDispatcherEvent evnt = new EventDispatcherEvent(perspective, EventDispatcherCommand.SELECT, \""); + _builder_1.append("\t"); + _builder_1.append("Object idObj = datamartInstance.getPrimaryListKeys(\""); + _builder_1.append(alias, "\t\t\t"); + _builder_1.append("\").get(selection);"); + _builder_1.newLineIfNotEmpty(); + _builder_1.append("\t\t"); + _builder_1.append("\t"); + _builder_1.append("EventDispatcherEvent evnt = new EventDispatcherEvent(getContext().get(MPerspective.class), EventDispatcherCommand.SELECT, \""); QualifiedName _fullyQualifiedName = this._iQualifiedNameProvider.getFullyQualifiedName(this.baseType(entity)); - _builder_1.append(_fullyQualifiedName, "\t\t"); + _builder_1.append(_fullyQualifiedName, "\t\t\t"); _builder_1.append("."); String _idAttributeName = entity.getIdAttributeName(); - _builder_1.append(_idAttributeName, "\t\t"); + _builder_1.append(_idAttributeName, "\t\t\t"); _builder_1.append("\", \""); QualifiedName _fullyQualifiedName_1 = this._iQualifiedNameProvider.getFullyQualifiedName(table); - _builder_1.append(_fullyQualifiedName_1, "\t\t"); + _builder_1.append(_fullyQualifiedName_1, "\t\t\t"); _builder_1.append("\");"); _builder_1.newLineIfNotEmpty(); _builder_1.append("\t\t"); + _builder_1.append("\t"); _builder_1.append("evnt.addItem(EventDispatcherDataTag.ID, idObj);"); _builder_1.newLine(); _builder_1.append("\t\t"); + _builder_1.append("\t"); _builder_1.append("eventDispatcher.sendEvent(evnt);"); _builder_1.newLine(); _builder_1.append("\t\t"); + _builder_1.append("\t"); _builder_1.append("SelectionStore.putSelectionToPerspectiveContext(getPart(), \""); QualifiedName _fullyQualifiedName_2 = this._iQualifiedNameProvider.getFullyQualifiedName(this.baseType(entity)); - _builder_1.append(_fullyQualifiedName_2, "\t\t"); + _builder_1.append(_fullyQualifiedName_2, "\t\t\t"); _builder_1.append("."); String _idAttributeName_1 = entity.getIdAttributeName(); - _builder_1.append(_idAttributeName_1, "\t\t"); + _builder_1.append(_idAttributeName_1, "\t\t\t"); _builder_1.append("\", idObj);"); _builder_1.newLineIfNotEmpty(); _builder_1.append("\t\t"); - _builder_1.append("for (DatamartPrimary<?> primary : datamartInstance.getPrimaryList()){"); + _builder_1.append("\t"); + _builder_1.append("// send all refs too"); _builder_1.newLine(); _builder_1.append("\t\t"); _builder_1.append("\t"); - _builder_1.append("if (!\""); - QualifiedName _fullyQualifiedName_3 = this._iQualifiedNameProvider.getFullyQualifiedName(this.baseType(entity)); - _builder_1.append(_fullyQualifiedName_3, "\t\t\t"); - _builder_1.append("\".equals(primary.getEntityName())){"); - _builder_1.newLineIfNotEmpty(); - _builder_1.append("\t\t"); - _builder_1.append("\t\t"); - _builder_1.append("Object primaryValue = dataSourceContainer.getValueByProperty(selection, primary.getAlias().toLowerCase());"); + _builder_1.append("for (String alias : datamartInstance.getPrimaryList().keySet()){"); _builder_1.newLine(); _builder_1.append("\t\t"); _builder_1.append("\t\t"); - _builder_1.append("evnt = new EventDispatcherEvent(perspective, EventDispatcherCommand.SELECT, primary.getEntityName() + \".\" + primary.getAttributeName(), \""); - QualifiedName _fullyQualifiedName_4 = this._iQualifiedNameProvider.getFullyQualifiedName(table); - _builder_1.append(_fullyQualifiedName_4, "\t\t\t\t"); + _builder_1.append("if (!\""); + _builder_1.append(alias, "\t\t\t\t"); + _builder_1.append("\".equals(alias)){"); + _builder_1.newLineIfNotEmpty(); + _builder_1.append("\t\t"); + _builder_1.append("\t\t\t"); + _builder_1.append("evnt = new EventDispatcherEvent(getContext().get(MPerspective.class), EventDispatcherCommand.SELECT, datamartInstance.getPrimaryList().get(alias).getEntityName() + \".\" + datamartInstance.getPrimaryList().get(alias).getAttributeName(), \""); + QualifiedName _fullyQualifiedName_3 = this._iQualifiedNameProvider.getFullyQualifiedName(table); + _builder_1.append(_fullyQualifiedName_3, "\t\t\t\t\t"); _builder_1.append("\");"); _builder_1.newLineIfNotEmpty(); _builder_1.append("\t\t"); + _builder_1.append("\t\t\t"); + _builder_1.append("evnt.addItem(EventDispatcherDataTag.ID, datamartInstance.getPrimaryListKeys(alias).get(selection));"); + _builder_1.newLine(); _builder_1.append("\t\t"); - _builder_1.append("evnt.addItem(EventDispatcherDataTag.ID, primaryValue);"); + _builder_1.append("\t\t\t"); + _builder_1.append("eventDispatcher.sendEvent(evnt);"); _builder_1.newLine(); _builder_1.append("\t\t"); _builder_1.append("\t\t"); - _builder_1.append("eventDispatcher.sendEvent(evnt);"); + _builder_1.append("}"); _builder_1.newLine(); _builder_1.append("\t\t"); _builder_1.append("\t"); @@ -6060,34 +6176,37 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer { StringConcatenation _builder_1 = new StringConcatenation(); _builder_1.append(body); _builder_1.newLineIfNotEmpty(); + _builder_1.append("\t\t"); + _builder_1.append("if(selection != -1) {"); + _builder_1.newLine(); { TableValueElement _source_1 = event.getSource(); if ((_source_1 instanceof TableOrdinal)) { - _builder_1.append("\t\t"); + _builder_1.append("\t\t\t"); _builder_1.append("EventDispatcherEvent evnt"); - _builder_1.append(evntCnt, "\t\t"); - _builder_1.append(" = new EventDispatcherEvent(perspective, EventDispatcherCommand.SELECT, \""); + _builder_1.append(evntCnt, "\t\t\t"); + _builder_1.append(" = new EventDispatcherEvent(getContext().get(MPerspective.class), EventDispatcherCommand.SELECT, \""); TableValueElement _source_2 = event.getSource(); String _valueRef = ((TableOrdinal) _source_2).getValueRef(); - _builder_1.append(_valueRef, "\t\t"); + _builder_1.append(_valueRef, "\t\t\t"); _builder_1.append("\", \""); QualifiedName _fullyQualifiedName = this._iQualifiedNameProvider.getFullyQualifiedName(table); - _builder_1.append(_fullyQualifiedName, "\t\t"); + _builder_1.append(_fullyQualifiedName, "\t\t\t"); _builder_1.append("\");"); _builder_1.newLineIfNotEmpty(); } else { TableValueElement _source_3 = event.getSource(); if ((_source_3 instanceof TableAttribute)) { - _builder_1.append("\t\t"); + _builder_1.append("\t\t\t"); _builder_1.append("EventDispatcherEvent evnt"); - _builder_1.append(evntCnt, "\t\t"); - _builder_1.append(" = new EventDispatcherEvent(perspective, EventDispatcherCommand.SELECT, \""); + _builder_1.append(evntCnt, "\t\t\t"); + _builder_1.append(" = new EventDispatcherEvent(getContext().get(MPerspective.class), EventDispatcherCommand.SELECT, \""); TableValueElement _source_4 = event.getSource(); String _name = ((TableAttribute) _source_4).getValueRef().getAttributeRef().getName(); - _builder_1.append(_name, "\t\t"); + _builder_1.append(_name, "\t\t\t"); _builder_1.append("\", \""); QualifiedName _fullyQualifiedName_1 = this._iQualifiedNameProvider.getFullyQualifiedName(table); - _builder_1.append(_fullyQualifiedName_1, "\t\t"); + _builder_1.append(_fullyQualifiedName_1, "\t\t\t"); _builder_1.append("\");"); _builder_1.newLineIfNotEmpty(); } @@ -6096,40 +6215,43 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer { { TableValueElement _source_5 = event.getSource(); if ((_source_5 instanceof TableOrdinal)) { - _builder_1.append("\t\t"); + _builder_1.append("\t\t\t"); _builder_1.append("evnt"); - _builder_1.append(evntCnt, "\t\t"); + _builder_1.append(evntCnt, "\t\t\t"); _builder_1.append(".addItem(EventDispatcherDataTag.LIST, dataSourceContainer.getValueByProperty(selection, \""); TableValueElement _source_6 = event.getSource(); String _valueRef_1 = ((TableOrdinal) _source_6).getValueRef(); - _builder_1.append(_valueRef_1, "\t\t"); + _builder_1.append(_valueRef_1, "\t\t\t"); _builder_1.append("\"));"); _builder_1.newLineIfNotEmpty(); - _builder_1.append("\t\t"); + _builder_1.append("\t\t\t"); _builder_1.append("eventDispatcher.sendEvent(evnt"); - _builder_1.append(evntCnt, "\t\t"); + _builder_1.append(evntCnt, "\t\t\t"); _builder_1.append(");"); _builder_1.newLineIfNotEmpty(); } else { TableValueElement _source_7 = event.getSource(); if ((_source_7 instanceof TableAttribute)) { - _builder_1.append("\t\t"); + _builder_1.append("\t\t\t"); _builder_1.append("evnt"); - _builder_1.append(evntCnt, "\t\t"); + _builder_1.append(evntCnt, "\t\t\t"); _builder_1.append(".addItem(EventDispatcherDataTag.LIST, dataSourceContainer.getValueByProperty(selection, \""); TableValueElement _source_8 = event.getSource(); String _name_1 = ((TableAttribute) _source_8).getValueRef().getAttributeRef().getName(); - _builder_1.append(_name_1, "\t\t"); + _builder_1.append(_name_1, "\t\t\t"); _builder_1.append("\"));"); _builder_1.newLineIfNotEmpty(); - _builder_1.append("\t\t"); + _builder_1.append("\t\t\t"); _builder_1.append("eventDispatcher.sendEvent(evnt"); - _builder_1.append(evntCnt, "\t\t"); + _builder_1.append(evntCnt, "\t\t\t"); _builder_1.append(");"); _builder_1.newLineIfNotEmpty(); } } } + _builder_1.append("\t\t"); + _builder_1.append("} "); + _builder_1.newLine(); body = _builder_1.toString(); evntCnt = (evntCnt + 1); } @@ -6254,14 +6376,23 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer { _builder.append("if (container != null) {"); _builder.newLine(); _builder.append("\t"); - _builder.append("List<DerivedMember> members = container.getColumnPosition(visibleColumnKey).getMembers();"); + _builder.append("DerivedPosition pos = container.getColumnPosition(visibleColumnKey);"); _builder.newLine(); _builder.append("\t"); - _builder.append("for (DerivedMember member : members) {"); + _builder.append("if ( pos != null ) {"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("List<DerivedMember> members = pos.getMembers();"); _builder.newLine(); _builder.append("\t\t"); + _builder.append("for (DerivedMember member : members) {"); + _builder.newLine(); + _builder.append("\t\t\t"); _builder.append("membersHash += (member.getUniqueName() != null) ? member.getUniqueName().hashCode() : member.hashCode();"); _builder.newLine(); + _builder.append("\t\t"); + _builder.append("}"); + _builder.newLine(); _builder.append("\t"); _builder.append("}"); _builder.newLine(); @@ -6521,6 +6652,11 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer { IdAttribute prop = new IdAttribute(); prop.collapsed = true; map.put(DatamartDefinitionUtil.getEntityIdAliasName(entity.getEntityRef()), prop); + boolean _isHistorizedOrTimedependentWithParent = entity.getEntityRef().isHistorizedOrTimedependentWithParent(); + if (_isHistorizedOrTimedependentWithParent) { + map.put(DatamartDefinitionUtil.getEntityValidAliasName(entity.getEntityRef()), prop); + map.put(DatamartDefinitionUtil.getEntityCurrentAliasName(entity.getEntityRef()), prop); + } EList<DatamartNavigation> _navigations = entity.getNavigations(); for (final DatamartNavigation navigation : _navigations) { this.iterateIdMap(navigation.getDatamartEntity(), map); @@ -6620,52 +6756,61 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer { StringConcatenation _builder = new StringConcatenation(); _builder.append("List<Integer> selections = new ArrayList<>();"); _builder.newLine(); + _builder.append("if(taskSummary != null) {"); + _builder.newLine(); + _builder.append("\t"); _builder.append("IDto workloadDto = taskClient.getWorkloadDto(taskSummary);"); _builder.newLine(); + _builder.append("\t"); _builder.append("List<IDto> operativeDtos = workLoadItem.getOperativeDtos(workloadDto);"); _builder.newLine(); + _builder.append("\t"); _builder.append("if\t(operativeDtos != null) {"); _builder.newLine(); - _builder.append("\t"); + _builder.append("\t\t"); _builder.append("Set<String> ids = new TreeSet<String>();"); _builder.newLine(); - _builder.append(" "); + _builder.append("\t "); _builder.append("for\t(IDto operativeDto : operativeDtos) {"); _builder.newLine(); - _builder.append(" \t"); + _builder.append("\t \t"); _builder.append("ids.add(String.valueOf((("); - _builder.append(dtoFqn, " \t"); + _builder.append(dtoFqn, "\t \t"); _builder.append(")operativeDto)."); - _builder.append(keyGetter, " \t"); + _builder.append(keyGetter, "\t \t"); _builder.append("));"); _builder.newLineIfNotEmpty(); - _builder.append(" "); + _builder.append("\t "); _builder.append("}"); _builder.newLine(); - _builder.append(" "); + _builder.append("\t "); _builder.append("for\t(Object selection : dataSourceContainer.getAllItemIds()) {"); _builder.newLine(); - _builder.append(" "); + _builder.append("\t "); _builder.append("String idValue = dataSourceContainer.getStringValueByProperty((Integer)selection,\""); - _builder.append(alias, " "); + _builder.append(alias, "\t "); _builder.append("\");"); _builder.newLineIfNotEmpty(); - _builder.append(" \t"); + _builder.append("\t \t"); _builder.append("if\t(ids.contains(idValue)) {"); _builder.newLine(); - _builder.append(" \t\t"); + _builder.append("\t \t\t"); _builder.append("selections.add((Integer)selection);"); _builder.newLine(); - _builder.append(" \t"); + _builder.append("\t \t"); _builder.append("}"); _builder.newLine(); - _builder.append(" "); + _builder.append("\t "); _builder.append("}"); _builder.newLine(); + _builder.append("\t"); _builder.append("}"); _builder.newLine(); + _builder.append("\t"); _builder.append("selectTable.setValue(selections);"); _builder.newLine(); + _builder.append("}"); + _builder.newLine(); _xblockexpression = _builder; } return _xblockexpression; @@ -6692,9 +6837,9 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer { LDataType keyType = this._modelExtensions.getDatatype(entity.getPrimaryKeyAttribute()); String dtoFqn = EntityUtils.getDtoFQNForLEntity(entity); StringConcatenation _builder = new StringConcatenation(); - _builder.append("IDTOServiceWithMutablePersistence<"); + _builder.append("IDTOService<"); _builder.append(dtoFqn); - _builder.append("> dtoService = (IDTOServiceWithMutablePersistence<"); + _builder.append("> dtoService = (IDTOService<"); _builder.append(dtoFqn); _builder.append(">) DtoServiceAccess.getService("); _builder.append(dtoFqn); @@ -6704,9 +6849,12 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer { _builder.append(alias); _builder.append("\");"); _builder.newLineIfNotEmpty(); - _builder.append("if\t(selected) {"); + _builder.append("if(taskSummary != null) {"); _builder.newLine(); _builder.append("\t"); + _builder.append("if\t(selected) {"); + _builder.newLine(); + _builder.append("\t\t"); _builder.append("workLoadItem.addOperativeDto(taskClient.getWorkloadDto(taskSummary), "); { boolean _equals = "int".equals(keyType.getName()); @@ -6718,16 +6866,18 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer { } _builder.append(");"); _builder.newLineIfNotEmpty(); + _builder.append("\t"); _builder.append("}"); _builder.newLine(); + _builder.append("\t"); _builder.append("else {"); _builder.newLine(); - _builder.append(" \t"); + _builder.append("\t \t"); _builder.append("for(IDto dtoToRemove : workLoadItem.getOperativeDtos(taskClient.getWorkloadDto(taskSummary))) {"); _builder.newLine(); - _builder.append("\t\t"); + _builder.append("\t\t\t"); _builder.append("if((("); - _builder.append(dtoFqn, "\t\t"); + _builder.append(dtoFqn, "\t\t\t"); _builder.append(")dtoToRemove).getId()"); { boolean _equals_1 = "int".equals(keyType.getName()); @@ -6739,18 +6889,60 @@ public class TableDSLJvmModelInferrer extends AbstractModelInferrer { } _builder.append(") {"); _builder.newLineIfNotEmpty(); - _builder.append("\t\t\t"); + _builder.append("\t\t\t\t"); _builder.append("workLoadItem.removeOperativeDto(taskClient.getWorkloadDto(taskSummary), dtoToRemove);"); _builder.newLine(); - _builder.append("\t\t\t"); + _builder.append("\t\t\t\t"); _builder.append("break;"); _builder.newLine(); + _builder.append("\t\t\t"); + _builder.append("}"); + _builder.newLine(); _builder.append("\t\t"); _builder.append("}"); _builder.newLine(); _builder.append("\t"); _builder.append("}"); _builder.newLine(); + _builder.append("} else {"); + _builder.newLine(); + _builder.append("\t"); + _builder.append("if(selected) {"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("SelectionStore.addSelectionToPerspectiveContext(getPart(), \""); + _builder.append(dtoFqn, "\t\t"); + _builder.append("\", "); + { + boolean _equals_2 = "int".equals(keyType.getName()); + if (_equals_2) { + _builder.append("dtoService.get((int) Integer.parseInt(idValue))"); + } else { + _builder.append("dtoService.get(idValue)"); + } + } + _builder.append(");"); + _builder.newLineIfNotEmpty(); + _builder.append("\t"); + _builder.append("} else {"); + _builder.newLine(); + _builder.append("\t\t"); + _builder.append("SelectionStore.removeSelectionFromPerspectiveContext(getPart(), \""); + _builder.append(dtoFqn, "\t\t"); + _builder.append("\", "); + { + boolean _equals_3 = "int".equals(keyType.getName()); + if (_equals_3) { + _builder.append("dtoService.get((int) Integer.parseInt(idValue))"); + } else { + _builder.append("dtoService.get(idValue)"); + } + } + _builder.append(");"); + _builder.newLineIfNotEmpty(); + _builder.append("\t"); + _builder.append("}"); + _builder.newLine(); _builder.append("}"); _builder.newLine(); _xblockexpression = _builder; |