Merge pull request #50 from PalladioSimulator/revert-45-no_ui

Revert "No UI"

.github/workflows/build.yml

@@ -6,7 +6,6 @@ jobs:
   Palladio-Core-Commons:
     uses: PalladioSimulator/Palladio-Build-ActionsPipeline/.github/workflows/[email protected]
     with:
-      runner-label: ubuntu-latest
       use-display-output: true
       no-caching: true
       deploy-updatesite: 'releng/org.palladiosimulator.core-commons.updatesite/target/repository'

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

bundles/de.uka.ipd.sdq.errorhandling.core/src/main/java/de/uka/ipd/sdq/errorhandling/core/IIssue.java → 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.

bundles/de.uka.ipd.sdq.errorhandling.core/src/main/java/de/uka/ipd/sdq/errorhandling/core/SeverityAndIssue.java → 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;
     }
 
 }

bundles/de.uka.ipd.sdq.errorhandling.core/src/main/java/de/uka/ipd/sdq/errorhandling/core/SeverityEnum.java → 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

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

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 {
 

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,

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 {

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;

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;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
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Export-Package: org.palladiosimulator.commons.stoex,
  org.palladiosimulator.commons.stoex.api,

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;

features/de.uka.ipd.sdq.errorhandling.feature/feature.xml

@@ -17,13 +17,6 @@
       <import plugin="org.palladiosimulator.branding"/>
    </requires>
 
-   <plugin
-         id="de.uka.ipd.sdq.errorhandling.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="de.uka.ipd.sdq.errorhandling"
          download-size="0"