Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Haug2019-01-12 11:29:57 +0000
committerJuergen Haug2019-01-12 11:30:29 +0000
commit8d023fb6af978b7da56d7f39376699d417279e9e (patch)
tree887f0c30577b1c260254b492becf59cde3de7ee6 /plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/TypeHelpers.xtend
parent322931d01d3fdf0411b2756f5aad5f582eddeed0 (diff)
downloadorg.eclipse.etrice-8d023fb6af978b7da56d7f39376699d417279e9e.tar.gz
org.eclipse.etrice-8d023fb6af978b7da56d7f39376699d417279e9e.tar.xz
org.eclipse.etrice-8d023fb6af978b7da56d7f39376699d417279e9e.zip
Bug 540562 - Support var args for operations
Diffstat (limited to 'plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/TypeHelpers.xtend')
-rw-r--r--plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/TypeHelpers.xtend18
1 files changed, 5 insertions, 13 deletions
diff --git a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/TypeHelpers.xtend b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/TypeHelpers.xtend
index 8a7e5d429..f40f09cdb 100644
--- a/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/TypeHelpers.xtend
+++ b/plugins/org.eclipse.etrice.generator/src/org/eclipse/etrice/generator/generic/TypeHelpers.xtend
@@ -22,6 +22,7 @@ package org.eclipse.etrice.generator.generic
import com.google.inject.Inject
import com.google.inject.Singleton
import java.util.List
+import org.eclipse.etrice.core.common.base.LiteralType
import org.eclipse.etrice.core.genmodel.etricegen.ActorInstance
import org.eclipse.etrice.core.genmodel.etricegen.InstanceBase
import org.eclipse.etrice.core.genmodel.etricegen.InterfaceItemInstance
@@ -29,16 +30,14 @@ import org.eclipse.etrice.core.room.ActorClass
import org.eclipse.etrice.core.room.Attribute
import org.eclipse.etrice.core.room.DataClass
import org.eclipse.etrice.core.room.DataType
-import org.eclipse.etrice.core.room.ExternalType
-import org.eclipse.etrice.core.common.base.LiteralType
+import org.eclipse.etrice.core.room.EnumerationType
+import org.eclipse.etrice.core.room.Message
import org.eclipse.etrice.core.room.PortClass
import org.eclipse.etrice.core.room.PrimitiveType
+import org.eclipse.etrice.core.room.RefableType
import org.eclipse.etrice.core.room.VarDecl
import org.eclipse.etrice.core.room.util.RoomHelpers
import org.eclipse.etrice.generator.base.IDataConfiguration
-import org.eclipse.etrice.core.room.RefableType
-import org.eclipse.etrice.core.room.Message
-import org.eclipse.etrice.core.room.EnumerationType
@Singleton
class TypeHelpers {
@@ -48,14 +47,7 @@ class TypeHelpers {
@Inject IDataConfiguration dataConfigExt
def String typeName(DataType type) {
- if (type instanceof PrimitiveType)
- return (type as PrimitiveType).targetName
- else if (type instanceof EnumerationType)
- return languageExt.getTargetType(type as EnumerationType)
- else if (type instanceof ExternalType)
- return (type as ExternalType).targetName
- else
- return type.name
+ languageExt.getDataTypeName(type)
}
//
// def String getTypeName(DataType t) {

Back to the top