diff --git a/CHANGELOG.md b/CHANGELOG.md index b2cc76f7..d90841c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,10 +19,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), - Migration to MDSD Tools organization - Converted Maven Tycho-based build to pure Maven build - Unification and renaming of packages to: `tools.mdsd.jamopp` - - Renaming of meta-model namespace URI to: `https://mdsd.tools/jamopp/java` + - Renaming of meta-model namespace URI to: `https://mdsd.tools/jamopp/6.0.0/java` + - Versioned the meta-model - Upgraded dependency versions to: - Apache Commons Bytecode Engineering Library 6.7.0 - - Apache Log4j 2 2.20.0 including the Log4j 1.x bridge + - Apache Log4j 2 2.20.0 ### Deprecated diff --git a/jamopp.model.edit/.gitignore b/jamopp.model.edit/.gitignore index b22b19dd..3f397d57 100644 --- a/jamopp.model.edit/.gitignore +++ b/jamopp.model.edit/.gitignore @@ -1,2 +1,5 @@ /src/main/generated /src/main/resources +build.properties +plugin.properties +plugin.xml diff --git a/jamopp.model.edit/pom.xml b/jamopp.model.edit/pom.xml index 81ffc8f9..9f220679 100644 --- a/jamopp.model.edit/pom.xml +++ b/jamopp.model.edit/pom.xml @@ -97,6 +97,11 @@ bundle + + + ${project.groupId}.${project.artifactId};singleton:=true + + diff --git a/jamopp.model/.gitignore b/jamopp.model/.gitignore index 7c1731c2..42e2d2d8 100644 --- a/jamopp.model/.gitignore +++ b/jamopp.model/.gitignore @@ -1 +1,4 @@ /src/main/generated +build.properties +plugin.properties +plugin.xml diff --git a/jamopp.model/pom.xml b/jamopp.model/pom.xml index 1bb39ceb..0544efd8 100644 --- a/jamopp.model/pom.xml +++ b/jamopp.model/pom.xml @@ -64,6 +64,11 @@ bundle + + + ${project.groupId}.${project.artifactId};singleton:=true + + diff --git a/jamopp.model/src/main/java/tools/mdsd/jamopp/model/java/JavaPackage.java b/jamopp.model/src/main/java/tools/mdsd/jamopp/model/java/JavaPackage.java index 4ae4e64b..59c18049 100644 --- a/jamopp.model/src/main/java/tools/mdsd/jamopp/model/java/JavaPackage.java +++ b/jamopp.model/src/main/java/tools/mdsd/jamopp/model/java/JavaPackage.java @@ -47,7 +47,7 @@ public interface JavaPackage extends EPackage { * * @generated */ - String eNS_URI = "http://www.emftext.org/java"; + String eNS_URI = "https://mdsd.tools/jamopp/6.0.0/java"; /** * The package namespace name. diff --git a/jamopp.model/src/main/resources/metamodel/java.ecore b/jamopp.model/src/main/resources/metamodel/java.ecore index db37fcb6..a2939a36 100644 --- a/jamopp.model/src/main/resources/metamodel/java.ecore +++ b/jamopp.model/src/main/resources/metamodel/java.ecore @@ -1,8 +1,8 @@ - - + @@ -83,7 +84,7 @@ containment="true"/> - @@ -241,7 +242,8 @@ - + @@ -437,7 +439,7 @@ upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - @@ -525,7 +527,7 @@ - @@ -797,7 +799,8 @@ - + @@ -865,7 +868,8 @@ - + @@ -904,7 +908,7 @@ upperBound="-1" eType="#//references/ReferenceableElement"/> - - @@ -1004,7 +1008,8 @@ - + - @@ -1294,7 +1299,7 @@ eSuperTypes="#//commons/Commentable"/> - - @@ -1362,7 +1367,7 @@ eType="#//literals/This" containment="true"/> - @@ -1433,7 +1438,7 @@ - @@ -1612,7 +1617,7 @@ upperBound="-1" eType="#_Wo2YDNz1Ed2bJ_pQViWxFg" containment="true"/> - @@ -1739,7 +1744,7 @@ - @@ -1767,7 +1772,8 @@ - + @@ -1792,7 +1798,8 @@ - + diff --git a/jamopp.model/src/main/resources/metamodel/java.genmodel b/jamopp.model/src/main/resources/metamodel/java.genmodel index 99be1666..f18643c7 100644 --- a/jamopp.model/src/main/resources/metamodel/java.genmodel +++ b/jamopp.model/src/main/resources/metamodel/java.genmodel @@ -40,7 +40,7 @@ + body="return tools.mdsd.jamopp.model.java.extensions.arrays.ArrayTypeableExtension.getArrayDimension((tools.mdsd.jamopp.model.java.arrays.ArrayTypeable) this);"/> @@ -51,7 +51,7 @@ + body="return tools.mdsd.jamopp.model.java.extensions.expressions.ExpressionExtension.getArrayDimension((tools.mdsd.jamopp.model.java.expressions.Expression) this);"/> @@ -59,7 +59,7 @@ + body="return tools.mdsd.jamopp.model.java.extensions.expressions.ExpressionExtension.getArrayDimension((tools.mdsd.jamopp.model.java.expressions.Expression) this);"/> @@ -69,32 +69,32 @@ disposableProviderFactory="true" ecorePackage="java.ecore#//classifiers"> + body="return tools.mdsd.jamopp.model.java.extensions.classifiers.ClassifierExtension.getAllSuperClassifiers((tools.mdsd.jamopp.model.java.classifiers.Classifier) this);"/> + body="tools.mdsd.jamopp.model.java.extensions.classifiers.ClassifierExtension.addImport((tools.mdsd.jamopp.model.java.classifiers.Classifier) this, nameOfClassToImport);"> + body="tools.mdsd.jamopp.model.java.extensions.classifiers.ClassifierExtension.addPackageImport((tools.mdsd.jamopp.model.java.classifiers.Classifier) this, packageName);"> + body="return tools.mdsd.jamopp.model.java.extensions.classifiers.ConcreteClassifierExtension.getInnerClassifiers((tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.classifiers.ConcreteClassifierExtension.getAllInnerClassifiers((tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.classifiers.ConcreteClassifierExtension.getSuperTypeReferences((tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.classifiers.ConcreteClassifierExtension.getAllMembers((tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier) this, (tools.mdsd.jamopp.model.java.commons.Commentable) context);"> + body="return tools.mdsd.jamopp.model.java.extensions.classifiers.ConcreteClassifierExtension.getQualifiedName((tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.classifiers.ConcreteClassifierExtension.isJavaLangObject((tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier) clazz);"> @@ -105,40 +105,40 @@ + body="return tools.mdsd.jamopp.model.java.extensions.classifiers.ClassExtension.getAllSuperClassifiers((tools.mdsd.jamopp.model.java.classifiers.Class) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.classifiers.ClassExtension.getSuperClass((tools.mdsd.jamopp.model.java.classifiers.Class) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.classifiers.ClassExtension.unWrapPrimitiveType((tools.mdsd.jamopp.model.java.classifiers.Class) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.classifiers.InterfaceExtension.getAllSuperClassifiers((tools.mdsd.jamopp.model.java.classifiers.Interface) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.classifiers.InterfaceExtension.getAbstractMethodOfFunctionalInterface((tools.mdsd.jamopp.model.java.classifiers.Interface) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.classifiers.EnumerationExtension.getAllSuperClassifiers((tools.mdsd.jamopp.model.java.classifiers.Enumeration) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.classifiers.EnumerationExtension.getContainedConstant((tools.mdsd.jamopp.model.java.classifiers.Enumeration) this, name);"> + body="return tools.mdsd.jamopp.model.java.extensions.classifiers.AnnotationExtension.getAllSuperClassifiers((tools.mdsd.jamopp.model.java.classifiers.Annotation) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.classifiers.AnonymousClassExtension.getAllSuperClassifiers((tools.mdsd.jamopp.model.java.classifiers.AnonymousClass) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.classifiers.AnonymousClassExtension.getSuperClassifier((tools.mdsd.jamopp.model.java.classifiers.AnonymousClass) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.classifiers.AnonymousClassExtension.getAllMembers((tools.mdsd.jamopp.model.java.classifiers.AnonymousClass) this, (tools.mdsd.jamopp.model.java.commons.Commentable) context);"> @@ -148,77 +148,77 @@ + body="return tools.mdsd.jamopp.model.java.extensions.commons.CommentableExtension.getConcreteClassifier((tools.mdsd.jamopp.model.java.commons.Commentable) this, name);"> + body="return tools.mdsd.jamopp.model.java.extensions.commons.CommentableExtension.getConcreteClassifiers((tools.mdsd.jamopp.model.java.commons.Commentable) this, packageName, classifierQuery);"> + body="return tools.mdsd.jamopp.model.java.extensions.commons.CommentableExtension.getLibClass((tools.mdsd.jamopp.model.java.commons.Commentable) this, name);"> + body="return tools.mdsd.jamopp.model.java.extensions.commons.CommentableExtension.getLibInterface((tools.mdsd.jamopp.model.java.commons.Commentable) this, name);"> + body="return tools.mdsd.jamopp.model.java.extensions.commons.CommentableExtension.getClassClass((tools.mdsd.jamopp.model.java.commons.Commentable) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.commons.CommentableExtension.getObjectClass((tools.mdsd.jamopp.model.java.commons.Commentable) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.commons.CommentableExtension.getStringClass((tools.mdsd.jamopp.model.java.commons.Commentable) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.commons.CommentableExtension.getAnnotationInterface((tools.mdsd.jamopp.model.java.commons.Commentable) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.commons.CommentableExtension.getContainingAnnotationInstance((tools.mdsd.jamopp.model.java.commons.Commentable) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.commons.CommentableExtension.getContainingAnonymousClass((tools.mdsd.jamopp.model.java.commons.Commentable) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.commons.CommentableExtension.getContainingConcreteClassifier((tools.mdsd.jamopp.model.java.commons.Commentable) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.commons.CommentableExtension.getContainingCompilationUnit((tools.mdsd.jamopp.model.java.commons.Commentable) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.commons.CommentableExtension.getContainingPackageName((tools.mdsd.jamopp.model.java.commons.Commentable) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.commons.CommentableExtension.getContainingContainerName((tools.mdsd.jamopp.model.java.commons.Commentable) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.commons.CommentableExtension.getParentConcreteClassifier((tools.mdsd.jamopp.model.java.commons.Commentable) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.commons.CommentableExtension.getParentByEType((tools.mdsd.jamopp.model.java.commons.Commentable) this, (org.eclipse.emf.ecore.EClass) type);"> + body="return tools.mdsd.jamopp.model.java.extensions.commons.CommentableExtension.getFirstChildByEType((tools.mdsd.jamopp.model.java.commons.Commentable) this, (org.eclipse.emf.ecore.EClass) type);"> + body="return tools.mdsd.jamopp.model.java.extensions.commons.CommentableExtension.getParentByType((tools.mdsd.jamopp.model.java.commons.Commentable) this, type);"> + body="return tools.mdsd.jamopp.model.java.extensions.commons.CommentableExtension.getFirstChildByType((tools.mdsd.jamopp.model.java.commons.Commentable) this, ( java.lang.Class<T>) type);"> + body="return tools.mdsd.jamopp.model.java.extensions.commons.CommentableExtension.getChildrenByEType((tools.mdsd.jamopp.model.java.commons.Commentable) this, (org.eclipse.emf.ecore.EClass) type);"> + body="return tools.mdsd.jamopp.model.java.extensions.commons.CommentableExtension.getChildrenByType((tools.mdsd.jamopp.model.java.commons.Commentable) this, ( java.lang.Class<T>) type);"> + body="tools.mdsd.jamopp.model.java.extensions.commons.CommentableExtension.addBeforeContainingStatement((tools.mdsd.jamopp.model.java.commons.Commentable) this, (tools.mdsd.jamopp.model.java.statements.Statement) statementToAdd);"> + body="tools.mdsd.jamopp.model.java.extensions.commons.CommentableExtension.addAfterContainingStatement((tools.mdsd.jamopp.model.java.commons.Commentable) this, (tools.mdsd.jamopp.model.java.statements.Statement) statementToAdd);"> @@ -228,9 +228,9 @@ + body="return tools.mdsd.jamopp.model.java.extensions.commons.NamespaceAwareElementExtension.getNamespacesAsString((tools.mdsd.jamopp.model.java.commons.NamespaceAwareElement) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.commons.NamespaceAwareElementExtension.getClassifierAtNamespaces((tools.mdsd.jamopp.model.java.commons.NamespaceAwareElement) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.containers.JavaRootExtension.getClassifiersInSamePackage((tools.mdsd.jamopp.model.java.containers.JavaRoot) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.containers.CompilationUnitExtension.getContainedClassifier((tools.mdsd.jamopp.model.java.containers.CompilationUnit) this, name);"> + body="return tools.mdsd.jamopp.model.java.extensions.containers.CompilationUnitExtension.getClassifiersInSamePackage((tools.mdsd.jamopp.model.java.containers.CompilationUnit) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.containers.CompilationUnitExtension.getContainedClass((tools.mdsd.jamopp.model.java.containers.CompilationUnit) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.containers.CompilationUnitExtension.getContainedInterface((tools.mdsd.jamopp.model.java.containers.CompilationUnit) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.containers.CompilationUnitExtension.getContainedAnnotation((tools.mdsd.jamopp.model.java.containers.CompilationUnit) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.containers.CompilationUnitExtension.getContainedEnumeration((tools.mdsd.jamopp.model.java.containers.CompilationUnit) this);"/> + body="tools.mdsd.jamopp.model.java.extensions.containers.CompilationUnitExtension.addImport((tools.mdsd.jamopp.model.java.containers.CompilationUnit) this, nameOfClassToImport);"> + body="tools.mdsd.jamopp.model.java.extensions.containers.CompilationUnitExtension.addPackageImport((tools.mdsd.jamopp.model.java.containers.CompilationUnit) this, packageName);"> @@ -290,17 +290,17 @@ + body="return tools.mdsd.jamopp.model.java.extensions.expressions.ExpressionExtension.getType((tools.mdsd.jamopp.model.java.expressions.Expression) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.expressions.ExpressionExtension.getAlternativeType((tools.mdsd.jamopp.model.java.expressions.Expression) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.expressions.ExpressionExtension.getOneType((tools.mdsd.jamopp.model.java.expressions.Expression) this, alternative);"> + body="return tools.mdsd.jamopp.model.java.extensions.expressions.ExpressionExtension.getArrayDimension((tools.mdsd.jamopp.model.java.expressions.Expression) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.expressions.ExpressionExtension.getOneTypeReference((tools.mdsd.jamopp.model.java.expressions.Expression) this, alternative);"> @@ -315,9 +315,9 @@ + body="return tools.mdsd.jamopp.model.java.extensions.expressions.ConditionalExpressionExtension.getExpressionElse((tools.mdsd.jamopp.model.java.expressions.ConditionalExpression) this);"/> + body="tools.mdsd.jamopp.model.java.extensions.expressions.ConditionalExpressionExtension.setExpressionElse((tools.mdsd.jamopp.model.java.expressions.ConditionalExpression) this, newChild);"> @@ -387,9 +387,9 @@ + body="return tools.mdsd.jamopp.model.java.extensions.expressions.CastExpressionExtension.getChild((tools.mdsd.jamopp.model.java.expressions.CastExpression) this);"/> + body="tools.mdsd.jamopp.model.java.extensions.expressions.CastExpressionExtension.setChild((tools.mdsd.jamopp.model.java.expressions.CastExpression) this, newChild);"> @@ -399,9 +399,9 @@ + body="return tools.mdsd.jamopp.model.java.extensions.expressions.MethodReferenceExpressionExtension.getTargetType((MethodReferenceExpression) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.expressions.MethodReferenceExpressionExtension.getTargetTypeReference((MethodReferenceExpression) this);"/> @@ -414,11 +414,11 @@ + body="return tools.mdsd.jamopp.model.java.extensions.expressions.LambdaExpressionExtension.doesLambdaMatchFunctionalInterface((tools.mdsd.jamopp.model.java.expressions.LambdaExpression) this, functionalInterface);"> + body="return tools.mdsd.jamopp.model.java.extensions.expressions.LambdaExpressionExtension.getReturnType((tools.mdsd.jamopp.model.java.expressions.LambdaExpression) this, potentialReturnType);"> @@ -443,7 +443,7 @@ + body="return tools.mdsd.jamopp.model.java.extensions.generics.ExtendsTypeArgumentExtension.getExtendTypes((tools.mdsd.jamopp.model.java.generics.ExtendsTypeArgument) this);"/> @@ -452,18 +452,18 @@ + body="return tools.mdsd.jamopp.model.java.extensions.generics.TypeParameterExtension.getAllSuperClassifiers((tools.mdsd.jamopp.model.java.generics.TypeParameter) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.generics.TypeParameterExtension.getAllMembers((tools.mdsd.jamopp.model.java.generics.TypeParameter) this, (tools.mdsd.jamopp.model.java.commons.Commentable) context);"> + body="return tools.mdsd.jamopp.model.java.extensions.generics.TypeParameterExtension.getBoundType((tools.mdsd.jamopp.model.java.generics.TypeParameter) this, (tools.mdsd.jamopp.model.java.types.TypeReference) typeReference, (tools.mdsd.jamopp.model.java.references.Reference) reference);"> + body="return tools.mdsd.jamopp.model.java.extensions.generics.TypeParameterExtension.getBoundTypeReference((tools.mdsd.jamopp.model.java.generics.TypeParameter) this, (tools.mdsd.jamopp.model.java.types.TypeReference) typeReference, (tools.mdsd.jamopp.model.java.references.Reference) reference);"> @@ -476,13 +476,13 @@ + body="return tools.mdsd.jamopp.model.java.extensions.imports.ImportExtension.getImportedClassifier((tools.mdsd.jamopp.model.java.imports.Import) this, name);"> + body="return tools.mdsd.jamopp.model.java.extensions.imports.ImportExtension.getImportedClassifiers((tools.mdsd.jamopp.model.java.imports.Import) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.imports.ImportExtension.getImportedMembers((tools.mdsd.jamopp.model.java.imports.Import) this);"/> @@ -515,7 +515,7 @@ - + @@ -580,43 +580,43 @@ + body="return tools.mdsd.jamopp.model.java.extensions.members.MemberContainerExtension.getContainedClassifier((tools.mdsd.jamopp.model.java.members.MemberContainer) this, name);"> + body="return tools.mdsd.jamopp.model.java.extensions.members.MemberContainerExtension.getContainedField((tools.mdsd.jamopp.model.java.members.MemberContainer) this, name);"> + body="return tools.mdsd.jamopp.model.java.extensions.members.MemberContainerExtension.getContainedMethod((tools.mdsd.jamopp.model.java.members.MemberContainer) this, name);"> + body="return tools.mdsd.jamopp.model.java.extensions.members.MemberContainerExtension.getMethods((tools.mdsd.jamopp.model.java.members.MemberContainer) this);"/> + body="tools.mdsd.jamopp.model.java.extensions.members.MemberContainerExtension.removeMethods((tools.mdsd.jamopp.model.java.members.MemberContainer) this, name);"> + body="return tools.mdsd.jamopp.model.java.extensions.members.MemberContainerExtension.getMembersByName((tools.mdsd.jamopp.model.java.members.MemberContainer) this, name);"> + body="return tools.mdsd.jamopp.model.java.extensions.members.MemberContainerExtension.createField((tools.mdsd.jamopp.model.java.members.MemberContainer) this, name, qualifiedTypeName);"> + body="return tools.mdsd.jamopp.model.java.extensions.members.MemberContainerExtension.getFields((tools.mdsd.jamopp.model.java.members.MemberContainer) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.members.MemberContainerExtension.getConstructors((tools.mdsd.jamopp.model.java.members.MemberContainer) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.members.ConstructorExtension.getStatements((tools.mdsd.jamopp.model.java.members.Constructor) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.members.ConstructorExtension.isConstructorForCall((Constructor) this, call, needsPerfectMatch);"> @@ -627,24 +627,24 @@ + body="return tools.mdsd.jamopp.model.java.extensions.members.MethodExtension.isMethodForCall((tools.mdsd.jamopp.model.java.members.Method) this, (tools.mdsd.jamopp.model.java.references.MethodCall) methodCall, needsPerfectMatch);"> + body="return tools.mdsd.jamopp.model.java.extensions.members.MethodExtension.isSomeMethodForCall((tools.mdsd.jamopp.model.java.members.Method) this, (tools.mdsd.jamopp.model.java.references.MethodCall) methodCall);"> + body="return tools.mdsd.jamopp.model.java.extensions.members.MethodExtension.isBetterMethodForCall((tools.mdsd.jamopp.model.java.members.Method) this, (tools.mdsd.jamopp.model.java.members.Method) otherMethod, (tools.mdsd.jamopp.model.java.references.MethodCall) methodCall);"> - + + body="return tools.mdsd.jamopp.model.java.extensions.members.MethodExtension.getStatements((tools.mdsd.jamopp.model.java.members.Method) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.members.MethodExtension.isSignatureMatching((tools.mdsd.jamopp.model.java.members.Method) this, otherMethod);"> @@ -664,41 +664,41 @@ + body="return tools.mdsd.jamopp.model.java.extensions.modifiers.AnnotableAndModifiableExtension.isHidden((tools.mdsd.jamopp.model.java.modifiers.AnnotableAndModifiable) this, (tools.mdsd.jamopp.model.java.commons.Commentable) context);"> + body="return tools.mdsd.jamopp.model.java.extensions.modifiers.AnnotableAndModifiableExtension.isStatic((tools.mdsd.jamopp.model.java.modifiers.AnnotableAndModifiable) this);"/> + body="tools.mdsd.jamopp.model.java.extensions.modifiers.AnnotableAndModifiableExtension.removeModifier((tools.mdsd.jamopp.model.java.modifiers.AnnotableAndModifiable) this, modifierType);"> + body="tools.mdsd.jamopp.model.java.extensions.modifiers.AnnotableAndModifiableExtension.makePublic((tools.mdsd.jamopp.model.java.modifiers.AnnotableAndModifiable) this);"/> + body="tools.mdsd.jamopp.model.java.extensions.modifiers.AnnotableAndModifiableExtension.makePrivate((tools.mdsd.jamopp.model.java.modifiers.AnnotableAndModifiable) this);"/> + body="tools.mdsd.jamopp.model.java.extensions.modifiers.AnnotableAndModifiableExtension.makeProtected((tools.mdsd.jamopp.model.java.modifiers.AnnotableAndModifiable) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.modifiers.AnnotableAndModifiableExtension.getModifiers((tools.mdsd.jamopp.model.java.modifiers.AnnotableAndModifiable) this);"/> + body="tools.mdsd.jamopp.model.java.extensions.modifiers.AnnotableAndModifiableExtension.removeAllModifiers((tools.mdsd.jamopp.model.java.modifiers.AnnotableAndModifiable) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.modifiers.AnnotableAndModifiableExtension.hasModifier((tools.mdsd.jamopp.model.java.modifiers.AnnotableAndModifiable) this, type);"> + body="return tools.mdsd.jamopp.model.java.extensions.modifiers.AnnotableAndModifiableExtension.isPublic((tools.mdsd.jamopp.model.java.modifiers.AnnotableAndModifiable) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.modifiers.AnnotableAndModifiableExtension.isPrivate((tools.mdsd.jamopp.model.java.modifiers.AnnotableAndModifiable) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.modifiers.AnnotableAndModifiableExtension.isProtected((tools.mdsd.jamopp.model.java.modifiers.AnnotableAndModifiable) this);"/> + body="tools.mdsd.jamopp.model.java.extensions.modifiers.AnnotableAndModifiableExtension.addModifier((tools.mdsd.jamopp.model.java.modifiers.AnnotableAndModifiable) this, (tools.mdsd.jamopp.model.java.modifiers.Modifier) newModifier);"> + body="return tools.mdsd.jamopp.model.java.extensions.modifiers.AnnotableAndModifiableExtension.getAnnotationInstances((tools.mdsd.jamopp.model.java.modifiers.AnnotableAndModifiable) this);"/> @@ -783,16 +783,16 @@ + body="return tools.mdsd.jamopp.model.java.extensions.references.ReferenceExtension.getReferencedType((tools.mdsd.jamopp.model.java.references.Reference) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.references.ReferenceExtension.getPrevious((tools.mdsd.jamopp.model.java.references.Reference) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.references.ReferenceExtension.getReferencedTypeReference((tools.mdsd.jamopp.model.java.references.Reference) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.references.ArgumentableExtension.getArgumentTypes((tools.mdsd.jamopp.model.java.references.Argumentable) this);"/> @@ -802,7 +802,7 @@ + body="return tools.mdsd.jamopp.model.java.extensions.expressions.ExpressionExtension.getArrayDimension((tools.mdsd.jamopp.model.java.expressions.Expression) this);"/> @@ -827,7 +827,7 @@ + body="return tools.mdsd.jamopp.model.java.extensions.statements.StatementListContainerExtension.getLocalVariable((tools.mdsd.jamopp.model.java.statements.StatementListContainer) this, name);"> @@ -850,7 +850,7 @@ + body="return tools.mdsd.jamopp.model.java.extensions.statements.CatchBlockExtension.getStatements((tools.mdsd.jamopp.model.java.statements.CatchBlock) this);"/> @@ -891,7 +891,7 @@ + body="return tools.mdsd.jamopp.model.java.extensions.statements.SynchronizedBlockExtension.getStatements((tools.mdsd.jamopp.model.java.statements.SynchronizedBlock) this);"/> @@ -901,9 +901,9 @@ + body="return tools.mdsd.jamopp.model.java.extensions.statements.TryBlockExtension.getCatcheBlocks((tools.mdsd.jamopp.model.java.statements.TryBlock) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.statements.TryBlockExtension.getStatements((tools.mdsd.jamopp.model.java.statements.TryBlock) this);"/> @@ -921,12 +921,12 @@ - + - + @@ -943,19 +943,19 @@ + body="return tools.mdsd.jamopp.model.java.extensions.types.TypeReferenceExtension.getBoundTarget((tools.mdsd.jamopp.model.java.types.TypeReference) this, null);"/> + body="tools.mdsd.jamopp.model.java.extensions.types.TypeReferenceExtension.setTarget((tools.mdsd.jamopp.model.java.types.TypeReference) this, (tools.mdsd.jamopp.model.java.classifiers.Classifier) type);"> + body="return tools.mdsd.jamopp.model.java.extensions.types.TypeReferenceExtension.getBoundTarget((tools.mdsd.jamopp.model.java.types.TypeReference) this, (tools.mdsd.jamopp.model.java.references.Reference) reference);"> + body="return tools.mdsd.jamopp.model.java.extensions.types.TypeReferenceExtension.getPureClassifierReference((tools.mdsd.jamopp.model.java.types.TypeReference) this);"/> + body="return tools.mdsd.jamopp.model.java.extensions.types.TypeReferenceExtension.getBoundTargetReference((tools.mdsd.jamopp.model.java.types.TypeReference) this, reference);"> @@ -968,11 +968,11 @@ + body="return tools.mdsd.jamopp.model.java.extensions.types.PrimitiveTypeExtension.getAllMembers((tools.mdsd.jamopp.model.java.types.PrimitiveType) this, (tools.mdsd.jamopp.model.java.commons.Commentable) context);"> + body="return tools.mdsd.jamopp.model.java.extensions.types.PrimitiveTypeExtension.wrapPrimitiveType((tools.mdsd.jamopp.model.java.types.PrimitiveType) this);"/> @@ -985,7 +985,7 @@ + body="return tools.mdsd.jamopp.model.java.extensions.types.InferableTypeExtension.getBoundTargetReference((tools.mdsd.jamopp.model.java.types.InferableType) this, reference);"> @@ -994,12 +994,12 @@ disposableProviderFactory="true" ecorePackage="java.ecore#//variables"> + body="return tools.mdsd.jamopp.model.java.extensions.variables.VariableExtension.createMethodCallStatement((tools.mdsd.jamopp.model.java.variables.Variable) this, methodName, arguments);"> + body="return tools.mdsd.jamopp.model.java.extensions.variables.VariableExtension.createMethodCall((tools.mdsd.jamopp.model.java.variables.Variable) this, methodName, arguments);"> diff --git a/jamopp.model/src/main/resources/plugin.properties b/jamopp.model/src/main/resources/plugin.properties index b9f14fe8..26ee9735 100644 --- a/jamopp.model/src/main/resources/plugin.properties +++ b/jamopp.model/src/main/resources/plugin.properties @@ -1,3 +1,6 @@ +# Copyright (c) 2020-2023 +# Modelling for Continuous Software Engineering (MCSE) group, Institute of Information Security and Dependability (KASTEL), Karlsruhe Institute of Technology (KIT). +# # Copyright (c) 2006-2014 # Software Technology Group, Dresden University of Technology # DevBoost GmbH, Berlin, Amtsgericht Charlottenburg, HRB 140026 @@ -11,9 +14,9 @@ # Software Technology Group - TU Dresden, Germany; # DevBoost GmbH - Berlin, Germany # - initial API and implementation -# Martin Armbruster -# - Extension for Java 7-13 +# Martin Armbruster (MCSE, KASTEL, KIT) +# - Adaptation and extension for Java 7+ # -pluginName = JaMoPP (Java Model Parser and Printer) Metamodel -providerName = Martin Armbruster +pluginName = Java Model +providerName = www.example.org diff --git a/jamopp.model/src/main/resources/plugin.xml b/jamopp.model/src/main/resources/plugin.xml index 85c50815..f6da4abe 100644 --- a/jamopp.model/src/main/resources/plugin.xml +++ b/jamopp.model/src/main/resources/plugin.xml @@ -2,7 +2,10 @@ - + + + - + + + + + + + + + + + + + + + + + + + diff --git a/jamopp.p2/pom.xml b/jamopp.p2/pom.xml index 44d66ed0..9d25df31 100644 --- a/jamopp.p2/pom.xml +++ b/jamopp.p2/pom.xml @@ -33,11 +33,43 @@ tools.mdsd:jamopp.model:6.0.0-SNAPSHOT + false + + tools.mdsd:jamopp.model.edit:6.0.0-SNAPSHOT + false + + tools.mdsd:jamopp.parser.jdt.singlefile:6.0.0-SNAPSHOT + false + + tools.mdsd:jamopp.resource:6.0.0-SNAPSHOT + false + + tools.mdsd:jamopp.parser.jdt:6.0.0-SNAPSHOT + false + + + tools.mdsd:jamopp.parser.bcel:6.0.0-SNAPSHOT + false + + tools.mdsd:jamopp.standalone:6.0.0-SNAPSHOT + false + + + org.apache.logging.log4j:log4j-api:2.20.0 + false + + + org.apache.bcel:bcel:6.7.0 + false + + + org.apache.commons:commons-lang3:3.12.0 + false diff --git a/jamopp.parser.jdt.singlefile/pom.xml b/jamopp.parser.jdt.singlefile/pom.xml index 2f4d3f0a..db7059fe 100644 --- a/jamopp.parser.jdt.singlefile/pom.xml +++ b/jamopp.parser.jdt.singlefile/pom.xml @@ -55,17 +55,9 @@ jamopp.resolution 6.0.0-SNAPSHOT - - org.apache.logging.log4j - log4j-1.2-api - org.apache.logging.log4j log4j-api - - org.apache.logging.log4j - log4j-core - - + diff --git a/jamopp.parser.jdt.singlefile/src/main/java/tools/mdsd/jamopp/parser/jdt/singlefile/JaMoPPJDTSingleFileParser.java b/jamopp.parser.jdt.singlefile/src/main/java/tools/mdsd/jamopp/parser/jdt/singlefile/JaMoPPJDTSingleFileParser.java index 99e446d9..c9f890d1 100644 --- a/jamopp.parser.jdt.singlefile/src/main/java/tools/mdsd/jamopp/parser/jdt/singlefile/JaMoPPJDTSingleFileParser.java +++ b/jamopp.parser.jdt.singlefile/src/main/java/tools/mdsd/jamopp/parser/jdt/singlefile/JaMoPPJDTSingleFileParser.java @@ -27,7 +27,8 @@ import java.util.List; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; @@ -51,7 +52,7 @@ import tools.mdsd.jamopp.resolution.resolver.CentralReferenceResolver; public class JaMoPPJDTSingleFileParser implements JaMoPPParserAPI { - private static final Logger logger = Logger.getLogger("jamopp." + private static final Logger logger = LogManager.getLogger("jamopp." + JaMoPPJDTSingleFileParser.class.getSimpleName()); private final String DEFAULT_ENCODING = StandardCharsets.UTF_8.toString(); private ResourceSet resourceSet; diff --git a/jamopp.resource/pom.xml b/jamopp.resource/pom.xml index 9fdf134e..c132e9cf 100644 --- a/jamopp.resource/pom.xml +++ b/jamopp.resource/pom.xml @@ -61,17 +61,9 @@ jamopp.parser.jdt.singlefile 6.0.0-SNAPSHOT - - org.apache.logging.log4j - log4j-1.2-api - org.apache.logging.log4j log4j-api - - org.apache.logging.log4j - log4j-core - diff --git a/jamopp.resource/src/main/java/tools/mdsd/jamopp/resource/JavaResource2.java b/jamopp.resource/src/main/java/tools/mdsd/jamopp/resource/JavaResource2.java index d7aa0fd1..3915aba7 100644 --- a/jamopp.resource/src/main/java/tools/mdsd/jamopp/resource/JavaResource2.java +++ b/jamopp.resource/src/main/java/tools/mdsd/jamopp/resource/JavaResource2.java @@ -20,7 +20,8 @@ import java.util.List; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; @@ -48,7 +49,7 @@ public class JavaResource2 extends XMIResourceImpl { public static final String JAVAXMI_FILE_EXTENSION = LogicalJavaURIGenerator.JAVAXMI_FILE_EXTENSION_NAME; - private static final Logger LOGGER = Logger.getLogger("jamopp." + JavaResource2.class.getSimpleName()); + private static final Logger LOGGER = LogManager.getLogger("jamopp." + JavaResource2.class.getSimpleName()); private Map internalURIFragmentMap = IJavaContextDependentURIFragmentCollector.GLOBAL_INSTANCE .getContextDependentURIFragmentMap(); diff --git a/jamopp.tests/pom.xml b/jamopp.tests/pom.xml index cabee3e2..5610d278 100644 --- a/jamopp.tests/pom.xml +++ b/jamopp.tests/pom.xml @@ -103,18 +103,10 @@ jamopp.resource 6.0.0-SNAPSHOT - - org.apache.logging.log4j - log4j-1.2-api - org.apache.logging.log4j log4j-api - - org.apache.logging.log4j - log4j-core - org.junit.jupiter junit-jupiter diff --git a/jamopp.tests/src/test/java/tools/mdsd/jamopp/test/AbstractJaMoPPTests.java b/jamopp.tests/src/test/java/tools/mdsd/jamopp/test/AbstractJaMoPPTests.java index a5c22e17..0edb48d5 100644 --- a/jamopp.tests/src/test/java/tools/mdsd/jamopp/test/AbstractJaMoPPTests.java +++ b/jamopp.tests/src/test/java/tools/mdsd/jamopp/test/AbstractJaMoPPTests.java @@ -46,10 +46,10 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import org.apache.log4j.ConsoleAppender; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; -import org.apache.log4j.PatternLayout; +//import org.apache.log4j.ConsoleAppender; +//import org.apache.log4j.Level; +//import org.apache.log4j.Logger; +//import org.apache.log4j.PatternLayout; import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.common.util.BasicEList; import org.eclipse.emf.common.util.EList; @@ -102,8 +102,8 @@ public abstract class AbstractJaMoPPTests { @BeforeAll public static void initLogging() { - Logger logger = Logger.getLogger("jamopp"); - logger.setLevel(Level.ALL); +// Logger logger = Logger.getLogger("jamopp"); +// logger.setLevel(Level.ALL); // ConsoleAppender ca = new ConsoleAppender(new PatternLayout("[%d{DATE}] %-5p: %c - %m%n"), // ConsoleAppender.SYSTEM_OUT); // logger.addAppender(ca); diff --git a/jamopp.tests/src/test/java/tools/mdsd/jamopp/test/bulk/SingleFileParserBulkTests.java b/jamopp.tests/src/test/java/tools/mdsd/jamopp/test/bulk/SingleFileParserBulkTests.java index e018ac2e..0e5c8eb6 100644 --- a/jamopp.tests/src/test/java/tools/mdsd/jamopp/test/bulk/SingleFileParserBulkTests.java +++ b/jamopp.tests/src/test/java/tools/mdsd/jamopp/test/bulk/SingleFileParserBulkTests.java @@ -36,7 +36,8 @@ import org.apache.commons.compress.archivers.ArchiveException; import org.apache.commons.compress.archivers.ArchiveStreamFactory; import org.apache.commons.compress.archivers.examples.Expander; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.junit.jupiter.api.Disabled; @@ -48,7 +49,7 @@ @Disabled("Requires initialization of all submodules and dependency resolution.") public class SingleFileParserBulkTests extends AbstractJaMoPPTests { - private static final Logger LOGGER = Logger.getLogger("jamopp." + private static final Logger LOGGER = LogManager.getLogger("jamopp." + SingleFileParserBulkTests.class.getSimpleName()); // TODO: Adjust path. private static final String BASE_ZIP = "JaMoPP-BulkTest" + File.separator + "Tests" + File.separator diff --git a/jamopp.tests/src/test/java/tools/mdsd/jamopp/test/performance/PerformanceTest.java b/jamopp.tests/src/test/java/tools/mdsd/jamopp/test/performance/PerformanceTest.java index e73bd403..62806485 100644 --- a/jamopp.tests/src/test/java/tools/mdsd/jamopp/test/performance/PerformanceTest.java +++ b/jamopp.tests/src/test/java/tools/mdsd/jamopp/test/performance/PerformanceTest.java @@ -22,7 +22,8 @@ import java.nio.file.Paths; import java.util.HashSet; import java.util.Set; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.util.EcoreUtil; @@ -40,7 +41,7 @@ */ @Disabled public class PerformanceTest extends AbstractJaMoPPTests { - private static final Logger LOGGER = Logger.getLogger("jamopp." + private static final Logger LOGGER = LogManager.getLogger("jamopp." + SingleFileParserBulkTests.class.getSimpleName()); private final String inputFolder = "target" + File.separator + "src-bulk" + File.separator + "TeaStore"; private final Path parentOutput = Paths.get("output_performance"); diff --git a/pom.xml b/pom.xml index c16afa35..9fcc55a0 100644 --- a/pom.xml +++ b/pom.xml @@ -48,30 +48,35 @@ org.eclipse.core.resources 3.18.0 + + org.eclipse.emf + org.eclipse.emf.common + 2.26.0 + org.eclipse.emf org.eclipse.emf.ecore - 2.33.0 + 2.26.0 org.eclipse.emf org.eclipse.emf.ecore.xmi - 2.18.0 + 2.17.0 org.eclipse.emf org.eclipse.emf.ecore.change - 2.15.0 + 2.14.0 org.eclipse.emf org.eclipse.emf.codegen.ecore - 2.33.0 + 2.29.0 org.eclipse.emf org.eclipse.emf.edit - 2.18.0 + 2.17.0 org.eclipse.emf @@ -96,7 +101,7 @@ org.eclipse.jdt org.eclipse.jdt.core - 3.33.0 + 3.32.0 org.junit.jupiter