Skip to content
Snippets Groups Projects
Commit 83180b42 authored by René Schöne's avatar René Schöne
Browse files

rename forwardingNTA to forwarding

parent 0fe7e928
No related branches found
No related tags found
1 merge request!33Resolve "Refactorings/Clean-Up"
...@@ -445,7 +445,7 @@ aspect MustacheReceiveAndSendAndHandleUri { ...@@ -445,7 +445,7 @@ aspect MustacheReceiveAndSendAndHandleUri {
eq AttributeEndpointTarget.parentTypeName() = getParentTypeDecl().getName(); eq AttributeEndpointTarget.parentTypeName() = getParentTypeDecl().getName();
eq AttributeEndpointTarget.entityName() = getName(); eq AttributeEndpointTarget.entityName() = getName();
eq RelationEndpointTarget.getterMethodName() = forwardingNTA_Name(); eq RelationEndpointTarget.getterMethodName() = forwardingName();
eq RelationEndpointTarget.parentTypeName() = getRole().getType().getName(); eq RelationEndpointTarget.parentTypeName() = getRole().getType().getName();
eq RelationEndpointTarget.entityName() = getRole().getName(); eq RelationEndpointTarget.entityName() = getRole().getName();
eq RelationEndpointTarget.realGetterMethodName() = "get" + getRole().getterMethodName(); eq RelationEndpointTarget.realGetterMethodName() = "get" + getRole().getterMethodName();
...@@ -466,10 +466,10 @@ aspect MustacheReceiveAndSendAndHandleUri { ...@@ -466,10 +466,10 @@ aspect MustacheReceiveAndSendAndHandleUri {
eq TypeEndpointTarget.entityName() = getType().getName() + (typeIsList() && !containingEndpointDefinition().getIndexBasedListAccess() ? "List" : ""); eq TypeEndpointTarget.entityName() = getType().getName() + (typeIsList() && !containingEndpointDefinition().getIndexBasedListAccess() ? "List" : "");
private String TypeEndpointTarget.getterMethodeNameHelper(boolean useForwarding) { private String TypeEndpointTarget.getterMethodeNameHelper(boolean useForwarding) {
return (useForwarding && needForwardingNTA() ? forwardingNTA_Name() : return (useForwarding && needForwarding() ? forwardingName() :
"get" + getType().getName() + (typeIsList() && (!containingEndpointDefinition().getIndexBasedListAccess() || "get" + getType().getName() + (typeIsList() && (!containingEndpointDefinition().getIndexBasedListAccess() ||
containingEndpointDefinition().getWithAdd()) ? "List" : "") + (typeIsOpt() ? "Opt" : "") containingEndpointDefinition().getWithAdd()) ? "List" : "") + (typeIsOpt() ? "Opt" : "")
+ (needForwardingNTA() ? "NoTransform" : "")); + (needForwarding() ? "NoTransform" : ""));
} }
eq ContextFreeTypeEndpointTarget.getterMethodName() = null; eq ContextFreeTypeEndpointTarget.getterMethodName() = null;
...@@ -506,14 +506,14 @@ aspect MustacheSendDefinition { ...@@ -506,14 +506,14 @@ aspect MustacheSendDefinition {
syn String EndpointDefinition.lastValueSetter() = senderName() + ".setLastValue"; syn String EndpointDefinition.lastValueSetter() = senderName() + ".setLastValue";
syn boolean EndpointDefinition.needForwardingNTA() = getEndpointTarget().needForwardingNTA(); syn boolean EndpointDefinition.needForwarding() = getEndpointTarget().needForwarding();
syn String EndpointDefinition.forwardingNTA_Name() = getEndpointTarget().forwardingNTA_Name(); syn String EndpointDefinition.forwardingName() = getEndpointTarget().forwardingName();
syn String EndpointDefinition.forwardingNTA_Type() = getEndpointTarget().forwardingNTA_Type(); syn String EndpointDefinition.forwardingType() = getEndpointTarget().forwardingType();
syn boolean EndpointDefinition.targetIsAttribute() = getEndpointTarget().isAttributeEndpointTarget(); syn boolean EndpointDefinition.targetIsAttribute() = getEndpointTarget().isAttributeEndpointTarget();
syn boolean EndpointDefinition.indexBasedAccessAndTargetIsNTA() { syn boolean EndpointDefinition.indexBasedAccessAndTargetIsNTA() {
return typeIsList() && getIndexBasedListAccess() && !needForwardingNTA(); return typeIsList() && getIndexBasedListAccess() && !needForwarding();
} }
syn boolean EndpointDefinition.relationEndpointWithListRole() = getEndpointTarget().relationEndpointWithListRole(); syn boolean EndpointDefinition.relationEndpointWithListRole() = getEndpointTarget().relationEndpointWithListRole();
...@@ -546,30 +546,30 @@ aspect MustacheSendDefinition { ...@@ -546,30 +546,30 @@ aspect MustacheSendDefinition {
syn String EndpointDefinition.writeMethodName() = toMustache().writeMethodName(); syn String EndpointDefinition.writeMethodName() = toMustache().writeMethodName();
// === attributes needed for computing above ones === // === attributes needed for computing above ones ===
syn boolean EndpointTarget.needForwardingNTA() = false; syn boolean EndpointTarget.needForwarding() = false;
eq TypeEndpointTarget.needForwardingNTA() = containingEndpointDefinition().getSend() && !getType().getNTA(); eq TypeEndpointTarget.needForwarding() = containingEndpointDefinition().getSend() && !getType().getNTA();
eq RelationEndpointTarget.needForwardingNTA() = containingEndpointDefinition().getSend(); eq RelationEndpointTarget.needForwarding() = containingEndpointDefinition().getSend();
syn String EndpointTarget.forwardingNTA_Name() = null; // only needed, if needForwardingNTA evaluates to true syn String EndpointTarget.forwardingName() = null; // only needed, if needForwarding evaluates to true
eq TypeEndpointTarget.forwardingNTA_Name() = ragconnect().internalRagConnectPrefix() + getType().getName(); eq TypeEndpointTarget.forwardingName() = ragconnect().internalRagConnectPrefix() + getType().getName();
eq RelationEndpointTarget.forwardingNTA_Name() = ragconnect().internalRagConnectPrefix() + getRole().getName(); eq RelationEndpointTarget.forwardingName() = ragconnect().internalRagConnectPrefix() + getRole().getName();
syn String EndpointTarget.forwardingNTA_Type() = null; // only needed, if needForwardingNTA evaluates to true syn String EndpointTarget.forwardingType() = null; // only needed, if needForwarding evaluates to true
eq TypeEndpointTarget.forwardingNTA_Type() = getType().forwardingNTA_Type( eq TypeEndpointTarget.forwardingType() = getType().forwardingType(
containingEndpointDefinition().getIndexBasedListAccess()); containingEndpointDefinition().getIndexBasedListAccess());
eq RelationEndpointTarget.forwardingNTA_Type() = getRole().forwardingNTA_Type( eq RelationEndpointTarget.forwardingType() = getRole().forwardingType(
containingEndpointDefinition().getIndexBasedListAccess()); containingEndpointDefinition().getIndexBasedListAccess());
syn String TypeComponent.forwardingNTA_Type(boolean indexBasedListAccess); syn String TypeComponent.forwardingType(boolean indexBasedListAccess);
eq NormalComponent.forwardingNTA_Type(boolean indexBasedListAccess) = getTypeDecl().getName(); eq NormalComponent.forwardingType(boolean indexBasedListAccess) = getTypeDecl().getName();
eq OptComponent.forwardingNTA_Type(boolean indexBasedListAccess) = eq OptComponent.forwardingType(boolean indexBasedListAccess) =
ragconnect().configJastAddOpt() + "<" + getTypeDecl().getName() + ">"; ragconnect().configJastAddOpt() + "<" + getTypeDecl().getName() + ">";
eq ListComponent.forwardingNTA_Type(boolean indexBasedListAccess) = indexBasedListAccess ? eq ListComponent.forwardingType(boolean indexBasedListAccess) = indexBasedListAccess ?
getTypeDecl().getName() : getTypeDecl().getName() :
ragconnect().configJastAddList() + "<" + getTypeDecl().getName() + ">"; ragconnect().configJastAddList() + "<" + getTypeDecl().getName() + ">";
syn String Role.forwardingNTA_Type(boolean indexBasedListAccess) = oppositeRole().getType().getName(); syn String Role.forwardingType(boolean indexBasedListAccess) = oppositeRole().getType().getName();
eq ListRole.forwardingNTA_Type(boolean indexBasedListAccess) = indexBasedListAccess ? eq ListRole.forwardingType(boolean indexBasedListAccess) = indexBasedListAccess ?
oppositeRole().getType().getName() : oppositeRole().getType().getName() :
"java.util.List<" + oppositeRole().getType().getName() + ">"; "java.util.List<" + oppositeRole().getType().getName() + ">";
......
...@@ -159,8 +159,8 @@ protected void {{parentTypeName}}.{{writeMethodName}}({{#IndexBasedListAccess}}i ...@@ -159,8 +159,8 @@ protected void {{parentTypeName}}.{{writeMethodName}}({{#IndexBasedListAccess}}i
{{senderName}}.run({{#IndexBasedListAccess}}index, {{/IndexBasedListAccess}}token); {{senderName}}.run({{#IndexBasedListAccess}}index, {{/IndexBasedListAccess}}token);
} }
{{#needForwardingNTA}} {{#needForwarding}}
syn {{{forwardingNTA_Type}}} {{parentTypeName}}.{{forwardingNTA_Name}}({{#IndexBasedListAccess}}int index{{/IndexBasedListAccess}}) { syn {{{forwardingType}}} {{parentTypeName}}.{{forwardingName}}({{#IndexBasedListAccess}}int index{{/IndexBasedListAccess}}) {
{{#relationEndpointWithListRole}} {{#relationEndpointWithListRole}}
// for (var element : {{realGetterMethodCall}}) { // for (var element : {{realGetterMethodCall}}) {
// element.{{touchedTerminalsMethodName}}(); // element.{{touchedTerminalsMethodName}}();
...@@ -169,11 +169,11 @@ syn {{{forwardingNTA_Type}}} {{parentTypeName}}.{{forwardingNTA_Name}}({{#IndexB ...@@ -169,11 +169,11 @@ syn {{{forwardingNTA_Type}}} {{parentTypeName}}.{{forwardingNTA_Name}}({{#IndexB
return {{realGetterMethodCall}}; return {{realGetterMethodCall}};
{{/relationEndpointWithListRole}} {{/relationEndpointWithListRole}}
{{^relationEndpointWithListRole}} {{^relationEndpointWithListRole}}
{{{forwardingNTA_Type}}} result = {{realGetterMethodCall}}; {{{forwardingType}}} result = {{realGetterMethodCall}};
if (result == null) { if (result == null) {
return null; return null;
} }
return result.{{touchedTerminalsMethodName}}(); return result.{{touchedTerminalsMethodName}}();
{{/relationEndpointWithListRole}} {{/relationEndpointWithListRole}}
} }
{{/needForwardingNTA}} {{/needForwarding}}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment