Commit 52f1dffe authored by Abdallah Atouani's avatar Abdallah Atouani
Browse files

remove minor errors

parent b3e98367
Pipeline #407097 passed with stage
in 3 minutes and 46 seconds
/**
* (c) https://github.com/MontiCore/monticore
*
* The license generally applicable for this project
* can be found under https://github.com/MontiCore/monticore.
*/
package de.monticore.lang.monticar.emadl.tagging.artifacttag;
import de.monticore.lang.tagging._symboltable.TagKind;
......@@ -11,19 +17,23 @@ public class DatasetArtifactSymbol extends TagSymbol {
super(KIND, ".");
}
public DatasetArtifactSymbol(String artifact, String jar, String id) {
this(KIND, artifact, jar, id);
public DatasetArtifactSymbol(String artifact, String jar, String type) {
this(KIND, artifact, jar, type);
}
public DatasetArtifactSymbol(DatasetArtifactKind kind, String artifact, String jar, String id) {
super(kind, artifact, jar, id);
public DatasetArtifactSymbol(DatasetArtifactKind kind, String artifact, String jar, String type) {
super(kind, artifact, jar, type);
}
public String getArtifact() {
return getValue(0);
}
public String getJar() {
return getValue(1);
}
public String getId() {
public String getType() {
return getValue(2);
}
......
/**
* (c) https://github.com/MontiCore/monticore
*
* The license generally applicable for this project
* can be found under https://github.com/MontiCore/monticore.
*/
package de.monticore.lang.monticar.emadl.tagging.artifacttag;
import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.EMAComponentSymbol;
......@@ -21,7 +27,7 @@ import java.util.regex.Pattern;
public class DatasetArtifactSymbolCreator implements TagSymbolCreator {
protected final String regexExpression = "\\s*\\{\\s*artifact\\s*=\\s*(.+):(.+):(.+)\\s*\\}\\s*";
protected final String regexExpression = "\\s*\\{\\s*artifact\\s*=\\s*(.+):(.+):(.+)\\s*,\\s*type\\s*=\\s*(.*)\\s*\\}\\s*";
protected final Pattern pattern = Pattern.compile(regexExpression, Pattern.MULTILINE);
@Override
......@@ -67,7 +73,7 @@ public class DatasetArtifactSymbolCreator implements TagSymbolCreator {
String artifact = String.format("%s%s%s%s%s", matcher.group(1).replace('.', File.separatorChar),
File.separator, matcher.group(2), File.separator, matcher.group(3));
String jar = String.format("%s-%s-dataset", matcher.group(2), matcher.group(3));
tagging.addTag(scope, new LayerArtifactParameterSymbol(artifact, jar, matcher.group(4))); }
tagging.addTag(scope, new DatasetArtifactSymbol(artifact, jar, matcher.group(4))); }
);
});
}
......
/**
* (c) https://github.com/MontiCore/monticore
*
* The license generally applicable for this project
* can be found under https://github.com/MontiCore/monticore.
*/
package de.monticore.lang.monticar.emadl.tagging.artifacttag;
import de.monticore.lang.tagging._symboltable.TaggingResolver;
......@@ -22,7 +28,7 @@ public class DatasetArtifactTagSchema {
resolver.addTagSymbolResolvingFilter(CommonResolvingFilter.create(DatasetArtifactSymbol.KIND));
}
protected void registerTagTypes(TaggingResolver resolver) {
public static void registerTagTypes(TaggingResolver resolver) {
getInstance().doRegisterTagTypes(resolver);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment