Merge ssh://git.eclipse.org/gitroot/etrice/org.eclipse.etrice

5 files changed, 86 insertions, 23 deletions

diff --git a/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF
index 81bd15b5a..0d57d9535 100644
--- a/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF
@@ -18,7 +18,10 @@ Require-Bundle: org.eclipse.etrice.core.room;bundle-version="0.1.0",
  org.eclipse.core.databinding.beans;bundle-version="1.2.100",

  org.eclipse.gef;bundle-version="3.6.1",

  org.eclipse.emf.ecore.xmi;bundle-version="2.5.0",

- org.eclipse.emf.transaction;bundle-version="1.4.0"

+ org.eclipse.emf.transaction;bundle-version="1.4.0",

+ org.eclipse.xtext;bundle-version="2.0.0",

+ org.eclipse.xtext.ui;bundle-version="2.0.0",

+ org.eclipse.xtext.ui.shared;bundle-version="2.0.0"

 Bundle-ActivationPolicy: lazy

 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 Bundle-Vendor: eTrice (Incubation)

diff --git a/plugins/org.eclipse.etrice.ui.behavior/plugin.xml b/plugins/org.eclipse.etrice.ui.behavior/plugin.xml
index 48e585b8e..ea588fa4c 100644
--- a/plugins/org.eclipse.etrice.ui.behavior/plugin.xml
+++ b/plugins/org.eclipse.etrice.ui.behavior/plugin.xml
@@ -48,4 +48,18 @@
       </imageProvider>

    </extension>

 

+	<extension

+		point="org.eclipse.emf.ecore.extension_parser">

+		<parser

+			class="org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl"

+			type="behavior">

+		</parser>

+	</extension>

+	<extension point="org.eclipse.xtext.extension_resourceServiceProvider">

+        <resourceServiceProvider

+            class="org.eclipse.etrice.ui.behavior.link.ExecutableExtensionFactory:org.eclipse.xtext.ui.resource.IResourceUIServiceProvider"

+            uriExtension="behavior">

+        </resourceServiceProvider>

+    </extension>

+

 </plugin>

diff --git a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/link/ExecutableExtensionFactory.java b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/link/ExecutableExtensionFactory.java
new file mode 100644
index 000000000..0feb75686
--- /dev/null
+++ b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/link/ExecutableExtensionFactory.java
@@ -0,0 +1,29 @@
+package org.eclipse.etrice.ui.behavior.link;

+

+import static com.google.inject.Guice.createInjector;

+import static com.google.inject.util.Modules.override;

+

+import org.eclipse.etrice.ui.behavior.Activator;

+import org.eclipse.xtext.ui.guice.AbstractGuiceAwareExecutableExtensionFactory;

+import org.eclipse.xtext.ui.resource.generic.EmfUiModule;

+import org.eclipse.xtext.ui.shared.SharedStateModule;

+import org.osgi.framework.Bundle;

+

+import com.google.inject.Injector;

+

+public class ExecutableExtensionFactory extends

+		AbstractGuiceAwareExecutableExtensionFactory {

+

+	@Override

+	protected Bundle getBundle() {

+		return Activator.getDefault().getBundle();

+	}

+

+	@Override

+	protected Injector getInjector() {

+		return createInjector(override(

+				override(new ResourceModule()).with(new SharedStateModule()))

+				.with(new EmfUiModule(Activator.getDefault())));

+	}

+

+}

diff --git a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/link/ResourceModule.java b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/link/ResourceModule.java
new file mode 100644
index 000000000..4c60d1286
--- /dev/null
+++ b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/link/ResourceModule.java
@@ -0,0 +1,36 @@
+/*******************************************************************************

+ * Copyright (c) 2010 protos software gmbh (http://www.protos.de).

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *******************************************************************************/

+

+package org.eclipse.etrice.ui.behavior.link;

+

+import org.eclipse.xtext.resource.generic.AbstractGenericResourceRuntimeModule;

+

+/**

+ * @author Henrik Rentz-Reichert - initial contribution and API

+ *

+ */

+public class ResourceModule extends

+		AbstractGenericResourceRuntimeModule {

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.xtext.resource.generic.AbstractGenericResourceRuntimeModule#getLanguageName()

+	 */

+	@Override

+	protected String getLanguageName() {

+		return "org.eclipse.etrice.structure.diagrams";

+	}

+

+	/* (non-Javadoc)

+	 * @see org.eclipse.xtext.resource.generic.AbstractGenericResourceRuntimeModule#getFileExtensions()

+	 */

+	@Override

+	protected String getFileExtensions() {

+		return "structure";

+	}

+

+}

diff --git a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/StateSupport.java b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/StateSupport.java
index a090a25d4..7da856d07 100644
--- a/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/StateSupport.java
+++ b/plugins/org.eclipse.etrice.ui.behavior/src/org/eclipse/etrice/ui/behavior/support/StateSupport.java
@@ -16,14 +16,11 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.EcoreUtil;

 import org.eclipse.etrice.core.naming.RoomNameProvider;

 import org.eclipse.etrice.core.room.ActorClass;

-import org.eclipse.etrice.core.room.ActorContainerRef;

-import org.eclipse.etrice.core.room.ActorRef;

 import org.eclipse.etrice.core.room.BaseState;

 import org.eclipse.etrice.core.room.RefinedState;

 import org.eclipse.etrice.core.room.RoomFactory;

 import org.eclipse.etrice.core.room.State;

 import org.eclipse.etrice.core.room.StateGraph;

-import org.eclipse.etrice.core.room.SubSystemRef;

 import org.eclipse.etrice.core.room.TrPoint;

 import org.eclipse.etrice.core.room.util.RoomHelpers;

 import org.eclipse.etrice.ui.behavior.ImageProvider;

@@ -595,16 +592,13 @@ public class StateSupport {
 					}

 				}

 				

-				// check class name

+				// check name

 				int last = containerShape.getChildren().size()-1;

 				if (last>=0) {

 					GraphicsAlgorithm ga = containerShape.getChildren().get(last).getGraphicsAlgorithm();

 					if (ga instanceof Text) {

-						if (bo instanceof ActorContainerRef) {

-							String label = getLabel((ActorContainerRef) bo);

-							if (!((Text)ga).getValue().equals(label))

-								return Reason.createTrueReason("Class name is out of date");

-						}

+						if (!((Text)ga).getValue().equals(s.getName()))

+							return Reason.createTrueReason("State name is out of date");

 					}

 				}

 				

@@ -840,19 +834,6 @@ public class StateSupport {
 		public ICustomFeature[] getCustomFeatures(ICustomContext context) {

 			return new ICustomFeature[] { new PropertyFeature(fp), new GoDownFeature(fp), new CreateSubGraphFeature(fp) };

 		}

-

-		protected static String getLabel(ActorContainerRef acr) {

-			String className = "<unknown>";

-			if (acr instanceof ActorRef) {

-				if (((ActorRef)acr).getType()!=null)

-					className = ((ActorRef)acr).getType().getName();

-			}

-			else if (acr instanceof SubSystemRef) {

-				if (((SubSystemRef)acr).getType()!=null)

-					className = ((SubSystemRef)acr).getType().getName();

-			}

-			return acr.getName()+"\n("+className+")";

-		}

 	}

 	

 	private class BehaviorProvider extends DefaultToolBehaviorProvider {