summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Pielmann2012-05-24 07:20:21 (EDT)
committer Manik Kishore2012-05-28 23:59:01 (EDT)
commit6c495443f787f4b6521140933c2a4c4ce04286d8 (patch)
tree115f4ba59cacf9dc8ca8fcc08d845c8680b54c73
parent3e3de16dde88db64c538c787001a4a4609a852da (diff)
downloadorg.eclipse.stardust.ide-6c495443f787f4b6521140933c2a4c4ce04286d8.zip
org.eclipse.stardust.ide-6c495443f787f4b6521140933c2a4c4ce04286d8.tar.gz
org.eclipse.stardust.ide-6c495443f787f4b6521140933c2a4c4ce04286d8.tar.bz2
Jira-ID: CRNT-22834
Auto ID generation does not work for Process Interface Parameters property dialog git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ide@56554 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/FormalParameterPropertyPage.java31
1 files changed, 18 insertions, 13 deletions
diff --git a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/FormalParameterPropertyPage.java b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/FormalParameterPropertyPage.java
index eccd1f6..518d67c 100644
--- a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/FormalParameterPropertyPage.java
+++ b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/FormalParameterPropertyPage.java
@@ -219,19 +219,24 @@ public class FormalParameterPropertyPage extends AbstractModelElementPropertyPag
dataFilter.setReferencedModel(referencedModelType);
categoryCombo.getViewer().setInput(typeFilters);
-
- String selectedCategory = parameterType.getDataType().getCarnotType();
- if (selectedCategory == null)
- {
- if (parameterType.getDataType().getBasicType() != null)
- {
- selectedCategory = "primitive"; //$NON-NLS-1$
- }
- if (parameterType.getDataType().getDeclaredType() != null)
- {
- selectedCategory = "struct"; //$NON-NLS-1$
- }
- }
+ String selectedCategory = null;
+ DataTypeType selectedDataType = parameterType.getDataType();
+ if (selectedDataType != null)
+ {
+ selectedCategory = parameterType.getDataType().getCarnotType();
+ if (selectedCategory == null)
+ {
+ if (parameterType.getDataType().getBasicType() != null)
+ {
+ selectedCategory = "primitive"; //$NON-NLS-1$
+ }
+ if (parameterType.getDataType().getDeclaredType() != null)
+ {
+ selectedCategory = "struct"; //$NON-NLS-1$
+ }
+ }
+ }
+
ViewerFilter selectedFilter = getSelectedFilter(selectedCategory);
if (selectedFilter != null)