Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2016-10-04 07:02:02 +0000
committerHenrik Rentz-Reichert2016-10-17 12:28:00 +0000
commit1c2b5f9d2204ce3c033e4f2a4be08713bfebff66 (patch)
treee5d7a014c9feb606736f8c6df7b26b3c7881045f /plugins/org.eclipse.etrice.ui.common.base
parent0723a9ccc971b0be4c108447ecb02f9842b49ac5 (diff)
parent43cd5f4a5f5babb1d48b8c65cd161171f18c1cdd (diff)
downloadorg.eclipse.etrice-1c2b5f9d2204ce3c033e4f2a4be08713bfebff66.tar.gz
org.eclipse.etrice-1c2b5f9d2204ce3c033e4f2a4be08713bfebff66.tar.xz
org.eclipse.etrice-1c2b5f9d2204ce3c033e4f2a4be08713bfebff66.zip
transition to Neon
* resource map uses Neon update site * removed KIELER and layout features from Buckminster cspec (cannot be installed into Neon) * removed kieler and layout feature projects * upgraded BREE to Java 1.8 where necessary * eTrice-rt launch config with Java 1.8 * updated JUnit launch configs to Java 1.8 Change-Id: I35f8ac2819480dec7f5fe739ed2445af137a445f
Diffstat (limited to 'plugins/org.eclipse.etrice.ui.common.base')
-rw-r--r--plugins/org.eclipse.etrice.ui.common.base/.classpath2
-rw-r--r--plugins/org.eclipse.etrice.ui.common.base/.settings/org.eclipse.jdt.core.prefs6
-rw-r--r--plugins/org.eclipse.etrice.ui.common.base/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/dialogs/AbstractPropertyDialog.java3
-rw-r--r--plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/editor/CustomUpdateBehavior.java5
5 files changed, 9 insertions, 9 deletions
diff --git a/plugins/org.eclipse.etrice.ui.common.base/.classpath b/plugins/org.eclipse.etrice.ui.common.base/.classpath
index ad32c83a7..eca7bdba8 100644
--- a/plugins/org.eclipse.etrice.ui.common.base/.classpath
+++ b/plugins/org.eclipse.etrice.ui.common.base/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/plugins/org.eclipse.etrice.ui.common.base/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.etrice.ui.common.base/.settings/org.eclipse.jdt.core.prefs
index c537b6306..0c68a61dc 100644
--- a/plugins/org.eclipse.etrice.ui.common.base/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.etrice.ui.common.base/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/org.eclipse.etrice.ui.common.base/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.common.base/META-INF/MANIFEST.MF
index 8f9019c89..317b50a29 100644
--- a/plugins/org.eclipse.etrice.ui.common.base/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.common.base/META-INF/MANIFEST.MF
@@ -25,7 +25,7 @@ Require-Bundle: org.eclipse.etrice.core.common.ui;bundle-version="1.1.0",
org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100",
org.eclipse.ui.ide;bundle-version="3.9.2",
org.eclipse.help
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Import-Package: org.apache.log4j
Export-Package: org.eclipse.etrice.ui.common.base,
diff --git a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/dialogs/AbstractPropertyDialog.java b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/dialogs/AbstractPropertyDialog.java
index 350ca7bd6..b8482662d 100644
--- a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/dialogs/AbstractPropertyDialog.java
+++ b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/dialogs/AbstractPropertyDialog.java
@@ -70,7 +70,8 @@ import org.eclipse.ui.forms.widgets.Form;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.xtext.resource.IEObjectDescription;
-
+// note: the FormDialog of org.eclipse.ui.forms.source_3.7.0 requires JavaSE-1.8
+// therefore we need to set the BREE of this plug-in also to Java 8
public abstract class AbstractPropertyDialog extends FormDialog {
private class GlobalStatus extends ComputedValue {
diff --git a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/editor/CustomUpdateBehavior.java b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/editor/CustomUpdateBehavior.java
index 3916cac29..1502fb98f 100644
--- a/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/editor/CustomUpdateBehavior.java
+++ b/plugins/org.eclipse.etrice.ui.common.base/src/org/eclipse/etrice/ui/common/base/editor/CustomUpdateBehavior.java
@@ -24,10 +24,9 @@ import org.eclipse.emf.transaction.impl.TransactionalEditingDomainImpl;
import org.eclipse.emf.workspace.IWorkspaceCommandStack;
import org.eclipse.emf.workspace.WorkspaceEditingDomainFactory;
import org.eclipse.etrice.core.fsm.ui.FSMUiModule;
-import org.eclipse.etrice.ui.common.base.editor.CustomResourceSetProvider;
-import org.eclipse.etrice.ui.common.base.editor.IInputUriHolder;
import org.eclipse.graphiti.ui.editor.DefaultUpdateBehavior;
import org.eclipse.graphiti.ui.editor.DiagramBehavior;
+import org.eclipse.graphiti.ui.editor.IDiagramEditorInput;
import org.eclipse.graphiti.ui.internal.editor.GFWorkspaceCommandStackImpl;
import org.eclipse.xtext.resource.XtextResourceSet;
import org.eclipse.xtext.ui.resource.IResourceSetProvider;
@@ -57,7 +56,7 @@ public class CustomUpdateBehavior extends DefaultUpdateBehavior {
* @see org.eclipse.graphiti.ui.editor.DefaultUpdateBehavior#createEditingDomain()
*/
@Override
- protected void createEditingDomain() {
+ protected void createEditingDomain(IDiagramEditorInput input) {
ResourceSet resourceSet;
if (diagramBehavior.getDiagramContainer() instanceof IInputUriHolder) {
URI uri = ((IInputUriHolder)diagramBehavior.getDiagramContainer()).getInputUri();

Back to the top