From fd13923aca3096b5f38b4d4dac2478e4913231bf Mon Sep 17 00:00:00 2001 From: rsfzi <147811838+rsfzi@users.noreply.github.com> Date: Mon, 2 Dec 2024 18:02:29 +0100 Subject: [PATCH 1/5] Revert "moved issue related classes to de.uka.ipd.sdq.errorhandling.core" This reverts commit 98e667295a378a576d91bd40604e198b154f33fc. --- .../META-INF/MANIFEST.MF | 2 -- .../META-INF/MANIFEST.MF | 7 +++--- .../de/uka/ipd/sdq/errorhandling}/IIssue.java | 2 +- .../sdq/errorhandling}/SeverityAndIssue.java | 22 +++++++++---------- .../ipd/sdq/errorhandling}/SeverityEnum.java | 2 +- .../dialogs/issues/DisplayIssuesDialog.java | 2 +- .../dialogs/issues/IssuesDialog.java | 4 ++-- .../exceptions/ExpectedTypeMismatchIssue.java | 2 +- .../analyser/visitors/TypeCheckVisitor.java | 2 +- .../stoex/validation/StoexValidator.java | 2 +- 10 files changed, 22 insertions(+), 25 deletions(-) rename bundles/{de.uka.ipd.sdq.errorhandling.core/src/main/java/de/uka/ipd/sdq/errorhandling/core => de.uka.ipd.sdq.errorhandling/src/de/uka/ipd/sdq/errorhandling}/IIssue.java (74%) rename bundles/{de.uka.ipd.sdq.errorhandling.core/src/main/java/de/uka/ipd/sdq/errorhandling/core => de.uka.ipd.sdq.errorhandling/src/de/uka/ipd/sdq/errorhandling}/SeverityAndIssue.java (87%) rename bundles/{de.uka.ipd.sdq.errorhandling.core/src/main/java/de/uka/ipd/sdq/errorhandling/core => de.uka.ipd.sdq.errorhandling/src/de/uka/ipd/sdq/errorhandling}/SeverityEnum.java (50%) diff --git a/bundles/de.uka.ipd.sdq.errorhandling.core/META-INF/MANIFEST.MF b/bundles/de.uka.ipd.sdq.errorhandling.core/META-INF/MANIFEST.MF index 271204c6..0047d013 100644 --- a/bundles/de.uka.ipd.sdq.errorhandling.core/META-INF/MANIFEST.MF +++ b/bundles/de.uka.ipd.sdq.errorhandling.core/META-INF/MANIFEST.MF @@ -3,7 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: SDQ Errorhandling Core Bundle-SymbolicName: de.uka.ipd.sdq.errorhandling.core Bundle-Version: 5.2.0.qualifier -Export-Package: de.uka.ipd.sdq.errorhandling.core -Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.33.0" Bundle-Vendor: sdq.ipd.uka.de Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/bundles/de.uka.ipd.sdq.errorhandling/META-INF/MANIFEST.MF b/bundles/de.uka.ipd.sdq.errorhandling/META-INF/MANIFEST.MF index b4f945e9..bbb1e40d 100644 --- a/bundles/de.uka.ipd.sdq.errorhandling/META-INF/MANIFEST.MF +++ b/bundles/de.uka.ipd.sdq.errorhandling/META-INF/MANIFEST.MF @@ -6,8 +6,9 @@ Bundle-Version: 5.2.0.qualifier Bundle-Activator: de.uka.ipd.sdq.errorhandling.Activator Bundle-Vendor: sdq.ipd.uka.de Require-Bundle: org.eclipse.core.runtime, - org.eclipse.ui;resolution:=optional, - de.uka.ipd.sdq.errorhandling.core;bundle-version="5.2.0";visibility:=reexport + org.eclipse.emf.ecore, + org.eclipse.ui;resolution:=optional Bundle-ActivationPolicy: lazy -Export-Package: de.uka.ipd.sdq.errorhandling.dialogs.issues +Export-Package: de.uka.ipd.sdq.errorhandling, + de.uka.ipd.sdq.errorhandling.dialogs.issues Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/bundles/de.uka.ipd.sdq.errorhandling.core/src/main/java/de/uka/ipd/sdq/errorhandling/core/IIssue.java b/bundles/de.uka.ipd.sdq.errorhandling/src/de/uka/ipd/sdq/errorhandling/IIssue.java similarity index 74% rename from bundles/de.uka.ipd.sdq.errorhandling.core/src/main/java/de/uka/ipd/sdq/errorhandling/core/IIssue.java rename to bundles/de.uka.ipd.sdq.errorhandling/src/de/uka/ipd/sdq/errorhandling/IIssue.java index 4f8bc304..153edb4a 100644 --- a/bundles/de.uka.ipd.sdq.errorhandling.core/src/main/java/de/uka/ipd/sdq/errorhandling/core/IIssue.java +++ b/bundles/de.uka.ipd.sdq.errorhandling/src/de/uka/ipd/sdq/errorhandling/IIssue.java @@ -1,4 +1,4 @@ -package de.uka.ipd.sdq.errorhandling.core; +package de.uka.ipd.sdq.errorhandling; /** * Interface for reportable issues. diff --git a/bundles/de.uka.ipd.sdq.errorhandling.core/src/main/java/de/uka/ipd/sdq/errorhandling/core/SeverityAndIssue.java b/bundles/de.uka.ipd.sdq.errorhandling/src/de/uka/ipd/sdq/errorhandling/SeverityAndIssue.java similarity index 87% rename from bundles/de.uka.ipd.sdq.errorhandling.core/src/main/java/de/uka/ipd/sdq/errorhandling/core/SeverityAndIssue.java rename to bundles/de.uka.ipd.sdq.errorhandling/src/de/uka/ipd/sdq/errorhandling/SeverityAndIssue.java index 18440303..ad3cd5d2 100644 --- a/bundles/de.uka.ipd.sdq.errorhandling.core/src/main/java/de/uka/ipd/sdq/errorhandling/core/SeverityAndIssue.java +++ b/bundles/de.uka.ipd.sdq.errorhandling/src/de/uka/ipd/sdq/errorhandling/SeverityAndIssue.java @@ -1,7 +1,9 @@ -package de.uka.ipd.sdq.errorhandling.core; +package de.uka.ipd.sdq.errorhandling; import org.eclipse.emf.ecore.EObject; +import de.uka.ipd.sdq.errorhandling.dialogs.issues.IssuesDialog; + /** * Issue combined with a severity level. Used to record and report issues to the user using the * {@link IssuesDialog}. @@ -95,30 +97,26 @@ public Object getElement() { public String getResourceName() { if (element != null) { if (element instanceof EObject) { - return ((EObject) element).eResource() - .getURI() - .toFileString(); + return ((EObject) element).eResource().getURI().toFileString(); } else { return objectResourceName == null ? DEFAULT_RESOURCE_NAME : objectResourceName; } - } else { + } else return DEFAULT_RESOURCE_NAME; - } + } public SeverityEnum getError() { return severity; } - @Override public int compareTo(SeverityAndIssue o) { - if (this.severity == o.getError()) { + if (this.severity == o.getError()) return 0; - } - if (this.severity == SeverityEnum.ERROR && o.getError() == SeverityEnum.WARNING) { + if (this.severity == SeverityEnum.ERROR && o.getError() == SeverityEnum.WARNING) return -1; - } - return 1; + else + return 1; } } diff --git a/bundles/de.uka.ipd.sdq.errorhandling.core/src/main/java/de/uka/ipd/sdq/errorhandling/core/SeverityEnum.java b/bundles/de.uka.ipd.sdq.errorhandling/src/de/uka/ipd/sdq/errorhandling/SeverityEnum.java similarity index 50% rename from bundles/de.uka.ipd.sdq.errorhandling.core/src/main/java/de/uka/ipd/sdq/errorhandling/core/SeverityEnum.java rename to bundles/de.uka.ipd.sdq.errorhandling/src/de/uka/ipd/sdq/errorhandling/SeverityEnum.java index 94dbac08..fa248bee 100644 --- a/bundles/de.uka.ipd.sdq.errorhandling.core/src/main/java/de/uka/ipd/sdq/errorhandling/core/SeverityEnum.java +++ b/bundles/de.uka.ipd.sdq.errorhandling/src/de/uka/ipd/sdq/errorhandling/SeverityEnum.java @@ -1,4 +1,4 @@ -package de.uka.ipd.sdq.errorhandling.core; +package de.uka.ipd.sdq.errorhandling; public enum SeverityEnum { ERROR, WARNING diff --git a/bundles/de.uka.ipd.sdq.errorhandling/src/de/uka/ipd/sdq/errorhandling/dialogs/issues/DisplayIssuesDialog.java b/bundles/de.uka.ipd.sdq.errorhandling/src/de/uka/ipd/sdq/errorhandling/dialogs/issues/DisplayIssuesDialog.java index c2caa6d7..60aba6f8 100644 --- a/bundles/de.uka.ipd.sdq.errorhandling/src/de/uka/ipd/sdq/errorhandling/dialogs/issues/DisplayIssuesDialog.java +++ b/bundles/de.uka.ipd.sdq.errorhandling/src/de/uka/ipd/sdq/errorhandling/dialogs/issues/DisplayIssuesDialog.java @@ -8,7 +8,7 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.ui.PlatformUI; -import de.uka.ipd.sdq.errorhandling.core.SeverityAndIssue; +import de.uka.ipd.sdq.errorhandling.SeverityAndIssue; /** * Inner class used to display the dialog containing found validation errors. Needed by Eclipse to diff --git a/bundles/de.uka.ipd.sdq.errorhandling/src/de/uka/ipd/sdq/errorhandling/dialogs/issues/IssuesDialog.java b/bundles/de.uka.ipd.sdq.errorhandling/src/de/uka/ipd/sdq/errorhandling/dialogs/issues/IssuesDialog.java index 23d20d3a..a263d000 100644 --- a/bundles/de.uka.ipd.sdq.errorhandling/src/de/uka/ipd/sdq/errorhandling/dialogs/issues/IssuesDialog.java +++ b/bundles/de.uka.ipd.sdq.errorhandling/src/de/uka/ipd/sdq/errorhandling/dialogs/issues/IssuesDialog.java @@ -25,8 +25,8 @@ import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.Text; -import de.uka.ipd.sdq.errorhandling.core.SeverityAndIssue; -import de.uka.ipd.sdq.errorhandling.core.SeverityEnum; +import de.uka.ipd.sdq.errorhandling.SeverityAndIssue; +import de.uka.ipd.sdq.errorhandling.SeverityEnum; public class IssuesDialog extends Dialog { diff --git a/bundles/de.uka.ipd.sdq.stoex.analyser/src/de/uka/ipd/sdq/stoex/analyser/exceptions/ExpectedTypeMismatchIssue.java b/bundles/de.uka.ipd.sdq.stoex.analyser/src/de/uka/ipd/sdq/stoex/analyser/exceptions/ExpectedTypeMismatchIssue.java index 8e1b50db..359ecb14 100644 --- a/bundles/de.uka.ipd.sdq.stoex.analyser/src/de/uka/ipd/sdq/stoex/analyser/exceptions/ExpectedTypeMismatchIssue.java +++ b/bundles/de.uka.ipd.sdq.stoex.analyser/src/de/uka/ipd/sdq/stoex/analyser/exceptions/ExpectedTypeMismatchIssue.java @@ -3,7 +3,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; -import de.uka.ipd.sdq.errorhandling.core.IIssue; +import de.uka.ipd.sdq.errorhandling.IIssue; import de.uka.ipd.sdq.stoex.analyser.visitors.TypeEnum; public class ExpectedTypeMismatchIssue implements IIssue { diff --git a/bundles/de.uka.ipd.sdq.stoex.analyser/src/de/uka/ipd/sdq/stoex/analyser/visitors/TypeCheckVisitor.java b/bundles/de.uka.ipd.sdq.stoex.analyser/src/de/uka/ipd/sdq/stoex/analyser/visitors/TypeCheckVisitor.java index 1457e820..f68eb47f 100644 --- a/bundles/de.uka.ipd.sdq.stoex.analyser/src/de/uka/ipd/sdq/stoex/analyser/visitors/TypeCheckVisitor.java +++ b/bundles/de.uka.ipd.sdq.stoex.analyser/src/de/uka/ipd/sdq/stoex/analyser/visitors/TypeCheckVisitor.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.Collection; -import de.uka.ipd.sdq.errorhandling.core.IIssue; +import de.uka.ipd.sdq.errorhandling.IIssue; import de.uka.ipd.sdq.stoex.BooleanOperatorExpression; import de.uka.ipd.sdq.stoex.IfElseExpression; import de.uka.ipd.sdq.stoex.NegativeExpression; diff --git a/bundles/org.palladiosimulator.commons.stoex/src/org/palladiosimulator/commons/stoex/validation/StoexValidator.java b/bundles/org.palladiosimulator.commons.stoex/src/org/palladiosimulator/commons/stoex/validation/StoexValidator.java index 75f1b892..e2bf5205 100644 --- a/bundles/org.palladiosimulator.commons.stoex/src/org/palladiosimulator/commons/stoex/validation/StoexValidator.java +++ b/bundles/org.palladiosimulator.commons.stoex/src/org/palladiosimulator/commons/stoex/validation/StoexValidator.java @@ -20,7 +20,7 @@ import com.google.inject.Inject; -import de.uka.ipd.sdq.errorhandling.core.IIssue; +import de.uka.ipd.sdq.errorhandling.IIssue; import de.uka.ipd.sdq.probfunction.ProbfunctionPackage; import de.uka.ipd.sdq.stoex.Expression; import de.uka.ipd.sdq.stoex.StoexPackage; From 7caf562571b1626c980c7101c6a69e01f20bb2ad Mon Sep 17 00:00:00 2001 From: rsfzi <147811838+rsfzi@users.noreply.github.com> Date: Mon, 2 Dec 2024 18:02:29 +0100 Subject: [PATCH 2/5] Revert "added de.uka.ipd.sdq.errorhandling.core plugin" This reverts commit 33798d489758b67bb05083a9a10ce03a0ef70e4a. --- .../.classpath | 7 ---- .../.project | 34 ------------------- .../META-INF/MANIFEST.MF | 7 ---- .../build.properties | 4 --- .../feature.xml | 7 ---- 5 files changed, 59 deletions(-) delete mode 100644 bundles/de.uka.ipd.sdq.errorhandling.core/.classpath delete mode 100644 bundles/de.uka.ipd.sdq.errorhandling.core/.project delete mode 100644 bundles/de.uka.ipd.sdq.errorhandling.core/META-INF/MANIFEST.MF delete mode 100644 bundles/de.uka.ipd.sdq.errorhandling.core/build.properties diff --git a/bundles/de.uka.ipd.sdq.errorhandling.core/.classpath b/bundles/de.uka.ipd.sdq.errorhandling.core/.classpath deleted file mode 100644 index a39acb54..00000000 --- a/bundles/de.uka.ipd.sdq.errorhandling.core/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/bundles/de.uka.ipd.sdq.errorhandling.core/.project b/bundles/de.uka.ipd.sdq.errorhandling.core/.project deleted file mode 100644 index 7acea00a..00000000 --- a/bundles/de.uka.ipd.sdq.errorhandling.core/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - de.uka.ipd.sdq.errorhandling.core - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - net.sf.eclipsecs.core.CheckstyleBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - net.sf.eclipsecs.core.CheckstyleNature - - diff --git a/bundles/de.uka.ipd.sdq.errorhandling.core/META-INF/MANIFEST.MF b/bundles/de.uka.ipd.sdq.errorhandling.core/META-INF/MANIFEST.MF deleted file mode 100644 index 0047d013..00000000 --- a/bundles/de.uka.ipd.sdq.errorhandling.core/META-INF/MANIFEST.MF +++ /dev/null @@ -1,7 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: SDQ Errorhandling Core -Bundle-SymbolicName: de.uka.ipd.sdq.errorhandling.core -Bundle-Version: 5.2.0.qualifier -Bundle-Vendor: sdq.ipd.uka.de -Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/bundles/de.uka.ipd.sdq.errorhandling.core/build.properties b/bundles/de.uka.ipd.sdq.errorhandling.core/build.properties deleted file mode 100644 index a46a7c33..00000000 --- a/bundles/de.uka.ipd.sdq.errorhandling.core/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/main/java/ -output.. = target/ -bin.includes = META-INF/,\ - . diff --git a/features/de.uka.ipd.sdq.errorhandling.feature/feature.xml b/features/de.uka.ipd.sdq.errorhandling.feature/feature.xml index 3b4ae98e..8f19c99c 100644 --- a/features/de.uka.ipd.sdq.errorhandling.feature/feature.xml +++ b/features/de.uka.ipd.sdq.errorhandling.feature/feature.xml @@ -17,13 +17,6 @@ - - Date: Mon, 2 Dec 2024 18:27:49 +0100 Subject: [PATCH 3/5] removed dependency to non UI pligin --- bundles/de.uka.ipd.sdq.stoex.analyser/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bundles/de.uka.ipd.sdq.stoex.analyser/META-INF/MANIFEST.MF b/bundles/de.uka.ipd.sdq.stoex.analyser/META-INF/MANIFEST.MF index 1575bda4..85106959 100644 --- a/bundles/de.uka.ipd.sdq.stoex.analyser/META-INF/MANIFEST.MF +++ b/bundles/de.uka.ipd.sdq.stoex.analyser/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Require-Bundle: de.uka.ipd.sdq.probfunction;bundle-version="2.1.0", de.uka.ipd.sdq.probfunction.math;bundle-version="2.0.2", de.uka.ipd.sdq.stoex;bundle-version="2.2.0";visibility:=reexport, de.uka.ipd.sdq.units;bundle-version="2.1.0", - de.uka.ipd.sdq.errorhandling.core;bundle-version="5.2.0", + de.uka.ipd.sdq.errorhandling;bundle-version="1.0.0", org.apache.log4j Export-Package: de.uka.ipd.sdq.stoex.analyser.exceptions, de.uka.ipd.sdq.stoex.analyser.operations, diff --git a/bundles/org.palladiosimulator.commons.stoex/META-INF/MANIFEST.MF b/bundles/org.palladiosimulator.commons.stoex/META-INF/MANIFEST.MF index 202ecb5a..6a675444 100644 --- a/bundles/org.palladiosimulator.commons.stoex/META-INF/MANIFEST.MF +++ b/bundles/org.palladiosimulator.commons.stoex/META-INF/MANIFEST.MF @@ -20,8 +20,10 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport, org.eclipse.xtend.lib;bundle-version="2.14.0", org.eclipse.xtext.ecore, de.uka.ipd.sdq.stoex.analyser;visibility:=reexport, - de.uka.ipd.sdq.errorhandling.core;bundle-version="5.2.0", - org.palladiosimulator.commons;bundle-version="5.2.0" + de.uka.ipd.sdq.errorhandling, + org.palladiosimulator.commons;bundle-version="5.2.0", + org.palladiosimulator.core-commons.mwe2;bundle-version="5.2.0";resolution:=optional, + org.eclipse.ui Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.palladiosimulator.commons.stoex, org.palladiosimulator.commons.stoex.api, From eecf5584c5b74b8a4a7342f235f0d69ec8b117a8 Mon Sep 17 00:00:00 2001 From: Ralf Sieger Date: Mon, 2 Dec 2024 18:33:54 +0100 Subject: [PATCH 4/5] removed switch to github runner due to failing UI tests --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f4de6f8c..0936c5cf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,7 +6,6 @@ jobs: Palladio-Core-Commons: uses: PalladioSimulator/Palladio-Build-ActionsPipeline/.github/workflows/build.yml@v3.4 with: - runner-label: ubuntu-latest use-display-output: true no-caching: true deploy-updatesite: 'releng/org.palladiosimulator.core-commons.updatesite/target/repository' From a7adcd6355f3a2ddeea8e46efbd5f4caf4badcb1 Mon Sep 17 00:00:00 2001 From: Ralf Sieger Date: Mon, 2 Dec 2024 18:49:20 +0100 Subject: [PATCH 5/5] unified versions --- .../org.palladiosimulator.commons.stoex/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/org.palladiosimulator.commons.stoex/META-INF/MANIFEST.MF b/bundles/org.palladiosimulator.commons.stoex/META-INF/MANIFEST.MF index 6a675444..1a86cc72 100644 --- a/bundles/org.palladiosimulator.commons.stoex/META-INF/MANIFEST.MF +++ b/bundles/org.palladiosimulator.commons.stoex/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport, org.eclipse.xtend.lib;bundle-version="2.14.0", org.eclipse.xtext.ecore, de.uka.ipd.sdq.stoex.analyser;visibility:=reexport, - de.uka.ipd.sdq.errorhandling, + de.uka.ipd.sdq.errorhandling;bundle-version="1.0.0", org.palladiosimulator.commons;bundle-version="5.2.0", org.palladiosimulator.core-commons.mwe2;bundle-version="5.2.0";resolution:=optional, org.eclipse.ui