Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "No UI" #50

Merged
merged 5 commits into from
Dec 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
7 changes: 0 additions & 7 deletions bundles/de.uka.ipd.sdq.errorhandling.core/.classpath

This file was deleted.

34 changes: 0 additions & 34 deletions bundles/de.uka.ipd.sdq.errorhandling.core/.project

This file was deleted.

This file was deleted.

4 changes: 0 additions & 4 deletions bundles/de.uka.ipd.sdq.errorhandling.core/build.properties

This file was deleted.

7 changes: 4 additions & 3 deletions bundles/de.uka.ipd.sdq.errorhandling/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.uka.ipd.sdq.errorhandling.core;
package de.uka.ipd.sdq.errorhandling;

/**
* Interface for reportable issues.
Expand Down
Original file line number Diff line number Diff line change
@@ -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}.
Expand Down Expand Up @@ -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;
}

}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.uka.ipd.sdq.errorhandling.core;
package de.uka.ipd.sdq.errorhandling;

public enum SeverityEnum {
ERROR, WARNING
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion bundles/de.uka.ipd.sdq.stoex.analyser/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 0 additions & 7 deletions features/de.uka.ipd.sdq.errorhandling.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down