Skip to content

Commit 6a59d10

Browse files
EntenwilliNicolas-Boltz
authored andcommitted
Fix some editor issues
1 parent 983531a commit 6a59d10

4 files changed

Lines changed: 41 additions & 3 deletions

File tree

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package org.dataflowanalysis.pcm.extension.dddsl.ui;
2+
3+
import java.util.UUID;
4+
5+
import org.eclipse.emf.common.util.URI;
6+
import org.eclipse.xtext.resource.FileExtensionProvider;
7+
import org.eclipse.xtext.resource.XtextResource;
8+
import org.eclipse.xtext.resource.XtextResourceSet;
9+
import org.eclipse.xtext.ui.editor.embedded.IEditedResourceProvider;
10+
11+
import com.google.inject.Inject;
12+
13+
@SuppressWarnings("restriction")
14+
public class DDDslIEditedResourceProvider implements IEditedResourceProvider {
15+
16+
@Inject
17+
private FileExtensionProvider fileExtensionProvider;
18+
19+
@Override
20+
public XtextResource createResource() {
21+
final var rs = new XtextResourceSet();
22+
final var tmpURI = URI.createURI("virtual:/" + UUID.randomUUID().toString() + "." + fileExtensionProvider.getPrimaryFileExtension());
23+
return (XtextResource) rs.createResource(tmpURI);
24+
}
25+
26+
}

bundles/org.dataflowanalysis.pcm.extension.dddsl.ui/src/org/dataflowanalysis/pcm/extension/dddsl/ui/DDDslUiModule.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,19 @@
44
package org.dataflowanalysis.pcm.extension.dddsl.ui;
55

66
import org.eclipse.ui.plugin.AbstractUIPlugin;
7+
import org.eclipse.xtext.ui.editor.embedded.IEditedResourceProvider;
78

89
/**
910
* Use this class to register components to be used within the Eclipse IDE.
1011
*/
12+
@SuppressWarnings("restriction")
1113
public class DDDslUiModule extends AbstractDDDslUiModule {
1214

1315
public DDDslUiModule(AbstractUIPlugin plugin) {
1416
super(plugin);
1517
}
18+
19+
public Class<? extends IEditedResourceProvider> bindIEditedResourceProvider() {
20+
return DDDslIEditedResourceProvider.class;
21+
}
1622
}

bundles/org.dataflowanalysis.pcm.extension.editor.sirius/META-INF/MANIFEST.MF

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ Require-Bundle: org.eclipse.ui,
1515
org.eclipse.emf.edit.ui,
1616
org.dataflowanalysis.pcm.extension.dddsl.ui;bundle-version="5.1.0",
1717
org.eclipse.xtext.ui;bundle-version="2.24.0",
18-
org.eclipse.emf.transaction;bundle-version="1.9.1"
18+
org.eclipse.emf.transaction;bundle-version="1.9.1",
19+
org.palladiosimulator.pcm
1920
Bundle-ActivationPolicy: lazy
2021
Bundle-RequiredExecutionEnvironment: JavaSE-17
2122
Bundle-Vendor: %providerName

bundles/org.dataflowanalysis.pcm.extension.editor.sirius/src/org/dataflowanalysis/pcm/extension/editor/sirius/Services.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,13 @@ protected static String serialize(ConfidentialityVariableCharacterisation charac
156156
}
157157

158158
protected static SerializationHelper createSerializationHelper() {
159-
var editedResourceProvider = getInjector().getInstance(IEditedResourceProvider.class);
160-
return new SerializationHelper(editedResourceProvider);
159+
try {
160+
var editedResourceProvider = getInjector().getInstance(IEditedResourceProvider.class);
161+
return new SerializationHelper(editedResourceProvider);
162+
} catch (Exception e) {
163+
e.printStackTrace();
164+
return null;
165+
}
161166
}
162167

163168
protected static Injector getInjector() {

0 commit comments

Comments
 (0)