Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2011-10-27 09:44:59 +0000
committerHenrik Rentz-Reichert2011-10-27 09:44:59 +0000
commit6f9f6b8768b9bef075f971263f6a8f6456d6a51e (patch)
tree654a8e4e26bfb0689aa067fb4ca41c9510d2b30c
parent5793fdaeda5af0d671221df306ab7dd0920344f9 (diff)
downloadorg.eclipse.etrice-6f9f6b8768b9bef075f971263f6a8f6456d6a51e.tar.gz
org.eclipse.etrice-6f9f6b8768b9bef075f971263f6a8f6456d6a51e.tar.xz
org.eclipse.etrice-6f9f6b8768b9bef075f971263f6a8f6456d6a51e.zip
[core.room] created a place to store default values for room elements
-rw-r--r--plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/RoomDefaultValues.java37
-rw-r--r--plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/naming/RoomFragmentProvider.java6
2 files changed, 42 insertions, 1 deletions
diff --git a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/RoomDefaultValues.java b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/RoomDefaultValues.java
new file mode 100644
index 000000000..c61542c88
--- /dev/null
+++ b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/RoomDefaultValues.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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
+ *
+ * CONTRIBUTORS:
+ * Henrik Rentz-Reichert (initial contribution)
+ *
+ *******************************************************************************/
+
+package org.eclipse.etrice.core;
+
+/**
+ * @author Henrik Rentz-Reichert
+ *
+ */
+public class RoomDefaultValues {
+
+ private static boolean useDataDrivenStateMachine = false;
+
+ /**
+ * @param useDataDrivenStateMachine the useDataDrivenStateMachine to set
+ */
+ public static void setUseDataDrivenStateMachine(boolean useDataDrivenStateMachine) {
+ RoomDefaultValues.useDataDrivenStateMachine = useDataDrivenStateMachine;
+ }
+
+ /**
+ * @return the useDataDrivenStateMachine
+ */
+ public static boolean isUseDataDrivenStateMachine() {
+ return useDataDrivenStateMachine;
+ }
+
+}
diff --git a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/naming/RoomFragmentProvider.java b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/naming/RoomFragmentProvider.java
index 00dfff9cf..cad17f875 100644
--- a/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/naming/RoomFragmentProvider.java
+++ b/plugins/org.eclipse.etrice.core.room/src/org/eclipse/etrice/core/naming/RoomFragmentProvider.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.etrice.core.RoomDefaultValues;
import org.eclipse.etrice.core.room.ActorClass;
import org.eclipse.etrice.core.room.ActorContainerClass;
import org.eclipse.etrice.core.room.ActorContainerRef;
@@ -466,8 +467,11 @@ public class RoomFragmentProvider implements IFragmentProvider {
private StateGraph getStateGraph(RoomClass rc, String remainder) {
if (rc instanceof ActorClass) {
StateGraph sg = ((ActorClass) rc).getStateMachine();
- if (sg==null)
+ if (sg==null) {
((ActorClass) rc).setStateMachine(RoomFactory.eINSTANCE.createStateMachine());
+ ((ActorClass) rc).getStateMachine().setDataDriven(RoomDefaultValues.isUseDataDrivenStateMachine());
+ sg = ((ActorClass) rc).getStateMachine();
+ }
int begin = 0;
int end = remainder.indexOf(SEP);
while (end>=0) {

Back to the top