瀏覽代碼

Merge pull request #775 from Yakindu/issue_770

#770: Fixed setting float values in simulation view.
Thomas Kutz 9 年之前
父節點
當前提交
5d2c85cb6b

+ 6 - 4
plugins/org.yakindu.sct.simulation.ui/src/org/yakindu/sct/simulation/ui/view/ExecutionContextViewerFactory.java

@@ -51,9 +51,12 @@ public class ExecutionContextViewerFactory {
 		valueColumn.getColumn().setMoveable(true);
 		valueColumn.getColumn().setWidth(100);
 		if (!readOnly)
-			valueColumn.setEditingSupport(new MultiEditingSupport(viewer, new BooleanEditingSupport(viewer, provider),
-					new IntegerEditingSupport(viewer, provider), new RealEditingSupport(viewer, provider),
-					new StringEditingSupport(viewer, provider), new EnumerationEditingSupport(viewer, provider)));
+			valueColumn.setEditingSupport(new MultiEditingSupport(viewer, 
+					new RealEditingSupport(viewer, provider),
+					new IntegerEditingSupport(viewer, provider), 
+					new BooleanEditingSupport(viewer, provider),
+					new StringEditingSupport(viewer, provider), 
+					new EnumerationEditingSupport(viewer, provider)));
 
 		valueColumn.setLabelProvider(new ExecutionContextLabelProvider(1));
 
@@ -68,7 +71,6 @@ public class ExecutionContextViewerFactory {
 					@Override
 					public void afterEditorActivated(ColumnViewerEditorActivationEvent event) {
 						contentProvider.setShouldUpdate(false);
-
 					}
 
 					@Override

+ 1 - 1
plugins/org.yakindu.sct.simulation.ui/src/org/yakindu/sct/simulation/ui/view/editing/ScopeSlotEditingSupport.java

@@ -43,7 +43,7 @@ public abstract class ScopeSlotEditingSupport extends PublicEditingSupport {
 			if (!((ExecutionSlot) element).isWritable())
 				return false;
 			Type type = ((ExecutionSlot) element).getType();
-			return provider.getTypeSystem().haveCommonType(type, getSupportedType());
+			return provider.getTypeSystem().isSuperType(getSupportedType(), type);
 		}
 		return false;
 	}