Browse Source

Use 'Long' instead of 'Integer' in model interpreter.

Andreas Mülder 11 years ago
parent
commit
4a5f8baa56

+ 1 - 1
plugins/org.yakindu.sct.simulation.core.sexec/src/org/yakindu/sct/simulation/core/sexec/interpreter/StextStatementInterpreter.xtend

@@ -254,7 +254,7 @@ class StextStatementInterpreter extends AbstractStatementInterpreter {
 	}
 
 	def dispatch valueLiteral(IntLiteral literal) {
-		return literal.value
+		return literal.value as long 
 	}
 
 	def dispatch valueLiteral(HexLiteral literal) {

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

@@ -17,7 +17,7 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.yakindu.sct.simulation.ui.view.editing.BooleanEditingSupport;
 import org.yakindu.sct.simulation.ui.view.editing.EnumerationEditingSupport;
-import org.yakindu.sct.simulation.ui.view.editing.IntegerEditingSupport;
+import org.yakindu.sct.simulation.ui.view.editing.LongEditingSupport;
 import org.yakindu.sct.simulation.ui.view.editing.MultiEditingSupport;
 import org.yakindu.sct.simulation.ui.view.editing.RealEditingSupport;
 import org.yakindu.sct.simulation.ui.view.editing.StringEditingSupport;
@@ -48,7 +48,7 @@ public class ExecutionContextViewerFactory {
 		valueColumn.getColumn().setWidth(100);
 		if (!readOnly)
 			valueColumn.setEditingSupport(new MultiEditingSupport(viewer, new BooleanEditingSupport(viewer),
-					new IntegerEditingSupport(viewer), new RealEditingSupport(viewer),
+					new LongEditingSupport(viewer), new RealEditingSupport(viewer),
 					new StringEditingSupport(viewer), new EnumerationEditingSupport(viewer)));
 
 		valueColumn.setLabelProvider(new ExecutionContextLabelProvider(1));

+ 5 - 5
plugins/org.yakindu.sct.simulation.ui/src/org/yakindu/sct/simulation/ui/view/editing/IntegerEditingSupport.java

@@ -22,9 +22,9 @@ import org.eclipse.swt.widgets.Composite;
  * @author andreas muelder - Initial contribution and API
  * 
  */
-public class IntegerEditingSupport extends ScopeSlotEditingSupport {
+public class LongEditingSupport extends ScopeSlotEditingSupport {
 
-	public IntegerEditingSupport(ColumnViewer viewer) {
+	public LongEditingSupport(ColumnViewer viewer) {
 		super(viewer);
 	}
 
@@ -35,7 +35,7 @@ public class IntegerEditingSupport extends ScopeSlotEditingSupport {
 		textCellEditor.setValidator(new ICellEditorValidator() {
 			public String isValid(Object value) {
 				try {
-					Integer.parseInt((String) value);
+					Long.parseLong((String) value);
 				} catch (NumberFormatException e) {
 					return "No valid integer value!";
 				}
@@ -48,14 +48,14 @@ public class IntegerEditingSupport extends ScopeSlotEditingSupport {
 
 	@Override
 	public Class<?> getSupportedType() {
-		return Integer.class;
+		return Long.class;
 	}
 
 	@Override
 	protected Object convertValue(Object element, Object value) {
 		if (value != null && value instanceof String
 				&& ((String) value).trim().length() > 0) {
-			return Integer.parseInt((String) value);
+			return Long.parseLong((String) value);
 		}
 		return null;
 	}