From bc676cb3ee4a062c47b406e3d1eaa4def97b0819 Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Thu, 15 Apr 2021 12:06:16 +0200
Subject: [PATCH] Move to java11.
---
build.gradle | 4 --
solve/build.gradle | 16 ++++----
solve/src/main/jastadd/ApplyChanges.jadd | 2 +-
.../SocialNetwork/SocialNetworkPackage.java | 30 +--------------
.../impl/SocialNetworkFactoryImpl.java | 5 +++
.../impl/SocialNetworkPackageImpl.java | 37 ++++++++++++-------
.../impl/SocialNetworkRootImpl.java | 2 +
.../SocialNetwork/impl/SubmissionImpl.java | 11 +++++-
.../java/SocialNetwork/impl/UserImpl.java | 9 ++++-
.../st/ttc18live/LiveContestDriverEMF.java | 5 ---
.../st/ttc18live/LiveContestDriverXml.java | 6 +--
.../de/tudresden/inf/st/ttc18live/Main.java | 8 ++--
.../st/ttc18live/parser/ParsedComment.java | 8 ++--
.../ttc18live/parser/ParsedModelElement.java | 6 +--
.../inf/st/ttc18live/parser/ParsedPost.java | 8 ++--
.../ttc18live/parser/ParsedSocialNetwork.java | 8 ++--
.../st/ttc18live/parser/ParsedSubmission.java | 2 +-
.../inf/st/ttc18live/parser/ParsedUser.java | 8 ++--
.../change/ParsedAssociationChange.java | 4 +-
.../ParsedAssociationCollectionInsertion.java | 8 ++--
.../ParsedAssociationPropertyChange.java | 8 ++--
.../parser/change/ParsedAttributeChange.java | 4 +-
.../ParsedAttributionPropertyChange.java | 8 ++--
.../change/ParsedChangeTransaction.java | 8 ++--
.../change/ParsedCompositionChange.java | 4 +-
.../ParsedCompositionListInsertion.java | 2 +-
.../parser/change/ParsedElementaryChange.java | 8 ++--
.../parser/change/ParsedModelChange.java | 6 +--
.../parser/change/ParsedModelChangeSet.java | 8 ++--
29 files changed, 120 insertions(+), 123 deletions(-)
diff --git a/build.gradle b/build.gradle
index 6da2eac..f50e9a2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,8 +5,6 @@ allprojects {
subprojects {
apply plugin: 'java'
- sourceCompatibility = 1.8
- targetCompatibility = 1.8
task packageSources(type: Jar) {
classifier = 'sources'
@@ -15,9 +13,7 @@ subprojects {
artifacts.archives packageSources
repositories {
- jcenter()
mavenCentral()
- mavenLocal()
}
}
diff --git a/solve/build.gradle b/solve/build.gradle
index 6e3f256..7918701 100644
--- a/solve/build.gradle
+++ b/solve/build.gradle
@@ -15,11 +15,11 @@ plugins {
group 'de.tudresden.inf.st'
version '1.0-SNAPSHOT'
-sourceCompatibility = 1.8
+sourceCompatibility = 11
+targetCompatibility = 11
repositories {
mavenCentral()
- mavenLocal()
}
apply plugin: 'jastadd'
@@ -27,11 +27,13 @@ apply plugin: 'jastadd'
dependencies {
jastadd2 "org.jastadd:jastadd:2.3.5"
- implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.8.8.1'
- implementation group: 'org.eclipse.emf', name: 'org.eclipse.emf.ecore', version: '2.12.0'
- implementation group: 'org.eclipse.emf', name: 'org.eclipse.emf.ecore.xmi', version: '2.12.0'
- implementation group: 'org.eclipse.emf', name: 'org.eclipse.emf.common', version: '2.12.0'
- implementation group: 'org.eclipse.emf', name: 'org.eclipse.emf.mwe.core', version: '1.3.13'
+ implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.12.3'
+ runtime 'com.sun.xml.bind:jaxb-impl:3.0.0'
+ implementation 'jakarta.xml.bind:jakarta.xml.bind-api:3.0.0'
+ implementation group: 'org.eclipse.emf', name: 'org.eclipse.emf.ecore', version: '2.23.0'
+ implementation group: 'org.eclipse.emf', name: 'org.eclipse.emf.ecore.xmi', version: '2.16.0'
+ implementation group: 'org.eclipse.emf', name: 'org.eclipse.emf.common', version: '2.22.0'
+ implementation group: 'org.eclipse.emf', name: 'org.eclipse.emf.mwe.core', version: '1.6.1'
testImplementation group: 'junit', name: 'junit', version: junitVersion
testImplementation group: 'org.hamcrest', name: 'hamcrest-junit', version: '1.0.0.0'
diff --git a/solve/src/main/jastadd/ApplyChanges.jadd b/solve/src/main/jastadd/ApplyChanges.jadd
index 5935215..fb3e1bd 100644
--- a/solve/src/main/jastadd/ApplyChanges.jadd
+++ b/solve/src/main/jastadd/ApplyChanges.jadd
@@ -40,7 +40,7 @@ aspect ApplyChanges {
}
}
if (getFeature().equals("likedBy")) {
- System.err.println("AssociationCollectionInsertion for likedBy will be handled by attributes.");
+// System.err.println("AssociationCollectionInsertion for likedBy will be handled by attributes.");
return;
}
System.err.println("Unhandled change " + this);
diff --git a/solve/src/main/java/SocialNetwork/SocialNetworkPackage.java b/solve/src/main/java/SocialNetwork/SocialNetworkPackage.java
index c715279..089d7a0 100644
--- a/solve/src/main/java/SocialNetwork/SocialNetworkPackage.java
+++ b/solve/src/main/java/SocialNetwork/SocialNetworkPackage.java
@@ -275,15 +275,6 @@ public interface SocialNetworkPackage extends EPackage {
*/
int COMMENT__LIKED_BY = SUBMISSION_FEATURE_COUNT + 1;
- /**
- * The feature id for the '<em><b>Post</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int COMMENT__POST = SUBMISSION_FEATURE_COUNT + 2;
-
/**
* The number of structural features of the '<em>Comment</em>' class.
* <!-- begin-user-doc -->
@@ -291,7 +282,7 @@ public interface SocialNetworkPackage extends EPackage {
* @generated
* @ordered
*/
- int COMMENT_FEATURE_COUNT = SUBMISSION_FEATURE_COUNT + 3;
+ int COMMENT_FEATURE_COUNT = SUBMISSION_FEATURE_COUNT + 2;
/**
* The number of operations of the '<em>Comment</em>' class.
@@ -529,17 +520,6 @@ public interface SocialNetworkPackage extends EPackage {
*/
EReference getComment_LikedBy();
- /**
- * Returns the meta object for the reference '{@link SocialNetwork.Comment#getPost <em>Post</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Post</em>'.
- * @see SocialNetwork.Comment#getPost()
- * @see #getComment()
- * @generated
- */
- EReference getComment_Post();
-
/**
* Returns the meta object for class '{@link SocialNetwork.User <em>User</em>}'.
* <!-- begin-user-doc -->
@@ -746,14 +726,6 @@ public interface SocialNetworkPackage extends EPackage {
*/
EReference COMMENT__LIKED_BY = eINSTANCE.getComment_LikedBy();
- /**
- * The meta object literal for the '<em><b>Post</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference COMMENT__POST = eINSTANCE.getComment_Post();
-
/**
* The meta object literal for the '{@link SocialNetwork.impl.UserImpl <em>User</em>}' class.
* <!-- begin-user-doc -->
diff --git a/solve/src/main/java/SocialNetwork/impl/SocialNetworkFactoryImpl.java b/solve/src/main/java/SocialNetwork/impl/SocialNetworkFactoryImpl.java
index 69525e1..6954389 100644
--- a/solve/src/main/java/SocialNetwork/impl/SocialNetworkFactoryImpl.java
+++ b/solve/src/main/java/SocialNetwork/impl/SocialNetworkFactoryImpl.java
@@ -70,6 +70,7 @@ public class SocialNetworkFactoryImpl extends EFactoryImpl implements SocialNetw
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public Post createPost() {
PostImpl post = new PostImpl();
return post;
@@ -80,6 +81,7 @@ public class SocialNetworkFactoryImpl extends EFactoryImpl implements SocialNetw
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public Comment createComment() {
CommentImpl comment = new CommentImpl();
return comment;
@@ -90,6 +92,7 @@ public class SocialNetworkFactoryImpl extends EFactoryImpl implements SocialNetw
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public User createUser() {
UserImpl user = new UserImpl();
return user;
@@ -100,6 +103,7 @@ public class SocialNetworkFactoryImpl extends EFactoryImpl implements SocialNetw
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public SocialNetworkRoot createSocialNetworkRoot() {
SocialNetworkRootImpl socialNetworkRoot = new SocialNetworkRootImpl();
return socialNetworkRoot;
@@ -110,6 +114,7 @@ public class SocialNetworkFactoryImpl extends EFactoryImpl implements SocialNetw
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public SocialNetworkPackage getSocialNetworkPackage() {
return (SocialNetworkPackage)getEPackage();
}
diff --git a/solve/src/main/java/SocialNetwork/impl/SocialNetworkPackageImpl.java b/solve/src/main/java/SocialNetwork/impl/SocialNetworkPackageImpl.java
index 3ffbe5d..f294969 100644
--- a/solve/src/main/java/SocialNetwork/impl/SocialNetworkPackageImpl.java
+++ b/solve/src/main/java/SocialNetwork/impl/SocialNetworkPackageImpl.java
@@ -87,7 +87,7 @@ public class SocialNetworkPackageImpl extends EPackageImpl implements SocialNetw
/**
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
- *
+ *
* <p>This method is used to initialize {@link SocialNetworkPackage#eINSTANCE} when that field is accessed.
* Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
* <!-- begin-user-doc -->
@@ -101,7 +101,8 @@ public class SocialNetworkPackageImpl extends EPackageImpl implements SocialNetw
if (isInited) return (SocialNetworkPackage)EPackage.Registry.INSTANCE.getEPackage(SocialNetworkPackage.eNS_URI);
// Obtain or create and register package
- SocialNetworkPackageImpl theSocialNetworkPackage = (SocialNetworkPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SocialNetworkPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SocialNetworkPackageImpl());
+ Object registeredSocialNetworkPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+ SocialNetworkPackageImpl theSocialNetworkPackage = registeredSocialNetworkPackage instanceof SocialNetworkPackageImpl ? (SocialNetworkPackageImpl)registeredSocialNetworkPackage : new SocialNetworkPackageImpl();
isInited = true;
@@ -114,7 +115,6 @@ public class SocialNetworkPackageImpl extends EPackageImpl implements SocialNetw
// Mark meta-data to indicate it can't be changed
theSocialNetworkPackage.freeze();
-
// Update the registry and return the package
EPackage.Registry.INSTANCE.put(SocialNetworkPackage.eNS_URI, theSocialNetworkPackage);
return theSocialNetworkPackage;
@@ -125,6 +125,7 @@ public class SocialNetworkPackageImpl extends EPackageImpl implements SocialNetw
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EClass getSubmission() {
return submissionEClass;
}
@@ -134,6 +135,7 @@ public class SocialNetworkPackageImpl extends EPackageImpl implements SocialNetw
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getSubmission_Id() {
return (EAttribute)submissionEClass.getEStructuralFeatures().get(0);
}
@@ -143,6 +145,7 @@ public class SocialNetworkPackageImpl extends EPackageImpl implements SocialNetw
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getSubmission_Timestamp() {
return (EAttribute)submissionEClass.getEStructuralFeatures().get(1);
}
@@ -152,6 +155,7 @@ public class SocialNetworkPackageImpl extends EPackageImpl implements SocialNetw
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getSubmission_Content() {
return (EAttribute)submissionEClass.getEStructuralFeatures().get(2);
}
@@ -161,6 +165,7 @@ public class SocialNetworkPackageImpl extends EPackageImpl implements SocialNetw
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EReference getSubmission_Submitter() {
return (EReference)submissionEClass.getEStructuralFeatures().get(3);
}
@@ -170,6 +175,7 @@ public class SocialNetworkPackageImpl extends EPackageImpl implements SocialNetw
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EReference getSubmission_Comments() {
return (EReference)submissionEClass.getEStructuralFeatures().get(4);
}
@@ -179,6 +185,7 @@ public class SocialNetworkPackageImpl extends EPackageImpl implements SocialNetw
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EClass getPost() {
return postEClass;
}
@@ -188,6 +195,7 @@ public class SocialNetworkPackageImpl extends EPackageImpl implements SocialNetw
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EClass getComment() {
return commentEClass;
}
@@ -197,6 +205,7 @@ public class SocialNetworkPackageImpl extends EPackageImpl implements SocialNetw
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EReference getComment_Commented() {
return (EReference)commentEClass.getEStructuralFeatures().get(0);
}
@@ -206,6 +215,7 @@ public class SocialNetworkPackageImpl extends EPackageImpl implements SocialNetw
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EReference getComment_LikedBy() {
return (EReference)commentEClass.getEStructuralFeatures().get(1);
}
@@ -215,15 +225,7 @@ public class SocialNetworkPackageImpl extends EPackageImpl implements SocialNetw
* <!-- end-user-doc -->
* @generated
*/
- public EReference getComment_Post() {
- return (EReference)commentEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
+ @Override
public EClass getUser() {
return userEClass;
}
@@ -233,6 +235,7 @@ public class SocialNetworkPackageImpl extends EPackageImpl implements SocialNetw
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getUser_Id() {
return (EAttribute)userEClass.getEStructuralFeatures().get(0);
}
@@ -242,6 +245,7 @@ public class SocialNetworkPackageImpl extends EPackageImpl implements SocialNetw
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getUser_Name() {
return (EAttribute)userEClass.getEStructuralFeatures().get(1);
}
@@ -251,6 +255,7 @@ public class SocialNetworkPackageImpl extends EPackageImpl implements SocialNetw
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EReference getUser_Submissions() {
return (EReference)userEClass.getEStructuralFeatures().get(2);
}
@@ -260,6 +265,7 @@ public class SocialNetworkPackageImpl extends EPackageImpl implements SocialNetw
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EReference getUser_Likes() {
return (EReference)userEClass.getEStructuralFeatures().get(3);
}
@@ -269,6 +275,7 @@ public class SocialNetworkPackageImpl extends EPackageImpl implements SocialNetw
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EReference getUser_Friends() {
return (EReference)userEClass.getEStructuralFeatures().get(4);
}
@@ -278,6 +285,7 @@ public class SocialNetworkPackageImpl extends EPackageImpl implements SocialNetw
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EClass getSocialNetworkRoot() {
return socialNetworkRootEClass;
}
@@ -287,6 +295,7 @@ public class SocialNetworkPackageImpl extends EPackageImpl implements SocialNetw
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EReference getSocialNetworkRoot_Posts() {
return (EReference)socialNetworkRootEClass.getEStructuralFeatures().get(0);
}
@@ -296,6 +305,7 @@ public class SocialNetworkPackageImpl extends EPackageImpl implements SocialNetw
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EReference getSocialNetworkRoot_Users() {
return (EReference)socialNetworkRootEClass.getEStructuralFeatures().get(1);
}
@@ -305,6 +315,7 @@ public class SocialNetworkPackageImpl extends EPackageImpl implements SocialNetw
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public SocialNetworkFactory getSocialNetworkFactory() {
return (SocialNetworkFactory)getEFactoryInstance();
}
@@ -340,7 +351,6 @@ public class SocialNetworkPackageImpl extends EPackageImpl implements SocialNetw
commentEClass = createEClass(COMMENT);
createEReference(commentEClass, COMMENT__COMMENTED);
createEReference(commentEClass, COMMENT__LIKED_BY);
- createEReference(commentEClass, COMMENT__POST);
userEClass = createEClass(USER);
createEAttribute(userEClass, USER__ID);
@@ -398,7 +408,6 @@ public class SocialNetworkPackageImpl extends EPackageImpl implements SocialNetw
initEClass(commentEClass, Comment.class, "Comment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getComment_Commented(), this.getSubmission(), this.getSubmission_Comments(), "commented", null, 1, 1, Comment.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
initEReference(getComment_LikedBy(), this.getUser(), this.getUser_Likes(), "likedBy", null, 0, -1, Comment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
- initEReference(getComment_Post(), this.getPost(), null, "post", null, 1, 1, Comment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
initEClass(userEClass, User.class, "User", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getUser_Id(), ecorePackage.getEString(), "id", null, 1, 1, User.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
diff --git a/solve/src/main/java/SocialNetwork/impl/SocialNetworkRootImpl.java b/solve/src/main/java/SocialNetwork/impl/SocialNetworkRootImpl.java
index ff0ebf9..0f7c962 100644
--- a/solve/src/main/java/SocialNetwork/impl/SocialNetworkRootImpl.java
+++ b/solve/src/main/java/SocialNetwork/impl/SocialNetworkRootImpl.java
@@ -80,6 +80,7 @@ public class SocialNetworkRootImpl extends MinimalEObjectImpl.Container implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EList<Post> getPosts() {
if (posts == null) {
posts = new EObjectContainmentEList<Post>(Post.class, this, SocialNetworkPackage.SOCIAL_NETWORK_ROOT__POSTS);
@@ -92,6 +93,7 @@ public class SocialNetworkRootImpl extends MinimalEObjectImpl.Container implemen
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EList<User> getUsers() {
if (users == null) {
users = new EObjectContainmentEList<User>(User.class, this, SocialNetworkPackage.SOCIAL_NETWORK_ROOT__USERS);
diff --git a/solve/src/main/java/SocialNetwork/impl/SubmissionImpl.java b/solve/src/main/java/SocialNetwork/impl/SubmissionImpl.java
index a02cd83..9f61f4a 100644
--- a/solve/src/main/java/SocialNetwork/impl/SubmissionImpl.java
+++ b/solve/src/main/java/SocialNetwork/impl/SubmissionImpl.java
@@ -146,6 +146,7 @@ public abstract class SubmissionImpl extends MinimalEObjectImpl.Container implem
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public String getId() {
return id;
}
@@ -155,6 +156,7 @@ public abstract class SubmissionImpl extends MinimalEObjectImpl.Container implem
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setId(String newId) {
String oldId = id;
id = newId;
@@ -167,6 +169,7 @@ public abstract class SubmissionImpl extends MinimalEObjectImpl.Container implem
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public Date getTimestamp() {
return timestamp;
}
@@ -176,6 +179,7 @@ public abstract class SubmissionImpl extends MinimalEObjectImpl.Container implem
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setTimestamp(Date newTimestamp) {
Date oldTimestamp = timestamp;
timestamp = newTimestamp;
@@ -188,6 +192,7 @@ public abstract class SubmissionImpl extends MinimalEObjectImpl.Container implem
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public String getContent() {
return content;
}
@@ -197,6 +202,7 @@ public abstract class SubmissionImpl extends MinimalEObjectImpl.Container implem
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setContent(String newContent) {
String oldContent = content;
content = newContent;
@@ -209,6 +215,7 @@ public abstract class SubmissionImpl extends MinimalEObjectImpl.Container implem
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public User getSubmitter() {
if (submitter != null && submitter.eIsProxy()) {
InternalEObject oldSubmitter = (InternalEObject)submitter;
@@ -250,6 +257,7 @@ public abstract class SubmissionImpl extends MinimalEObjectImpl.Container implem
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setSubmitter(User newSubmitter) {
if (newSubmitter != submitter) {
NotificationChain msgs = null;
@@ -269,6 +277,7 @@ public abstract class SubmissionImpl extends MinimalEObjectImpl.Container implem
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EList<Comment> getComments() {
if (comments == null) {
comments = new EObjectContainmentWithInverseEList<Comment>(Comment.class, this, SocialNetworkPackage.SUBMISSION__COMMENTS, SocialNetworkPackage.COMMENT__COMMENTED);
@@ -421,7 +430,7 @@ public abstract class SubmissionImpl extends MinimalEObjectImpl.Container implem
public String toString() {
if (eIsProxy()) return super.toString();
- StringBuffer result = new StringBuffer(super.toString());
+ StringBuilder result = new StringBuilder(super.toString());
result.append(" (id: ");
result.append(id);
result.append(", timestamp: ");
diff --git a/solve/src/main/java/SocialNetwork/impl/UserImpl.java b/solve/src/main/java/SocialNetwork/impl/UserImpl.java
index 29fb1d9..dbb28d9 100644
--- a/solve/src/main/java/SocialNetwork/impl/UserImpl.java
+++ b/solve/src/main/java/SocialNetwork/impl/UserImpl.java
@@ -136,6 +136,7 @@ public class UserImpl extends MinimalEObjectImpl.Container implements User {
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public String getId() {
return id;
}
@@ -145,6 +146,7 @@ public class UserImpl extends MinimalEObjectImpl.Container implements User {
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setId(String newId) {
String oldId = id;
id = newId;
@@ -157,6 +159,7 @@ public class UserImpl extends MinimalEObjectImpl.Container implements User {
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public String getName() {
return name;
}
@@ -166,6 +169,7 @@ public class UserImpl extends MinimalEObjectImpl.Container implements User {
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setName(String newName) {
String oldName = name;
name = newName;
@@ -178,6 +182,7 @@ public class UserImpl extends MinimalEObjectImpl.Container implements User {
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EList<Submission> getSubmissions() {
if (submissions == null) {
submissions = new EObjectWithInverseResolvingEList<Submission>(Submission.class, this, SocialNetworkPackage.USER__SUBMISSIONS, SocialNetworkPackage.SUBMISSION__SUBMITTER);
@@ -190,6 +195,7 @@ public class UserImpl extends MinimalEObjectImpl.Container implements User {
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EList<Comment> getLikes() {
if (likes == null) {
likes = new EObjectWithInverseResolvingEList.ManyInverse<Comment>(Comment.class, this, SocialNetworkPackage.USER__LIKES, SocialNetworkPackage.COMMENT__LIKED_BY);
@@ -202,6 +208,7 @@ public class UserImpl extends MinimalEObjectImpl.Container implements User {
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EList<User> getFriends() {
if (friends == null) {
friends = new EObjectResolvingEList<User>(User.class, this, SocialNetworkPackage.USER__FRIENDS);
@@ -353,7 +360,7 @@ public class UserImpl extends MinimalEObjectImpl.Container implements User {
public String toString() {
if (eIsProxy()) return super.toString();
- StringBuffer result = new StringBuffer(super.toString());
+ StringBuilder result = new StringBuilder(super.toString());
result.append(" (id: ");
result.append(id);
result.append(", name: ");
diff --git a/solve/src/main/java/de/tudresden/inf/st/ttc18live/LiveContestDriverEMF.java b/solve/src/main/java/de/tudresden/inf/st/ttc18live/LiveContestDriverEMF.java
index 434e219..209653f 100644
--- a/solve/src/main/java/de/tudresden/inf/st/ttc18live/LiveContestDriverEMF.java
+++ b/solve/src/main/java/de/tudresden/inf/st/ttc18live/LiveContestDriverEMF.java
@@ -70,9 +70,4 @@ public class LiveContestDriverEMF extends AbstractLiveContestDriver {
Changes.ModelChangeSet emfChanges = (Changes.ModelChangeSet) loadFile(String.format("change%02d.xmi", iteration));
return translator.translateChangeSet(emfChanges);
}
-
-// @Override
-// public void Initial() {
-// throw new RuntimeException();
-// }
}
diff --git a/solve/src/main/java/de/tudresden/inf/st/ttc18live/LiveContestDriverXml.java b/solve/src/main/java/de/tudresden/inf/st/ttc18live/LiveContestDriverXml.java
index 5aa5c6e..b68d0d5 100644
--- a/solve/src/main/java/de/tudresden/inf/st/ttc18live/LiveContestDriverXml.java
+++ b/solve/src/main/java/de/tudresden/inf/st/ttc18live/LiveContestDriverXml.java
@@ -6,8 +6,8 @@ import de.tudresden.inf.st.ttc18live.parser.ParsedSocialNetwork;
import de.tudresden.inf.st.ttc18live.parser.change.ParsedModelChangeSet;
import de.tudresden.inf.st.ttc18live.translator.XmlToJastaddTranslator;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.Unmarshaller;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -47,7 +47,7 @@ public class LiveContestDriverXml extends AbstractLiveContestDriver {
ModelChangeSet UpdateImpl(int iteration) throws Exception {
JAXBContext jc = JAXBContext.newInstance(ParsedModelChangeSet.class);
Unmarshaller unmarshaller = jc.createUnmarshaller();
- unmarshaller.setEventHandler(new javax.xml.bind.helpers.DefaultValidationEventHandler());
+ unmarshaller.setEventHandler(new jakarta.xml.bind.helpers.DefaultValidationEventHandler());
Path modelContent = Paths.get(getChangePath(), String.format("change%02d.xmi", iteration));
// logger.debug("Parsing {}", modelContent);
ParsedModelChangeSet parsedModelChangeSet = (ParsedModelChangeSet) unmarshaller.unmarshal(modelContent.toFile());
diff --git a/solve/src/main/java/de/tudresden/inf/st/ttc18live/Main.java b/solve/src/main/java/de/tudresden/inf/st/ttc18live/Main.java
index df5fff5..6d506b1 100644
--- a/solve/src/main/java/de/tudresden/inf/st/ttc18live/Main.java
+++ b/solve/src/main/java/de/tudresden/inf/st/ttc18live/Main.java
@@ -5,9 +5,9 @@ import de.tudresden.inf.st.ttc18live.parser.ParsedSocialNetwork;
import de.tudresden.inf.st.ttc18live.parser.change.ParsedModelChangeSet;
import de.tudresden.inf.st.ttc18live.translator.XmlToJastaddTranslator;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.text.ParseException;
@@ -187,7 +187,7 @@ public class Main {
System.out.println("Parsing changes " + suffix);
JAXBContext jc = JAXBContext.newInstance(ParsedModelChangeSet.class);
Unmarshaller unmarshaller = jc.createUnmarshaller();
- unmarshaller.setEventHandler(new javax.xml.bind.helpers.DefaultValidationEventHandler());
+ unmarshaller.setEventHandler(new jakarta.xml.bind.helpers.DefaultValidationEventHandler());
Path modelContent = Paths.get("src", "test", "resources", Integer.toString(changeSet), suffix);
if (!modelContent.toFile().exists()) {
System.err.println("File " + modelContent + " does not exist!");
diff --git a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/ParsedComment.java b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/ParsedComment.java
index 9f1a14a..f6b4842 100644
--- a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/ParsedComment.java
+++ b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/ParsedComment.java
@@ -1,9 +1,9 @@
package de.tudresden.inf.st.ttc18live.parser;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlType;
/**
* Comment parsed from XML.
diff --git a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/ParsedModelElement.java b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/ParsedModelElement.java
index 213a229..ad8795f 100644
--- a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/ParsedModelElement.java
+++ b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/ParsedModelElement.java
@@ -1,8 +1,8 @@
package de.tudresden.inf.st.ttc18live.parser;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlType;
/**
* TODO: Add description.
diff --git a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/ParsedPost.java b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/ParsedPost.java
index 0682494..3d2b91c 100644
--- a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/ParsedPost.java
+++ b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/ParsedPost.java
@@ -1,9 +1,9 @@
package de.tudresden.inf.st.ttc18live.parser;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
/**
* Post parsed from XML.
diff --git a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/ParsedSocialNetwork.java b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/ParsedSocialNetwork.java
index b2491e6..1fefb72 100644
--- a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/ParsedSocialNetwork.java
+++ b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/ParsedSocialNetwork.java
@@ -1,9 +1,9 @@
package de.tudresden.inf.st.ttc18live.parser;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
import java.util.List;
/**
diff --git a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/ParsedSubmission.java b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/ParsedSubmission.java
index 0653997..3ea020d 100644
--- a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/ParsedSubmission.java
+++ b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/ParsedSubmission.java
@@ -1,6 +1,6 @@
package de.tudresden.inf.st.ttc18live.parser;
-import javax.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.*;
import java.util.List;
/**
diff --git a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/ParsedUser.java b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/ParsedUser.java
index a26f4aa..1ed3938 100644
--- a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/ParsedUser.java
+++ b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/ParsedUser.java
@@ -1,9 +1,9 @@
package de.tudresden.inf.st.ttc18live.parser;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlType;
/**
* User parsed from XML.
diff --git a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedAssociationChange.java b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedAssociationChange.java
index 9c21608..27183cf 100644
--- a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedAssociationChange.java
+++ b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedAssociationChange.java
@@ -1,7 +1,7 @@
package de.tudresden.inf.st.ttc18live.parser.change;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
/**
* TODO: Add description.
diff --git a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedAssociationCollectionInsertion.java b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedAssociationCollectionInsertion.java
index eaa77fa..efb407b 100644
--- a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedAssociationCollectionInsertion.java
+++ b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedAssociationCollectionInsertion.java
@@ -1,9 +1,9 @@
package de.tudresden.inf.st.ttc18live.parser.change;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlType;
/**
* TODO: Add description.
diff --git a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedAssociationPropertyChange.java b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedAssociationPropertyChange.java
index a8fdea2..8b8af4d 100644
--- a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedAssociationPropertyChange.java
+++ b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedAssociationPropertyChange.java
@@ -1,9 +1,9 @@
package de.tudresden.inf.st.ttc18live.parser.change;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlType;
/**
* TODO: Add description.
diff --git a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedAttributeChange.java b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedAttributeChange.java
index c95dcea..5ad09e5 100644
--- a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedAttributeChange.java
+++ b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedAttributeChange.java
@@ -1,7 +1,7 @@
package de.tudresden.inf.st.ttc18live.parser.change;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
/**
* TODO: Add description.
diff --git a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedAttributionPropertyChange.java b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedAttributionPropertyChange.java
index 01475bf..f1a4848 100644
--- a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedAttributionPropertyChange.java
+++ b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedAttributionPropertyChange.java
@@ -1,9 +1,9 @@
package de.tudresden.inf.st.ttc18live.parser.change;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlType;
/**
* TODO: Add description.
diff --git a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedChangeTransaction.java b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedChangeTransaction.java
index 8047f5f..34d7632 100644
--- a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedChangeTransaction.java
+++ b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedChangeTransaction.java
@@ -1,9 +1,9 @@
package de.tudresden.inf.st.ttc18live.parser.change;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
import java.util.List;
/**
diff --git a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedCompositionChange.java b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedCompositionChange.java
index 3960522..cdfeebb 100644
--- a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedCompositionChange.java
+++ b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedCompositionChange.java
@@ -1,7 +1,7 @@
package de.tudresden.inf.st.ttc18live.parser.change;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
/**
* TODO: Add description.
diff --git a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedCompositionListInsertion.java b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedCompositionListInsertion.java
index 93d9c38..107d7f3 100644
--- a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedCompositionListInsertion.java
+++ b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedCompositionListInsertion.java
@@ -2,7 +2,7 @@ package de.tudresden.inf.st.ttc18live.parser.change;
import de.tudresden.inf.st.ttc18live.parser.ParsedModelElement;
-import javax.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.*;
/**
* TODO: Add description.
diff --git a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedElementaryChange.java b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedElementaryChange.java
index 0fbfbbe..2999327 100644
--- a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedElementaryChange.java
+++ b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedElementaryChange.java
@@ -1,9 +1,9 @@
package de.tudresden.inf.st.ttc18live.parser.change;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
/**
* TODO: Add description.
diff --git a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedModelChange.java b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedModelChange.java
index b79db9c..5c99416 100644
--- a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedModelChange.java
+++ b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedModelChange.java
@@ -1,8 +1,8 @@
package de.tudresden.inf.st.ttc18live.parser.change;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
/**
* TODO: Add description.
diff --git a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedModelChangeSet.java b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedModelChangeSet.java
index cd6e63e..fd6a36f 100644
--- a/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedModelChangeSet.java
+++ b/solve/src/main/java/de/tudresden/inf/st/ttc18live/parser/change/ParsedModelChangeSet.java
@@ -1,9 +1,9 @@
package de.tudresden.inf.st.ttc18live.parser.change;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
import java.util.List;
/**
--
GitLab