From 959d15ef067e915181c65f2a8162e5669293dcef Mon Sep 17 00:00:00 2001
From: andrea <andrea.enrici@nokia.com>
Date: Tue, 27 Feb 2018 13:21:49 +0100
Subject: [PATCH] Eliminated data types that are not standard in C, for
DIPLODOCUS data channels
---
src/main/java/ui/tmlcd/TMLDataFlowType.java | 11 +++--------
src/main/java/ui/window/JDialogTMLCompositePort.java | 5 -----
2 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/src/main/java/ui/tmlcd/TMLDataFlowType.java b/src/main/java/ui/tmlcd/TMLDataFlowType.java
index 49afa0054d..ff4bc1e4f9 100755
--- a/src/main/java/ui/tmlcd/TMLDataFlowType.java
+++ b/src/main/java/ui/tmlcd/TMLDataFlowType.java
@@ -50,13 +50,8 @@ package ui.tmlcd;
*/
public abstract class TMLDataFlowType {
- public static final String UINT_16 = "uint_16";
- public static final String UINT_32 = "uint_32";
- public static final String UINT_64 = "uint_64";
- public static final String INT_16 = "int_16";
- public static final String INT_32 = "int_32";
- public static final String INT_64 = "int_64";
- public static final String CPX_32 = "cpx_32";
- public static final String CPX_64 = "cpx_64";
+ public static final String INT_16 = "int16_t";
+ public static final String INT_32 = "int32_t";
+ public static final String INT_64 = "int64_t";
}
diff --git a/src/main/java/ui/window/JDialogTMLCompositePort.java b/src/main/java/ui/window/JDialogTMLCompositePort.java
index 545b125867..7755b51f83 100755
--- a/src/main/java/ui/window/JDialogTMLCompositePort.java
+++ b/src/main/java/ui/window/JDialogTMLCompositePort.java
@@ -188,14 +188,9 @@ public class JDialogTMLCompositePort extends JDialogBase implements ActionListen
int i;
Vector<String> dataFlowTypes = new Vector<>();
- dataFlowTypes.add( TMLDataFlowType.UINT_16 );
- dataFlowTypes.add( TMLDataFlowType.UINT_32 );
- dataFlowTypes.add( TMLDataFlowType.UINT_64 );
dataFlowTypes.add( TMLDataFlowType.INT_16 );
dataFlowTypes.add( TMLDataFlowType.INT_32 );
dataFlowTypes.add( TMLDataFlowType.INT_64 );
- dataFlowTypes.add( TMLDataFlowType.CPX_32 );
- dataFlowTypes.add( TMLDataFlowType.CPX_64 );
Container c = getContentPane();
GridBagLayout gridbag0 = new GridBagLayout();
--
GitLab