Skip to content

Set init value for access modifiers in symbol builders correctly #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JohannesLeurs wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Set init value for access modifiers in symbol builders correctly #131

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion ...rc/main/java/de/monticore/codegen/cd2java/_symboltable/symbol/SymbolBuilderDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import de.monticore.codegen.cd2java._ast.builder.buildermethods.BuilderMutatorMethodDecorator;
import de.monticore.codegen.cd2java._symboltable.SymbolTableService;
import de.monticore.generating.templateengine.GlobalExtensionManagement;
import de.monticore.generating.templateengine.HookPoint;
import de.monticore.generating.templateengine.StringHookPoint;
import de.monticore.generating.templateengine.TemplateHookPoint;
import de.monticore.types.mcbasictypes._ast.ASTMCType;
Expand Down Expand Up @@ -74,6 +75,8 @@ public ASTCDClass decorate(final ASTCDClass symbolClass) {
ASTCDClass symbolBuilder = builderDecorator.decorate(decoratedSymbolClass);
builderDecorator.setPrintBuildMethodTemplate(true);

addAccessModifierDefaultValue(symbolBuilder);

if (hasInheritedSymbol) {
// set superclass
Map<ASTCDClass, String> values = symbolTableService.getInheritedSymbolPropertyClasses(Lists.newArrayList(symbolClass));
Expand Down Expand Up @@ -142,7 +145,6 @@ protected List<ASTCDAttribute> createSymbolAttributes(ASTCDClass symbolClass) {
attrs.add(this.getCDAttributeFacade().createAttribute(PROTECTED.build(), optionalTypeOfASTNode, AST_NODE_VAR));

ASTCDAttribute accessModifier = this.getCDAttributeFacade().createAttribute(PROTECTED.build(), ACCESS_MODIFIER, "accessModifier");
this.replaceTemplate(VALUE, accessModifier, new StringHookPoint("= " + ACCESS_MODIFIER_ALL_INCLUSION));
attrs.add(accessModifier);

attrs.add(this.getCDAttributeFacade().createAttribute(PROTECTED.build(),
Expand All @@ -151,6 +153,14 @@ protected List<ASTCDAttribute> createSymbolAttributes(ASTCDClass symbolClass) {
return attrs;
}

protected void addAccessModifierDefaultValue(ASTCDClass builder) {
HookPoint defaultVal = new StringHookPoint("= " + ACCESS_MODIFIER_ALL_INCLUSION);

builder.getCDAttributeList().stream()
.filter(a -> "accessModifier".equals(a.getName()))
.forEach(a -> this.replaceTemplate(VALUE, a, defaultVal));
}

protected List<ASTCDMethod> getMethodsForDefaultAttrs(List<ASTCDAttribute> defaultAttrs,
BuilderMutatorMethodDecorator builderMutatorMethodDecorator) {
return defaultAttrs.stream()
Expand Down
Loading