summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Pielmann2012-06-06 10:19:18 (EDT)
committer Manik Kishore2012-06-12 04:26:23 (EDT)
commit602e63a3b3b183180d087c9ce1945373bebca685 (patch)
tree2b5f90a377c41505b39527975234b77a62b28951
parentf3dfb98175c0c4002fb928b9be2b0f8132e44a00 (diff)
downloadorg.eclipse.stardust.ide-602e63a3b3b183180d087c9ce1945373bebca685.zip
org.eclipse.stardust.ide-602e63a3b3b183180d087c9ce1945373bebca685.tar.gz
org.eclipse.stardust.ide-602e63a3b3b183180d087c9ce1945373bebca685.tar.bz2
Jira-ID: CRNT-22390
Modeler: Scan Trigger with no Document Data access point specified should not be allowed. git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ide@56889 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--modeling/org.eclipse.stardust.modeling.validation.nl/src/org/eclipse/stardust/modeling/validation/validation-messages_de.properties4
-rw-r--r--modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/Validation_Messages.java2
-rw-r--r--modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/spi/triggerTypes/ManualTriggerValidator.java11
-rw-r--r--modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/validation-messages.properties3
4 files changed, 17 insertions, 3 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 0b259bb..0f80db1 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
@@ -437,4 +437,6 @@ MSG_KEY_DESCRIPTOR_NO_DESCRIPTOR=<DataPath marked as key descriptor but it's not
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
+# MSG_MissingDataPath_en=Missing data path
+MSG_Scantrigger_NoDocumentDataSpecified=<No document data specified for scan trigger.>
+# MSG_Scantrigger_NoDocumentDataSpecified_en=No document data specified for scan trigger.
diff --git a/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/Validation_Messages.java b/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/Validation_Messages.java
index 323ca18..8eef4f8 100644
--- a/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/Validation_Messages.java
+++ b/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/Validation_Messages.java
@@ -216,6 +216,8 @@ public class Validation_Messages extends NLS
public static String MSG_Trigger_UnspecifiedParticipant;
public static String MSG_Scantrigger_UnspecifiedParticipant;
+
+ public static String MSG_Scantrigger_NoDocumentDataSpecified;
public static String MSG_Trigger_InvalidParticipant;
diff --git a/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/spi/triggerTypes/ManualTriggerValidator.java b/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/spi/triggerTypes/ManualTriggerValidator.java
index fd68433..c7831e4 100644
--- a/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/spi/triggerTypes/ManualTriggerValidator.java
+++ b/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/spi/triggerTypes/ManualTriggerValidator.java
@@ -47,9 +47,18 @@ public class ManualTriggerValidator implements IModelElementValidator
if (metaType != null)
{
typeId = metaType.getId();
+ if (typeId != null && typeId.equals("scan"))
+ {
+ if (((TriggerType) element).getAccessPoint().isEmpty())
+ {
+ result.add(Issue.error(element, MessageFormat.format(
+ Validation_Messages.MSG_Scantrigger_NoDocumentDataSpecified, typeId),
+ PredefinedConstants.PARTICIPANT_ATT));
+ }
+ }
}
}
-
+
if (participantId == null)
{
result.add(Issue.error(element, MessageFormat.format(Validation_Messages.MSG_Trigger_UnspecifiedParticipant,
diff --git a/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/validation-messages.properties b/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/validation-messages.properties
index d9a4b69..ba17e60 100644
--- a/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/validation-messages.properties
+++ b/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/validation-messages.properties
@@ -221,4 +221,5 @@ MSG_KEY_DESCRIPTOR_PRIMITIVE=Structured key descriptors must have primitive type
MSG_KEY_DESCRIPTOR_INDEXED_PERSISTENT=Structured key descriptors must be indexed and persistent.
MSG_KEY_DESCRIPTOR_NO_SCHEMA=No schema found for structured key descriptor.
MSG_KEY_DESCRIPTOR_NO_DESCRIPTOR=DataPath marked as key descriptor but it's not a descriptor.
-MSG_Scantrigger_UnspecifiedParticipant=Unspecified participant for scan trigger \ No newline at end of file
+MSG_Scantrigger_UnspecifiedParticipant=Unspecified participant for scan trigger
+MSG_Scantrigger_NoDocumentDataSpecified=No document data specified for scan trigger. \ No newline at end of file