From cb7541e091436b93534ee7299444cef3f8936ca7 Mon Sep 17 00:00:00 2001 From: Norbert Csaba Herczeg Date: Wed, 7 Aug 2024 19:37:50 +0200 Subject: [PATCH] JNG-5859 fix whitespace inconsistencies --- .../jsl/data/transferDeclaration.eol | 10 +- .../epsilon/transformations/ui/jslToUi.etl | 6 +- .../modules/application/actorDeclaration.etl | 20 +- .../modules/structure/transferDeclaration.etl | 22 +- .../ui/modules/view/enumLiteral.etl | 6 +- .../ui/modules/view/rowLinkDeclaration.etl | 6 +- .../ui/modules/view/viewFieldDeclaration.etl | 6 +- .../ui/modules/view/viewGroupDeclaration.etl | 6 +- .../ui/modules/view/viewLinkDeclaration.etl | 124 ++++++------ .../ui/modules/view/viewTableDeclaration.etl | 188 +++++++++--------- .../ui/modules/view/viewTabsDeclaration.etl | 10 +- 11 files changed, 202 insertions(+), 202 deletions(-) diff --git a/judo-tatami-jsl-jsl2ui/src/main/epsilon/operations/jsl/data/transferDeclaration.eol b/judo-tatami-jsl-jsl2ui/src/main/epsilon/operations/jsl/data/transferDeclaration.eol index 98f19cbf..14c94437 100644 --- a/judo-tatami-jsl-jsl2ui/src/main/epsilon/operations/jsl/data/transferDeclaration.eol +++ b/judo-tatami-jsl-jsl2ui/src/main/epsilon/operations/jsl/data/transferDeclaration.eol @@ -171,7 +171,7 @@ operation JSL!TransferDeclaration isRefreshSupported(): Boolean { @cached operation JSL!TransferDeclaration isGenerated() : Boolean { - return actorDeclaration.getExposedTransferObjects().includes(self); + return actorDeclaration.getExposedTransferObjects().includes(self); } operation JSL!TransferDeclaration uiContainer() : UI!ui::VisualElement { @@ -180,20 +180,20 @@ operation JSL!TransferDeclaration uiContainer() : UI!ui::VisualElement { @cached operation JSL!TransferDeclaration getCreateEventDeclaration() : JSL!TransferCreateDeclaration { - return self.members.selectOne(m | m.isKindOf(JSL!TransferCreateDeclaration)); + return self.members.selectOne(m | m.isKindOf(JSL!TransferCreateDeclaration)); } @cached operation JSL!TransferDeclaration getFetchEventDeclaration() : JSL!TransferFetchDeclaration { - return self.members.selectOne(m | m.isKindOf(JSL!TransferFetchDeclaration)); + return self.members.selectOne(m | m.isKindOf(JSL!TransferFetchDeclaration)); } @cached operation JSL!TransferDeclaration getUpdateEventDeclaration() : JSL!TransferUpdateDeclaration { - return self.members.selectOne(m | m.isKindOf(JSL!TransferUpdateDeclaration)); + return self.members.selectOne(m | m.isKindOf(JSL!TransferUpdateDeclaration)); } @cached operation JSL!TransferDeclaration getDeleteEventDeclaration() : JSL!TransferDeleteDeclaration { - return self.members.selectOne(m | m.isKindOf(JSL!TransferDeleteDeclaration)); + return self.members.selectOne(m | m.isKindOf(JSL!TransferDeleteDeclaration)); } diff --git a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/jslToUi.etl b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/jslToUi.etl index 583a9a71..d9d16061 100644 --- a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/jslToUi.etl +++ b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/jslToUi.etl @@ -35,14 +35,14 @@ pre { group.~pos = container.groups.indexOf(group) + 1; } } - } - for (visible : JSL!VisibleDeclaration in JSL!VisibleDeclaration.all()) { + } + for (visible : JSL!VisibleDeclaration in JSL!VisibleDeclaration.all()) { if (visible.isTypeOf(JSL!ViewDeclaration) or visible.isTypeOf(JSL!RowDeclaration)) { for (member in visible.members) { member.~pos = visible.members.indexOf(member) + 1; } } - } + } } post { diff --git a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/application/actorDeclaration.etl b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/application/actorDeclaration.etl index b056ceb4..b3b037a4 100644 --- a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/application/actorDeclaration.etl +++ b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/application/actorDeclaration.etl @@ -113,10 +113,10 @@ rule EmptyDashboardPageDefinition to t: UI!ui::PageDefinition { guard: s = actorDeclaration - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/EmptyDashboardPageDefinition"); - t.name = s.getFqName() + "::DashboardPage"; - t.dashboard = true; - t.dataElement = s.equivalent("Actor"); + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/EmptyDashboardPageDefinition"); + t.name = s.getFqName() + "::DashboardPage"; + t.dashboard = true; + t.dataElement = s.equivalent("Actor"); t.container = s.equivalent("EmptyDashboardPageContainer"); actorDeclaration.equivalent("Application").pages.add(t); @@ -130,12 +130,12 @@ rule EmptyDashboardPageContainer guard: s = actorDeclaration t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/EmptyDashboardPageContainer"); - t.name = s.getFqName() + "::Dashboard"; - t.label = "Dashboard"; - t.type = UI!ui::PageContainerType#TABLE; - t.dataElement = s.equivalent("Actor"); + t.name = s.getFqName() + "::Dashboard"; + t.label = "Dashboard"; + t.type = UI!ui::PageContainerType#TABLE; + t.dataElement = s.equivalent("Actor"); - actorDeclaration.equivalent("Application").pageContainers.add(t); + actorDeclaration.equivalent("Application").pageContainers.add(t); - log.debug("EmptyDashboardPageContainer [" + t.name + "]"); + log.debug("EmptyDashboardPageContainer [" + t.name + "]"); } diff --git a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/structure/transferDeclaration.etl b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/structure/transferDeclaration.etl index e2c06536..ec9cca36 100644 --- a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/structure/transferDeclaration.etl +++ b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/structure/transferDeclaration.etl @@ -100,12 +100,12 @@ rule TransferDeclarationVisualElement to t: UI!ui::Flex { guard: actorDeclaration.getExposedTransferObjects().contains(s) - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/TransferDeclarationVisualElement"); - t.name = s.name; - t.~pos = 0; - t.col = 12d; - t.direction = UI!Axis#VERTICAL; - t.label = null; // we don't need labels for root visual elements + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/TransferDeclarationVisualElement"); + t.name = s.name; + t.~pos = 0; + t.col = 12d; + t.direction = UI!Axis#VERTICAL; + t.label = null; // we don't need labels for root visual elements log.debug("TransferDeclarationVisualElement: " + t.name); } @@ -114,7 +114,7 @@ rule TransferDeclarationVisualElement rule TransferDeclarationCreateButton transform s: JSL!TransferDeclaration to t: UI!ui::Button { - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/TransferDeclarationCreateButton"); + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/TransferDeclarationCreateButton"); t.name = s.getFqName() + "::Create::Submit"; t.buttonStyle = "contained"; t.actionDefinition = s.equivalent("TransferDeclarationCreateActionDefinition"); @@ -147,7 +147,7 @@ rule TransferDeclarationCreateActionDefinition rule TransferDeclarationRefreshButton transform s: JSL!TransferDeclaration to t: UI!ui::Button { - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/TransferDeclarationRefreshButton"); + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/TransferDeclarationRefreshButton"); t.name = s.getFqName() + "::Refresh"; t.buttonStyle = "contained"; t.actionDefinition = s.equivalent("TransferDeclarationRefreshActionDefinition"); @@ -174,7 +174,7 @@ rule TransferDeclarationRefreshActionDefinition rule TransferDeclarationUpdateButton transform s: JSL!TransferDeclaration to t: UI!ui::Button { - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/TransferDeclarationUpdateButton"); + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/TransferDeclarationUpdateButton"); t.name = s.getFqName() + "::Update"; t.buttonStyle = "contained"; t.actionDefinition = s.equivalent("TransferDeclarationUpdateActionDefinition"); @@ -201,7 +201,7 @@ rule TransferDeclarationUpdateActionDefinition rule TransferDeclarationDeleteButton transform s: JSL!TransferDeclaration to t: UI!ui::Button { - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/TransferDeclarationDeleteButton"); + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/TransferDeclarationDeleteButton"); t.name = s.getFqName() + "::Delete"; t.buttonStyle = "contained"; t.actionDefinition = s.equivalent("TransferDeclarationDeleteActionDefinition"); @@ -229,7 +229,7 @@ rule TransferDeclarationBackButton to t: UI!ui::Button { guard: actorDeclaration.getExposedTransferObjects().contains(s) - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/TransferDeclarationBackButton"); + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/TransferDeclarationBackButton"); t.name = s.getFqName() + "::Create::Back"; t.buttonStyle = "text"; t.actionDefinition = s.equivalent("TransferDeclarationBackActionDefinition"); diff --git a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/enumLiteral.etl b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/enumLiteral.etl index c1c739fe..eb8dd84c 100644 --- a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/enumLiteral.etl +++ b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/enumLiteral.etl @@ -3,8 +3,8 @@ rule EnumerationMemberOption transform s: JSL!EnumLiteral to t: UI!ui::Option { - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/EnumerationMemberOption"); + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/EnumerationMemberOption"); t.selected = false; - t.name = s.name; - t.enumerationMember = s.equivalent("CreateEnumerationMember"); + t.name = s.name; + t.enumerationMember = s.equivalent("CreateEnumerationMember"); } diff --git a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/rowLinkDeclaration.etl b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/rowLinkDeclaration.etl index 956cc415..2f8a2974 100644 --- a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/rowLinkDeclaration.etl +++ b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/rowLinkDeclaration.etl @@ -77,7 +77,7 @@ rule RowLinkPageDefinitionRefreshAction guard: actorDeclaration.getAllRelations().contains(s) t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/RowLinkPageDefinitionRefreshAction"); - t.name = s.name + "::Refresh"; + t.name = s.name + "::Refresh"; t.actionDefinition = s.referenceType.equivalent("TransferDeclarationRefreshActionDefinition"); log.debug("RowLinkPageDefinitionRefreshAction: " + t.name); @@ -104,7 +104,7 @@ rule RowLinkPageDefinitionUpdateAction to t: UI!ui::Action { t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/RowLinkPageDefinitionUpdateAction"); - t.name = s.name + "::Update"; + t.name = s.name + "::Update"; t.actionDefinition = s.referenceType.equivalent("TransferDeclarationUpdateActionDefinition"); log.debug("RowLinkPageDefinitionUpdateAction: " + t.name); @@ -117,7 +117,7 @@ rule RowLinkPageDefinitionDeleteAction to t: UI!ui::Action { t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/RowLinkPageDefinitionDeleteAction"); - t.name = s.name + "::Delete"; + t.name = s.name + "::Delete"; t.actionDefinition = s.referenceType.equivalent("TransferDeclarationDeleteActionDefinition"); log.debug("RowLinkPageDefinitionDeleteAction: " + t.name); diff --git a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewFieldDeclaration.etl b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewFieldDeclaration.etl index 7f90c91c..c135098b 100644 --- a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewFieldDeclaration.etl +++ b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewFieldDeclaration.etl @@ -20,9 +20,9 @@ rule AbstractViewFieldDeclaration rule ViewFieldIcon transform s: JSL!ViewFieldDeclaration to t: UI!ui::Icon { - t.iconName = s.getIconModifier().value.value; - t.name = s.name + "FieldIcon"; - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewFieldIcon"); + t.iconName = s.getIconModifier().value.value; + t.name = s.name + "FieldIcon"; + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewFieldIcon"); } @greedy diff --git a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewGroupDeclaration.etl b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewGroupDeclaration.etl index 111551cc..3f9bbace 100644 --- a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewGroupDeclaration.etl +++ b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewGroupDeclaration.etl @@ -99,7 +99,7 @@ rule GroupFrame rule GroupIcon transform s: JSL!ViewGroupDeclaration to t: UI!ui::Icon { - t.iconName = s.getIconModifier().value.value; - t.name = s.name + "GroupIcon"; - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/GroupIcon"); + t.iconName = s.getIconModifier().value.value; + t.name = s.name + "GroupIcon"; + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/GroupIcon"); } diff --git a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewLinkDeclaration.etl b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewLinkDeclaration.etl index fc74ded9..043e53ef 100644 --- a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewLinkDeclaration.etl +++ b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewLinkDeclaration.etl @@ -77,7 +77,7 @@ rule ViewLinkPageDefinitionRefreshAction guard: actorDeclaration.getAllRelations().contains(s) t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewLinkPageDefinitionRefreshAction"); - t.name = s.name + "::Refresh"; + t.name = s.name + "::Refresh"; t.actionDefinition = s.referenceType.equivalent("TransferDeclarationRefreshActionDefinition"); log.debug("ViewLinkPageDefinitionRefreshAction: " + t.name); @@ -91,7 +91,7 @@ rule ViewLinkPageDefinitionBackAction guard: actorDeclaration.getAllRelations().contains(s) t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewLinkPageDefinitionBackAction"); - t.name = s.name + "::Back"; + t.name = s.name + "::Back"; t.actionDefinition = s.referenceType.equivalent("TransferDeclarationBackActionDefinition"); log.debug("ViewLinkPageDefinitionBackAction: " + t.name); @@ -104,7 +104,7 @@ rule ViewLinkPageDefinitionUpdateAction to t: UI!ui::Action { t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewLinkPageDefinitionUpdateAction"); - t.name = s.name + "::Update"; + t.name = s.name + "::Update"; t.actionDefinition = s.referenceType.equivalent("TransferDeclarationUpdateActionDefinition"); log.debug("ViewLinkPageDefinitionUpdateAction: " + t.name); @@ -117,7 +117,7 @@ rule ViewLinkPageDefinitionDeleteAction to t: UI!ui::Action { t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewLinkPageDefinitionDeleteAction"); - t.name = s.name + "::Delete"; + t.name = s.name + "::Delete"; t.actionDefinition = s.referenceType.equivalent("TransferDeclarationDeleteActionDefinition"); log.debug("ViewLinkPageDefinitionDeleteAction: " + t.name); @@ -195,7 +195,7 @@ rule ViewLinkCreateFormBackAction var targetCreateEvent = s.referenceType.getCreateEventDeclaration(); var targetContainer = targetCreateEvent.parameterType.isDefined() ? targetCreateEvent.parameterType : s.referenceType; - t.name = s.name + "::Back"; + t.name = s.name + "::Back"; t.actionDefinition = targetContainer.equivalent("TransferDeclarationBackActionDefinition"); log.debug("ViewLinkCreateFormBackAction: " + t.name); @@ -207,9 +207,9 @@ rule AbstractViewLinkDeclaration to t: UI!ui::Link { guard: actorDeclaration.getAllRelations().contains(s) - t.name = s.name; - t.relationName = s.name; - if (s.getLabelModifier().isDefined()) { + t.name = s.name; + t.relationName = s.name; + if (s.getLabelModifier().isDefined()) { t.label = s.getLabelModifier().value.value; } if (s.getIconModifier().isDefined()) { @@ -239,9 +239,9 @@ rule AbstractViewLinkDeclaration rule LinkIcon transform s: JSL!ViewLinkDeclaration to t: UI!ui::Icon { - t.iconName = s.getIconModifier().value.value; - t.name = s.name + "ViewLinkIcon"; - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/LinkIcon"); + t.iconName = s.getIconModifier().value.value; + t.name = s.name + "ViewLinkIcon"; + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/LinkIcon"); } rule InlineViewLink @@ -281,9 +281,9 @@ rule InlineViewLink rule ViewLinkDeclarationRefreshActionDefinition transform s: JSL!ViewLinkDeclaration to t: UI!ui::RefreshActionDefinition { - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewLinkDeclarationRefreshActionDefinition"); - t.name = s.name + "::Refresh"; - t.isContainedRelationAction = true; + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewLinkDeclarationRefreshActionDefinition"); + t.name = s.name + "::Refresh"; + t.isContainedRelationAction = true; log.debug("ViewLinkDeclarationOpenPageActionDefinitionViewLinkDeclarationRefreshActionDefinition: " + t.name); } @@ -294,7 +294,7 @@ rule ViewLinkDeclarationRefreshAction transform s: JSL!ViewLinkDeclaration to t: UI!ui::Action { t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewLinkDeclarationRefreshAction"); - t.name = s.name + "::Refresh"; + t.name = s.name + "::Refresh"; t.actionDefinition = s.equivalent("ViewLinkDeclarationRefreshActionDefinition"); log.debug("ViewLinkDeclarationRefreshAction: " + t.name); @@ -349,12 +349,12 @@ rule ViewLinkDeclarationRepresentationColumn rule ViewLinkDeclarationOpenPageButton transform s: JSL!ViewLinkDeclaration to t: UI!ui::Button { - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewLinkDeclarationOpenPageButton"); - t.name = s.name + "::View"; - t.buttonStyle = "contained"; - t.label = "View"; - t.icon = s.equivalent("ViewLinkDeclarationOpenPageButtonIcon"); - t.actionDefinition = s.equivalent("ViewLinkDeclarationOpenPageActionDefinition"); + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewLinkDeclarationOpenPageButton"); + t.name = s.name + "::View"; + t.buttonStyle = "contained"; + t.label = "View"; + t.icon = s.equivalent("ViewLinkDeclarationOpenPageButtonIcon"); + t.actionDefinition = s.equivalent("ViewLinkDeclarationOpenPageActionDefinition"); log.debug("ViewLinkDeclarationOpenPageButton: " + t.name); } @@ -363,21 +363,21 @@ rule ViewLinkDeclarationOpenPageButton rule ViewLinkDeclarationOpenPageButtonIcon transform s: JSL!ViewLinkDeclaration to t: UI!ui::Icon { - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewLinkDeclarationOpenPageButtonIcon"); - t.iconName = "eye"; - t.name = s.name + "OpenPageIcon"; + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewLinkDeclarationOpenPageButtonIcon"); + t.iconName = "eye"; + t.name = s.name + "OpenPageIcon"; - log.debug("ViewLinkDeclarationOpenPageButtonIcon: " + t.name); + log.debug("ViewLinkDeclarationOpenPageButtonIcon: " + t.name); } @lazy rule ViewLinkDeclarationOpenPageActionDefinition transform s: JSL!ViewLinkDeclaration to t: UI!ui::OpenPageActionDefinition { - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewLinkDeclarationOpenPageActionDefinition"); - t.name = s.name + "::View"; - t.isContainedRelationAction = true; - t.targetType = s.referenceType.equivalent("ClassType"); + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewLinkDeclarationOpenPageActionDefinition"); + t.name = s.name + "::View"; + t.isContainedRelationAction = true; + t.targetType = s.referenceType.equivalent("ClassType"); log.debug("ViewLinkDeclarationOpenPageActionDefinition: " + t.name); } @@ -389,7 +389,7 @@ rule ViewLinkDeclarationOpenPageAction to t: UI!ui::Action { t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewLinkDeclarationOpenPageAction"); - t.name = s.name + "::OpenPage"; + t.name = s.name + "::OpenPage"; t.actionDefinition = s.equivalent("ViewLinkDeclarationOpenPageActionDefinition"); t.targetPageDefinition = s.equivalent("ViewLinkPageDefinition"); @@ -402,12 +402,12 @@ rule ViewLinkDeclarationOpenPageAction rule ViewLinkDeclarationOpenFormButton transform s: JSL!ViewLinkDeclaration to t: UI!ui::Button { - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewLinkDeclarationOpenFormButton"); - t.name = s.name + "::Create::Open"; - t.buttonStyle = "contained"; - t.label = "Create"; - t.icon = s.equivalent("ViewLinkDeclarationOpenFormButtonIcon"); - t.actionDefinition = s.equivalent("ViewLinkDeclarationOpenCreateFormActionDefinition"); + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewLinkDeclarationOpenFormButton"); + t.name = s.name + "::Create::Open"; + t.buttonStyle = "contained"; + t.label = "Create"; + t.icon = s.equivalent("ViewLinkDeclarationOpenFormButtonIcon"); + t.actionDefinition = s.equivalent("ViewLinkDeclarationOpenCreateFormActionDefinition"); log.debug("ViewLinkDeclarationOpenFormButton: " + t.name); } @@ -416,28 +416,28 @@ rule ViewLinkDeclarationOpenFormButton rule ViewLinkDeclarationOpenFormButtonIcon transform s: JSL!ViewLinkDeclaration to t: UI!ui::Icon { - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewLinkDeclarationOpenFormButtonIcon"); - t.iconName = "note-add"; - t.name = s.name + "OpenFormIcon"; + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewLinkDeclarationOpenFormButtonIcon"); + t.iconName = "note-add"; + t.name = s.name + "OpenFormIcon"; - log.debug("ViewLinkDeclarationOpenFormButtonIcon: " + t.name); + log.debug("ViewLinkDeclarationOpenFormButtonIcon: " + t.name); } @lazy rule ViewLinkDeclarationOpenCreateFormActionDefinition transform s: JSL!ViewLinkDeclaration to t: UI!ui::OpenCreateFormActionDefinition { - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewLinkDeclarationOpenCreateFormActionDefinition"); - t.name = s.name + "::Create"; - t.isContainedRelationAction = true; + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewLinkDeclarationOpenCreateFormActionDefinition"); + t.name = s.name + "::Create"; + t.isContainedRelationAction = true; var targetCreateEvent = s.referenceType.getCreateEventDeclaration(); - if (targetCreateEvent.parameterType.isDefined() and targetCreateEvent.parameterType.isKindOf(JSL!TransferDeclaration)) { + if (targetCreateEvent.parameterType.isDefined() and targetCreateEvent.parameterType.isKindOf(JSL!TransferDeclaration)) { t.targetType = targetCreateEvent.parameterType.equivalent("ClassType"); - } else { - t.targetType = s.referenceType.equivalent("ClassType"); - } + } else { + t.targetType = s.referenceType.equivalent("ClassType"); + } log.debug("ViewLinkDeclarationOpenCreateFormActionDefinition: " + t.name); } @@ -450,7 +450,7 @@ rule ViewLinkDeclarationOpenFormAction to t: UI!ui::Action { t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewLinkDeclarationOpenFormAction"); - t.name = s.name + "::OpenForm"; + t.name = s.name + "::OpenForm"; t.actionDefinition = s.equivalent("ViewLinkDeclarationOpenCreateFormActionDefinition"); t.targetPageDefinition = s.equivalent("ViewLinkCreateFormPageDefinition"); @@ -462,12 +462,12 @@ rule ViewLinkDeclarationOpenFormAction rule ViewLinkDeclarationDeleteButton transform s: JSL!ViewLinkDeclaration to t: UI!ui::Button { - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewLinkDeclarationDeleteButton"); - t.name = s.name + "::Delete"; - t.buttonStyle = "contained"; - t.label = "Delete"; - t.icon = s.equivalent("ViewLinkDeclarationDeleteButtonIcon"); - t.actionDefinition = s.equivalent("ViewLinkDeclarationRowDeleteActionDefinition"); + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewLinkDeclarationDeleteButton"); + t.name = s.name + "::Delete"; + t.buttonStyle = "contained"; + t.label = "Delete"; + t.icon = s.equivalent("ViewLinkDeclarationDeleteButtonIcon"); + t.actionDefinition = s.equivalent("ViewLinkDeclarationRowDeleteActionDefinition"); log.debug("ViewLinkDeclarationDeleteButton: " + t.name); } @@ -476,20 +476,20 @@ rule ViewLinkDeclarationDeleteButton rule ViewLinkDeclarationDeleteButtonIcon transform s: JSL!ViewLinkDeclaration to t: UI!ui::Icon { - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewLinkDeclarationDeleteButtonIcon"); - t.iconName = "delete_forever"; - t.name = s.name + "DeleteIcon"; + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewLinkDeclarationDeleteButtonIcon"); + t.iconName = "delete_forever"; + t.name = s.name + "DeleteIcon"; - log.debug("ViewLinkDeclarationDeleteButtonIcon: " + t.name); + log.debug("ViewLinkDeclarationDeleteButtonIcon: " + t.name); } @lazy rule ViewLinkDeclarationRowDeleteActionDefinition transform s: JSL!ViewLinkDeclaration to t: UI!ui::RowDeleteActionDefinition { - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewLinkDeclarationRowDeleteActionDefinition"); - t.name = s.name + "::Delete"; - t.isContainedRelationAction = true; + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewLinkDeclarationRowDeleteActionDefinition"); + t.name = s.name + "::Delete"; + t.isContainedRelationAction = true; t.targetType = s.referenceType.equivalent("ClassType"); log.debug("ViewLinkDeclarationRowDeleteActionDefinition: " + t.name); @@ -502,7 +502,7 @@ rule ViewLinkDeclarationRowDeleteAction to t: UI!ui::Action { t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewLinkDeclarationRowDeleteAction"); - t.name = s.name + "::RowDelete"; + t.name = s.name + "::RowDelete"; t.actionDefinition = s.equivalent("ViewLinkDeclarationRowDeleteActionDefinition"); log.debug("ViewLinkDeclarationRowDeleteAction: " + t.name); diff --git a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewTableDeclaration.etl b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewTableDeclaration.etl index c99a490e..5d3e49fe 100644 --- a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewTableDeclaration.etl +++ b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewTableDeclaration.etl @@ -54,7 +54,7 @@ rule ViewTableCreateFormCreateAction var targetCreateEvent = s.referenceType.getCreateEventDeclaration(); var targetContainer = targetCreateEvent.parameterType.isDefined() ? targetCreateEvent.parameterType : s.referenceType; - t.name = s.name + "::Create"; + t.name = s.name + "::Create"; t.actionDefinition = targetContainer.equivalent("TransferDeclarationCreateActionDefinition"); log.debug("ViewTableCreateFormCreateAction: " + t.name); @@ -70,7 +70,7 @@ rule ViewTableCreateFormBackAction var targetCreateEvent = s.referenceType.getCreateEventDeclaration(); var targetContainer = targetCreateEvent.parameterType.isDefined() ? targetCreateEvent.parameterType : s.referenceType; - t.name = s.name + "::Back"; + t.name = s.name + "::Back"; t.actionDefinition = targetContainer.equivalent("TransferDeclarationBackActionDefinition"); log.debug("ViewTableCreateFormBackAction: " + t.name); @@ -83,8 +83,8 @@ rule AbstractViewTableDeclaration guard: actorDeclaration.getAllRelations().contains(s) t.name = s.name; - t.relationName = s.name; - if (s.getLabelModifier().isDefined()) { + t.relationName = s.name; + if (s.getLabelModifier().isDefined()) { t.label = s.getLabelModifier().value.value; } if (s.getIconModifier().isDefined()) { @@ -104,8 +104,8 @@ rule TableIcon transform s: JSL!ViewTableDeclaration to t: UI!ui::Icon { t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/TableIcon"); - t.name = s.name + "TableIcon"; - t.iconName = s.getIconModifier().value.value; + t.name = s.name + "TableIcon"; + t.iconName = s.getIconModifier().value.value; } rule InlineViewTable @@ -194,11 +194,11 @@ rule ColumnIcon transform s: JSL!TransferFieldDeclaration to t: UI!ui::Icon { t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ColumnIcon"); - t.iconName = s.getIconModifier().value.value; - t.name = s.name + "FieldIcon"; - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ColumnIcon"); + t.iconName = s.getIconModifier().value.value; + t.name = s.name + "FieldIcon"; + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ColumnIcon"); - log.debug("ColumnIcon: " + t.name); + log.debug("ColumnIcon: " + t.name); } @lazy @@ -258,10 +258,10 @@ rule RowLinkDerivedColumnIcon transform s: JSL!RowLinkDeclaration to t: UI!ui::Icon { t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/RowLinkDerivedColumnIcon"); - t.iconName = s.getIconModifier().value.value; - t.name = s.name + "DerivedColumnIcon"; + t.iconName = s.getIconModifier().value.value; + t.name = s.name + "DerivedColumnIcon"; - log.debug("RowLinkDerivedColumnIcon: " + t.name); + log.debug("RowLinkDerivedColumnIcon: " + t.name); } @lazy @@ -301,9 +301,9 @@ rule RowLinkDerivedAttributeType rule InlineViewTableButtonGroup transform s: JSL!ViewTableDeclaration to t: UI!ui::ButtonGroup { - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/InlineViewTableButtonGroup"); - t.name = s.name + "InlineViewTableButtonGroup"; - t.label = "Actions"; + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/InlineViewTableButtonGroup"); + t.name = s.name + "InlineViewTableButtonGroup"; + t.label = "Actions"; // TODO add buttons @@ -324,16 +324,16 @@ rule InlineViewTableButtonGroup rule InlineViewTableRowButtonGroup transform s: JSL!ViewTableDeclaration to t: UI!ui::ButtonGroup { - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/InlineViewTableRowButtonGroup"); - t.name = s.name + "InlineViewTableRowButtonGroup"; - t.label = "Actions"; + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/InlineViewTableRowButtonGroup"); + t.name = s.name + "InlineViewTableRowButtonGroup"; + t.label = "Actions"; - // TODO add buttons - var rowLinks = s.referenceType.members.select(m | m.isTypeOf(JSL!RowLinkDeclaration)); + // TODO add buttons + var rowLinks = s.referenceType.members.select(m | m.isTypeOf(JSL!RowLinkDeclaration)); - if (rowLinks.selectOne(l | l.getDetail().isDefined()).isDefined()) { - t.buttons.add(s.equivalent("ViewTableDeclarationRowOpenPageButton")); - } + if (rowLinks.selectOne(l | l.getDetail().isDefined()).isDefined()) { + t.buttons.add(s.equivalent("ViewTableDeclarationRowOpenPageButton")); + } if (s.isDeleteAllowed()) { t.buttons.add(s.equivalent("ViewTableDeclarationRowDeleteButton")); } @@ -345,12 +345,12 @@ rule InlineViewTableRowButtonGroup rule ViewTableDeclarationFilterButton transform s: JSL!ViewTableDeclaration to t: UI!ui::Button { - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationFilterButton"); - t.name = s.name + "::Filter"; - t.icon = s.equivalent("ViewTableDeclarationFilterButtonIcon"); - t.label = "Filter"; - t.buttonStyle = "text"; - t.actionDefinition = s.equivalent("ViewTableDeclarationFilterActionDefinition"); + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationFilterButton"); + t.name = s.name + "::Filter"; + t.icon = s.equivalent("ViewTableDeclarationFilterButtonIcon"); + t.label = "Filter"; + t.buttonStyle = "text"; + t.actionDefinition = s.equivalent("ViewTableDeclarationFilterActionDefinition"); log.debug("ViewTableDeclarationFilterButton: " + t.name); } @@ -360,19 +360,19 @@ rule ViewTableDeclarationFilterButtonIcon transform s: JSL!ViewTableDeclaration to t: UI!ui::Icon { t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationFilterButtonIcon"); - t.name = s.name + "FilterIcon"; - t.iconName = "filter"; + t.name = s.name + "FilterIcon"; + t.iconName = "filter"; - log.debug("ViewTableDeclarationFilterButtonIcon: " + t.name); + log.debug("ViewTableDeclarationFilterButtonIcon: " + t.name); } @lazy rule ViewTableDeclarationFilterActionDefinition transform s: JSL!ViewTableDeclaration to t: UI!ui::FilterActionDefinition { - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationFilterActionDefinition"); - t.name = s.name + "::Filter"; - t.targetType = s.referenceType.equivalent("ClassType"); + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationFilterActionDefinition"); + t.name = s.name + "::Filter"; + t.targetType = s.referenceType.equivalent("ClassType"); log.debug("ViewTableDeclarationFilterActionDefinition: " + t.name); } @@ -381,8 +381,8 @@ rule ViewTableDeclarationFilterActionDefinition rule ViewTableDeclarationFilterAction transform s: JSL!ViewTableDeclaration to t: UI!ui::Action { - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationFilterAction"); - t.name = s.name + "::Filter"; + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationFilterAction"); + t.name = s.name + "::Filter"; t.actionDefinition = s.equivalent("ViewTableDeclarationFilterActionDefinition"); log.debug("ViewTableDeclarationFilterAction: " + t.name); @@ -392,12 +392,12 @@ rule ViewTableDeclarationFilterAction rule ViewTableDeclarationRefreshButton transform s: JSL!ViewTableDeclaration to t: UI!ui::Button { - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationRefreshButton"); - t.name = s.name + "::Refresh"; - t.icon = s.equivalent("ViewTableDeclarationRefreshButtonIcon"); - t.label = "Refresh"; - t.buttonStyle = "text"; - t.actionDefinition = s.equivalent("ViewTableDeclarationRefreshActionDefinition"); + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationRefreshButton"); + t.name = s.name + "::Refresh"; + t.icon = s.equivalent("ViewTableDeclarationRefreshButtonIcon"); + t.label = "Refresh"; + t.buttonStyle = "text"; + t.actionDefinition = s.equivalent("ViewTableDeclarationRefreshActionDefinition"); log.debug("ViewTableDeclarationRefreshButton: " + t.name); } @@ -407,19 +407,19 @@ rule ViewTableDeclarationRefreshButtonIcon transform s: JSL!ViewTableDeclaration to t: UI!ui::Icon { t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationRefreshButtonIcon"); - t.name = s.name + "RefreshIcon"; - t.iconName = "refresh"; + t.name = s.name + "RefreshIcon"; + t.iconName = "refresh"; - log.debug("ViewTableDeclarationRefreshButtonIcon: " + t.name); + log.debug("ViewTableDeclarationRefreshButtonIcon: " + t.name); } @lazy rule ViewTableDeclarationRefreshActionDefinition transform s: JSL!ViewTableDeclaration to t: UI!ui::RefreshActionDefinition { - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationRefreshActionDefinition"); - t.name = s.name + "::Refresh"; - t.targetType = s.referenceType.equivalent("ClassType"); + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationRefreshActionDefinition"); + t.name = s.name + "::Refresh"; + t.targetType = s.referenceType.equivalent("ClassType"); log.debug("ViewTableDeclarationRefreshActionDefinition: " + t.name); } @@ -428,8 +428,8 @@ rule ViewTableDeclarationRefreshActionDefinition rule ViewTableDeclarationRefreshAction transform s: JSL!ViewTableDeclaration to t: UI!ui::Action { - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationRefreshAction"); - t.name = s.name + "::Refresh"; + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationRefreshAction"); + t.name = s.name + "::Refresh"; t.actionDefinition = s.equivalent("ViewTableDeclarationRefreshActionDefinition"); log.debug("ViewTableDeclarationRefreshAction: " + t.name); @@ -439,12 +439,12 @@ rule ViewTableDeclarationRefreshAction rule ViewTableDeclarationOpenCreateButton transform s: JSL!ViewTableDeclaration to t: UI!ui::Button { - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationOpenCreateButton"); - t.name = s.name + "::OpenCreate"; - t.icon = s.equivalent("ViewTableDeclarationOpenCreateButtonIcon"); - t.label = "Create"; - t.buttonStyle = "text"; - t.actionDefinition = s.equivalent("ViewTableDeclarationOpenCreateActionDefinition"); + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationOpenCreateButton"); + t.name = s.name + "::OpenCreate"; + t.icon = s.equivalent("ViewTableDeclarationOpenCreateButtonIcon"); + t.label = "Create"; + t.buttonStyle = "text"; + t.actionDefinition = s.equivalent("ViewTableDeclarationOpenCreateActionDefinition"); log.debug("ViewTableDeclarationOpenCreateButton: " + t.name); } @@ -454,19 +454,19 @@ rule ViewTableDeclarationOpenCreateButtonIcon transform s: JSL!ViewTableDeclaration to t: UI!ui::Icon { t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationOpenCreateButtonIcon"); - t.name = s.name + "OpenCreateIcon"; - t.iconName = "file-document-plus"; + t.name = s.name + "OpenCreateIcon"; + t.iconName = "file-document-plus"; - log.debug("ViewTableDeclarationFilterButtonIcon: " + t.name); + log.debug("ViewTableDeclarationFilterButtonIcon: " + t.name); } @lazy rule ViewTableDeclarationOpenCreateActionDefinition transform s: JSL!ViewTableDeclaration to t: UI!ui::OpenCreateFormActionDefinition { - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationOpenCreateActionDefinition"); - t.name = s.name + "::OpenCreate"; - t.targetType = s.referenceType.equivalent("ClassType"); + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationOpenCreateActionDefinition"); + t.name = s.name + "::OpenCreate"; + t.targetType = s.referenceType.equivalent("ClassType"); log.debug("ViewTableDeclarationOpenCreateActionDefinition: " + t.name); } @@ -475,8 +475,8 @@ rule ViewTableDeclarationOpenCreateActionDefinition rule ViewTableDeclarationOpenCreateAction transform s: JSL!ViewTableDeclaration to t: UI!ui::Action { - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationOpenCreateAction"); - t.name = s.name + "::OpenCreate"; + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationOpenCreateAction"); + t.name = s.name + "::OpenCreate"; t.actionDefinition = s.equivalent("ViewTableDeclarationOpenCreateActionDefinition"); t.targetPageDefinition = s.equivalent("ViewTableCreateFormPageDefinition"); @@ -488,12 +488,12 @@ rule ViewTableDeclarationOpenCreateAction rule ViewTableDeclarationRowOpenPageButton transform s: JSL!ViewTableDeclaration to t: UI!ui::Button { - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationRowOpenPageButton"); - t.name = s.name + "::View"; - t.icon = s.equivalent("ViewTableDeclarationRowOpenPageButtonIcon"); - t.label = "View"; - t.buttonStyle = "contained"; - t.actionDefinition = s.equivalent("ViewTableDeclarationRowOpenPageActionDefinition"); + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationRowOpenPageButton"); + t.name = s.name + "::View"; + t.icon = s.equivalent("ViewTableDeclarationRowOpenPageButtonIcon"); + t.label = "View"; + t.buttonStyle = "contained"; + t.actionDefinition = s.equivalent("ViewTableDeclarationRowOpenPageActionDefinition"); log.debug("ViewTableDeclarationRowOpenPageButton: " + t.name); } @@ -503,23 +503,23 @@ rule ViewTableDeclarationRowOpenPageButtonIcon transform s: JSL!ViewTableDeclaration to t: UI!ui::Icon { t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationRowOpenPageButtonIcon"); - t.name = s.name + "RowOpenIcon"; - t.iconName = "visibility"; + t.name = s.name + "RowOpenIcon"; + t.iconName = "visibility"; - log.debug("ViewTableDeclarationRowOpenPageButtonIcon: " + t.name); + log.debug("ViewTableDeclarationRowOpenPageButtonIcon: " + t.name); } @lazy rule ViewTableDeclarationRowOpenPageActionDefinition transform s: JSL!ViewTableDeclaration to t: UI!ui::RowOpenPageActionDefinition { - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationRowOpenPageActionDefinition"); - t.name = s.name + "::View"; - t.targetType = s.referenceType.equivalent("ClassType"); + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationRowOpenPageActionDefinition"); + t.name = s.name + "::View"; + t.targetType = s.referenceType.equivalent("ClassType"); - var rowLinks = s.referenceType.members.select(m | m.isTypeOf(JSL!RowLinkDeclaration)); + var rowLinks = s.referenceType.members.select(m | m.isTypeOf(JSL!RowLinkDeclaration)); - t.linkRelation = rowLinks.selectOne(l | l.getDetail().isDefined()).equivalent("RelationType"); + t.linkRelation = rowLinks.selectOne(l | l.getDetail().isDefined()).equivalent("RelationType"); log.debug("ViewTableDeclarationRowOpenPageActionDefinition: " + t.name); } @@ -532,7 +532,7 @@ rule ViewTableDeclarationOpenPageAction t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationOpenPageAction"); - t.name = s.name + "::OpenPage"; + t.name = s.name + "::OpenPage"; t.actionDefinition = s.equivalent("ViewTableDeclarationRowOpenPageActionDefinition"); t.targetPageDefinition = s.getDetailLink().equivalent("RowLinkPageDefinition"); @@ -544,12 +544,12 @@ rule ViewTableDeclarationOpenPageAction rule ViewTableDeclarationRowDeleteButton transform s: JSL!ViewTableDeclaration to t: UI!ui::Button { - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationRowDeleteButton"); - t.name = s.name + "::RowDelete"; - t.icon = s.equivalent("ViewTableDeclarationRowDeleteButtonIcon"); - t.label = "Delete"; - t.buttonStyle = "contained"; - t.actionDefinition = s.equivalent("ViewTableDeclarationRowDeleteActionDefinition"); + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationRowDeleteButton"); + t.name = s.name + "::RowDelete"; + t.icon = s.equivalent("ViewTableDeclarationRowDeleteButtonIcon"); + t.label = "Delete"; + t.buttonStyle = "contained"; + t.actionDefinition = s.equivalent("ViewTableDeclarationRowDeleteActionDefinition"); log.debug("ViewTableDeclarationRowDeleteButton: " + t.name); } @@ -559,19 +559,19 @@ rule ViewTableDeclarationRowDeleteButtonIcon transform s: JSL!ViewTableDeclaration to t: UI!ui::Icon { t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationRowDeleteButtonIcon"); - t.name = s.name + "RowDeleteIcon"; - t.iconName = "delete_forever"; + t.name = s.name + "RowDeleteIcon"; + t.iconName = "delete_forever"; - log.debug("ViewTableDeclarationRowDeleteButtonIcon: " + t.name); + log.debug("ViewTableDeclarationRowDeleteButtonIcon: " + t.name); } @lazy rule ViewTableDeclarationRowDeleteActionDefinition transform s: JSL!ViewTableDeclaration to t: UI!ui::RowDeleteActionDefinition { - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationRowDeleteActionDefinition"); - t.name = s.name + "::RowDelete"; - t.targetType = s.referenceType.equivalent("ClassType"); + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationRowDeleteActionDefinition"); + t.name = s.name + "::RowDelete"; + t.targetType = s.referenceType.equivalent("ClassType"); log.debug("ViewTableDeclarationRowDeleteActionDefinition: " + t.name); } @@ -581,7 +581,7 @@ rule ViewTableDeclarationRowDeleteAction transform s: JSL!ViewTableDeclaration to t: UI!ui::Action { t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/ViewTableDeclarationRowDeleteAction"); - t.name = s.name + "::RowDelete"; + t.name = s.name + "::RowDelete"; t.actionDefinition = s.equivalent("ViewTableDeclarationRowDeleteActionDefinition"); log.debug("ViewTableDeclarationRowDeleteAction: " + t.name); diff --git a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewTabsDeclaration.etl b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewTabsDeclaration.etl index 4f9beab9..678d20b8 100644 --- a/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewTabsDeclaration.etl +++ b/judo-tatami-jsl-jsl2ui/src/main/epsilon/transformations/ui/modules/view/viewTabsDeclaration.etl @@ -32,10 +32,10 @@ rule GroupTab to t: UI!ui::Tab { guard: s.eContainer.isKindOf(JSL!ViewTabsDeclaration) and s.getTransferObjectType().isGenerated() - s.eContainer.equivalent("TabBarVisualElement").tabs.add(t); + s.eContainer.equivalent("TabBarVisualElement").tabs.add(t); t.element = s.equivalent("GroupVisualElement"); t.name = t.element.name; - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/GroupTab"); + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/GroupTab"); log.debug("GroupTab: " + t.name); } @@ -45,7 +45,7 @@ rule GroupTab rule TabsIcon transform s: JSL!ViewTabsDeclaration to t: UI!ui::Icon { - t.iconName = s.getIconModifier().value.value; - t.name = s.name + "TabsIcon"; - t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/TabsIcon"); + t.iconName = s.getIconModifier().value.value; + t.name = s.name + "TabsIcon"; + t.setId(actorDeclaration.name + "/(jsl/" + s.getId() + ")/TabsIcon"); }