summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Pielmann2012-05-25 07:04:53 (EDT)
committerManik Kishore2012-05-28 23:59:05 (EDT)
commit5b1d06066564483356d0dc32f7eb91f875c5000d (patch)
tree8b3e7a7531e6f2320421371875e5c2d243a8b392
parente92d490e1eb4715593e6bf4c7d71853303519f31 (diff)
downloadorg.eclipse.stardust.ide-5b1d06066564483356d0dc32f7eb91f875c5000d.zip
org.eclipse.stardust.ide-5b1d06066564483356d0dc32f7eb91f875c5000d.tar.gz
org.eclipse.stardust.ide-5b1d06066564483356d0dc32f7eb91f875c5000d.tar.bz2
Jira-ID: CRNT-23732
Condition performer- No error is shown in properties page if data path is not resolved git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ide@56594 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--modeling/org.eclipse.stardust.modeling.validation.nl/src/org/eclipse/stardust/modeling/validation/validation-messages_de.properties2
-rw-r--r--modeling/org.eclipse.stardust.modeling.validation.nl/src/org/eclipse/stardust/modeling/validation/validation-messages_en.properties2
-rw-r--r--modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/ConditionalPerformerValidator.java7
3 files changed, 11 insertions, 0 deletions
diff --git a/modeling/org.eclipse.stardust.modeling.validation.nl/src/org/eclipse/stardust/modeling/validation/validation-messages_de.properties b/modeling/org.eclipse.stardust.modeling.validation.nl/src/org/eclipse/stardust/modeling/validation/validation-messages_de.properties
index 1581faf..0b259bb 100644
--- a/modeling/org.eclipse.stardust.modeling.validation.nl/src/org/eclipse/stardust/modeling/validation/validation-messages_de.properties
+++ b/modeling/org.eclipse.stardust.modeling.validation.nl/src/org/eclipse/stardust/modeling/validation/validation-messages_de.properties
@@ -436,3 +436,5 @@ MSG_KEY_DESCRIPTOR_NO_DESCRIPTOR=<DataPath marked as key descriptor but it's not
# MSG_KEY_DESCRIPTOR_NO_DESCRIPTOR_en=DataPath marked as key descriptor but it's not a descriptor.
MSG_Scantrigger_UnspecifiedParticipant=<Unspecified participant for scan trigger>
# MSG_Scantrigger_UnspecifiedParticipant_en=Unspecified participant for scan trigger
+MSG_MissingDataPath=<Missing data path>
+# MSG_MissingDataPath=Missing data path
diff --git a/modeling/org.eclipse.stardust.modeling.validation.nl/src/org/eclipse/stardust/modeling/validation/validation-messages_en.properties b/modeling/org.eclipse.stardust.modeling.validation.nl/src/org/eclipse/stardust/modeling/validation/validation-messages_en.properties
index 9a6ce0b..2647d01 100644
--- a/modeling/org.eclipse.stardust.modeling.validation.nl/src/org/eclipse/stardust/modeling/validation/validation-messages_en.properties
+++ b/modeling/org.eclipse.stardust.modeling.validation.nl/src/org/eclipse/stardust/modeling/validation/validation-messages_en.properties
@@ -436,3 +436,5 @@ MSG_KEY_DESCRIPTOR_NO_DESCRIPTOR=DataPath marked as key descriptor but it's not
# MSG_KEY_DESCRIPTOR_NO_DESCRIPTOR_en=DataPath marked as key descriptor but it's not a descriptor.
MSG_Scantrigger_UnspecifiedParticipant=Unspecified participant for scan trigger
# MSG_Scantrigger_UnspecifiedParticipant_en=Unspecified participant for scan trigger
+MSG_MissingDataPath=Missing data path
+# MSG_MissingDataPath=Missing data path
diff --git a/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/ConditionalPerformerValidator.java b/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/ConditionalPerformerValidator.java
index eda1a48..523d9d1 100644
--- a/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/ConditionalPerformerValidator.java
+++ b/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/ConditionalPerformerValidator.java
@@ -14,6 +14,7 @@ import java.util.ArrayList;
import java.util.List;
import org.eclipse.jdt.core.IType;
+import org.eclipse.stardust.common.StringUtils;
import org.eclipse.stardust.model.xpdl.carnot.ConditionalPerformerType;
import org.eclipse.stardust.model.xpdl.carnot.DataType;
import org.eclipse.stardust.model.xpdl.carnot.DirectionType;
@@ -74,6 +75,12 @@ public class ConditionalPerformerValidator implements IModelElementValidator
result.add(Issue.error(conditionalPerformer,
Validation_Messages.MSG_COND_PERFORMER_UnsupportedType));
}
+ if (dataPath == null || StringUtils.isEmpty(dataPath))
+ {
+ result.add(Issue.warning(conditionalPerformer,
+ Validation_Messages.MSG_MissingDataPath,
+ ValidationService.PKG_CWM.getConditionalPerformerType_DataPath()));
+ }
}
catch (ValidationException e)
{