Skip to content

Commit aca9933

Browse files
juancadavidjuancadavid
committed
Merge remote-tracking branch 'origin/ToscaProfile' into toscaCodeGen
2 parents a0d7950 + 92a619d commit aca9933

File tree

161 files changed

+3309
-13528
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+3309
-13528
lines changed

‎ToscaDesigner/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<!-- definition -->
66
<groupId>fr.softeam</groupId>
77
<artifactId>toscadesigner</artifactId>
8-
<version>0.0.1</version>
8+
<version>0.1.0</version>
99
<name>ToscaDesigner</name>
1010
<repositories>
1111
<repository>

‎ToscaDesigner/src/main/conf/module.properties‎

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ propertydefinition.PropertiesType1Table.any.description=
6161
propertydefinition.PropertiesType1Table.any.label=any
6262
propertydefinition.PropertiesType1Table.propertyMappings.description=
6363
propertydefinition.PropertiesType1Table.propertyMappings.label=propertyMappings
64+
propertydefinition.PropertyDefinitionTypeTable.description.description=
65+
propertydefinition.PropertyDefinitionTypeTable.description.label=description
66+
propertydefinition.PropertyDefinitionTypeTable.required.description=
67+
propertydefinition.PropertyDefinitionTypeTable.required.label=required
6468
propertydefinition.RelationshipConstraintTypeTable.any.description=
6569
propertydefinition.RelationshipConstraintTypeTable.any.label=any
6670
propertydefinition.RelationshipConstraintTypeTable.constraintType.description=
@@ -101,8 +105,6 @@ propertydefinition.TCapabilityDefinitionTable.lowerBound.description=
101105
propertydefinition.TCapabilityDefinitionTable.lowerBound.label=lowerBound
102106
propertydefinition.TCapabilityDefinitionTable.upperBound.description=
103107
propertydefinition.TCapabilityDefinitionTable.upperBound.label=upperBound
104-
propertydefinition.TCapabilityDefinitionTable.validSourceType.description=
105-
propertydefinition.TCapabilityDefinitionTable.validSourceType.label=validSourceType
106108
propertydefinition.TCapabilityRefTable.name.description=
107109
propertydefinition.TCapabilityRefTable.name.label=name
108110
propertydefinition.TCapabilityRefTable.ref.description=
@@ -217,28 +219,40 @@ propertydefinition.TImplementationArtifactTable.interfaceName.description=
217219
propertydefinition.TImplementationArtifactTable.interfaceName.label=interfaceName
218220
propertydefinition.TImplementationArtifactTable.operationName.description=
219221
propertydefinition.TImplementationArtifactTable.operationName.label=operationName
220-
propertydefinition.TInterfaceTable.PropertyTypeDefinition2.description=
221-
propertydefinition.TInterfaceTable.PropertyTypeDefinition2.label=PropertyTypeDefinition2
222-
propertydefinition.TInterfaceTable.name.description=
223-
propertydefinition.TInterfaceTable.name.label=name
222+
propertydefinition.TInterfaceTable.notifications.description=
223+
propertydefinition.TInterfaceTable.notifications.label=notifications
224224
propertydefinition.TNodeTemplateProperty.maxInstances.description=
225225
propertydefinition.TNodeTemplateProperty.maxInstances.label=maxInstances
226226
propertydefinition.TNodeTemplateProperty.minInstances.description=
227227
propertydefinition.TNodeTemplateProperty.minInstances.label=minInstances
228228
propertydefinition.TNodeTemplateProperty.name.description=
229229
propertydefinition.TNodeTemplateProperty.name.label=name
230-
propertydefinition.TOperationTable.inputParameters.description=
231-
propertydefinition.TOperationTable.inputParameters.label=inputParameters
230+
propertydefinition.TOperationTable.description.description=
231+
propertydefinition.TOperationTable.description.label=description
232+
propertydefinition.TOperationTable.implementation.description=
233+
propertydefinition.TOperationTable.implementation.label=implementation
234+
propertydefinition.TOperationTable.inputs.description=
235+
propertydefinition.TOperationTable.inputs.label=inputs
232236
propertydefinition.TOperationTable.name.description=
233237
propertydefinition.TOperationTable.name.label=name
234-
propertydefinition.TOperationTable.outputParameters.description=
235-
propertydefinition.TOperationTable.outputParameters.label=outputParameters
238+
propertydefinition.TOperationTable.outputs.description=
239+
propertydefinition.TOperationTable.outputs.label=outputs
240+
propertydefinition.TParameterTable.constraints.description=
241+
propertydefinition.TParameterTable.constraints.label=constraints
242+
propertydefinition.TParameterTable.default.description=
243+
propertydefinition.TParameterTable.default.label=default
244+
propertydefinition.TParameterTable.description.description=
245+
propertydefinition.TParameterTable.description.label=description
236246
propertydefinition.TParameterTable.name.description=
237247
propertydefinition.TParameterTable.name.label=name
238248
propertydefinition.TParameterTable.required.description=
239249
propertydefinition.TParameterTable.required.label=required
250+
propertydefinition.TParameterTable.status.description=
251+
propertydefinition.TParameterTable.status.label=status
240252
propertydefinition.TParameterTable.type.description=
241253
propertydefinition.TParameterTable.type.label=type
254+
propertydefinition.TParameterTable.value.description=
255+
propertydefinition.TParameterTable.value.label=value
242256
propertydefinition.TPlansPropertyTable.targetNamespace.description=
243257
propertydefinition.TPlansPropertyTable.targetNamespace.label=targetNamespace
244258
propertydefinition.TPolicyTable.description.description=
@@ -305,6 +319,7 @@ propertytable.NodeOperationTypeTable.label=NodeOperationTypeTable
305319
propertytable.NodeTypeReferenceTypeTable.label=NodeTypeReferenceTypeTable
306320
propertytable.PropertiesDefinitionType.label=PropertiesDefinitionType
307321
propertytable.PropertiesType1Table.label=PropertiesType1Table
322+
propertytable.PropertyDefinitionTypeTable.label=PropertyDefinitionTypeTable
308323
propertytable.RelationshipConstraintTypeTable.label=RelationshipConstraintTypeTable
309324
propertytable.RelationshipOperationTypeTable.label=RelationshipOperationTypeTable
310325
propertytable.TArtifactReferenceTable.label=TArtifactReferenceTable
@@ -575,6 +590,8 @@ tool.DeploymentArtifacts.label=DeploymentArtifacts
575590
tool.DeploymentArtifacts.tooltip=Deployment Artifacts
576591
tool.Import.label=Import
577592
tool.Import.tooltip=Import
593+
tool.Interface.label=Interface
594+
tool.Interface.tooltip=Create an interface
578595
tool.Metadata.label=Metadata
579596
tool.Metadata.tooltip=Metadata
580597
tool.NodeTemplate.label=NodeTemplate

‎ToscaDesigner/src/main/conf/module_fr.properties‎

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ propertydefinition.PropertiesType1Table.any.description=
6161
propertydefinition.PropertiesType1Table.any.label=any
6262
propertydefinition.PropertiesType1Table.propertyMappings.description=
6363
propertydefinition.PropertiesType1Table.propertyMappings.label=propertyMappings
64+
propertydefinition.PropertyDefinitionTypeTable.description.description=
65+
propertydefinition.PropertyDefinitionTypeTable.description.label=description
66+
propertydefinition.PropertyDefinitionTypeTable.required.description=
67+
propertydefinition.PropertyDefinitionTypeTable.required.label=required
6468
propertydefinition.RelationshipConstraintTypeTable.any.description=
6569
propertydefinition.RelationshipConstraintTypeTable.any.label=any
6670
propertydefinition.RelationshipConstraintTypeTable.constraintType.description=
@@ -101,8 +105,6 @@ propertydefinition.TCapabilityDefinitionTable.lowerBound.description=
101105
propertydefinition.TCapabilityDefinitionTable.lowerBound.label=lowerBound
102106
propertydefinition.TCapabilityDefinitionTable.upperBound.description=
103107
propertydefinition.TCapabilityDefinitionTable.upperBound.label=upperBound
104-
propertydefinition.TCapabilityDefinitionTable.validSourceType.description=
105-
propertydefinition.TCapabilityDefinitionTable.validSourceType.label=validSourceType
106108
propertydefinition.TCapabilityRefTable.name.description=
107109
propertydefinition.TCapabilityRefTable.name.label=name
108110
propertydefinition.TCapabilityRefTable.ref.description=
@@ -217,28 +219,40 @@ propertydefinition.TImplementationArtifactTable.interfaceName.description=
217219
propertydefinition.TImplementationArtifactTable.interfaceName.label=interfaceName
218220
propertydefinition.TImplementationArtifactTable.operationName.description=
219221
propertydefinition.TImplementationArtifactTable.operationName.label=operationName
220-
propertydefinition.TInterfaceTable.PropertyTypeDefinition2.description=
221-
propertydefinition.TInterfaceTable.PropertyTypeDefinition2.label=PropertyTypeDefinition2
222-
propertydefinition.TInterfaceTable.name.description=
223-
propertydefinition.TInterfaceTable.name.label=name
222+
propertydefinition.TInterfaceTable.notifications.description=
223+
propertydefinition.TInterfaceTable.notifications.label=notifications
224224
propertydefinition.TNodeTemplateProperty.maxInstances.description=
225225
propertydefinition.TNodeTemplateProperty.maxInstances.label=maxInstances
226226
propertydefinition.TNodeTemplateProperty.minInstances.description=
227227
propertydefinition.TNodeTemplateProperty.minInstances.label=minInstances
228228
propertydefinition.TNodeTemplateProperty.name.description=
229229
propertydefinition.TNodeTemplateProperty.name.label=name
230-
propertydefinition.TOperationTable.inputParameters.description=
231-
propertydefinition.TOperationTable.inputParameters.label=inputParameters
230+
propertydefinition.TOperationTable.description.description=
231+
propertydefinition.TOperationTable.description.label=description
232+
propertydefinition.TOperationTable.implementation.description=
233+
propertydefinition.TOperationTable.implementation.label=implementation
234+
propertydefinition.TOperationTable.inputs.description=
235+
propertydefinition.TOperationTable.inputs.label=inputs
232236
propertydefinition.TOperationTable.name.description=
233237
propertydefinition.TOperationTable.name.label=name
234-
propertydefinition.TOperationTable.outputParameters.description=
235-
propertydefinition.TOperationTable.outputParameters.label=outputParameters
238+
propertydefinition.TOperationTable.outputs.description=
239+
propertydefinition.TOperationTable.outputs.label=outputs
240+
propertydefinition.TParameterTable.constraints.description=
241+
propertydefinition.TParameterTable.constraints.label=constraints
242+
propertydefinition.TParameterTable.default.description=
243+
propertydefinition.TParameterTable.default.label=default
244+
propertydefinition.TParameterTable.description.description=
245+
propertydefinition.TParameterTable.description.label=description
236246
propertydefinition.TParameterTable.name.description=
237247
propertydefinition.TParameterTable.name.label=name
238248
propertydefinition.TParameterTable.required.description=
239249
propertydefinition.TParameterTable.required.label=required
250+
propertydefinition.TParameterTable.status.description=
251+
propertydefinition.TParameterTable.status.label=status
240252
propertydefinition.TParameterTable.type.description=
241253
propertydefinition.TParameterTable.type.label=type
254+
propertydefinition.TParameterTable.value.description=
255+
propertydefinition.TParameterTable.value.label=value
242256
propertydefinition.TPlansPropertyTable.targetNamespace.description=
243257
propertydefinition.TPlansPropertyTable.targetNamespace.label=targetNamespace
244258
propertydefinition.TPolicyTable.description.description=
@@ -305,6 +319,7 @@ propertytable.NodeOperationTypeTable.label=NodeOperationTypeTable
305319
propertytable.NodeTypeReferenceTypeTable.label=NodeTypeReferenceTypeTable
306320
propertytable.PropertiesDefinitionType.label=PropertiesDefinitionType
307321
propertytable.PropertiesType1Table.label=PropertiesType1Table
322+
propertytable.PropertyDefinitionTypeTable.label=PropertyDefinitionTypeTable
308323
propertytable.RelationshipConstraintTypeTable.label=RelationshipConstraintTypeTable
309324
propertytable.RelationshipOperationTypeTable.label=RelationshipOperationTypeTable
310325
propertytable.TArtifactReferenceTable.label=TArtifactReferenceTable
@@ -575,6 +590,8 @@ tool.DeploymentArtifacts.label=DeploymentArtifacts
575590
tool.DeploymentArtifacts.tooltip=
576591
tool.Import.label=Import
577592
tool.Import.tooltip=
593+
tool.Interface.label=Interface
594+
tool.Interface.tooltip=
578595
tool.Metadata.label=Metadata
579596
tool.Metadata.tooltip=
580597
tool.NodeTemplate.label=NodeTemplate

‎ToscaDesigner/src/main/conf/res/icon/gui/PropertyDefinitionType48.ICON.png‎

320 Bytes
Loading

‎ToscaDesigner/src/main/conf/res/icon/gui/TInterface48.ICON.png‎

184 Bytes
Loading

‎ToscaDesigner/src/main/conf/toscadesigner.ramc‎

2.74 KB
Binary file not shown.

‎ToscaDesigner/src/main/java/fr/softeam/toscadesigner/api/IToscaDesignerPeerModule.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
import com.modeliosoft.modelio.javadesigner.annotations.objid;
44
import org.modelio.api.module.IPeerModule;
55

6-
@objid ("1dc24328-a397-490e-9df9-150f7b3f742f")
6+
@objid ("0b3043c0-695b-42e5-a69a-8298dc63b89c")
77
public interface IToscaDesignerPeerModule extends IPeerModule {
8-
@objid ("f937c7da-40c3-478c-b588-74b666fcecd9")
8+
@objid ("40e56225-331d-4513-ba49-a71b06c20f83")
99
public static final String MODULE_NAME = "ToscaDesigner";
1010

11-
@objid ("bbeb78ba-dc64-4ac1-9085-5a559e18d7ca")
11+
@objid ("c4c43a05-9347-486a-856d-1adce593d9d7")
1212
public static final String TOSCA_STYLE = "ToscaStyle";
1313
}
1414

0 commit comments

Comments
 (0)