summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Pielmann2012-02-02 03:51:06 (EST)
committer Stephan Born2012-04-24 04:30:15 (EDT)
commit7c64a7f20fdda2b5d07f962a671d62e185c358ee (patch)
treed382b149ae99f1aa14b5b17b32f25f644321992b
parent51acf9a52e418b2c9cd034eea55471dfa1138802 (diff)
downloadorg.eclipse.stardust.ide-7c64a7f20fdda2b5d07f962a671d62e185c358ee.zip
org.eclipse.stardust.ide-7c64a7f20fdda2b5d07f962a671d62e185c358ee.tar.gz
org.eclipse.stardust.ide-7c64a7f20fdda2b5d07f962a671d62e185c358ee.tar.bz2
Jira-ID: CRNT-22383 Merge changes done on b_dev_6_0_x after 6.0.2.GA (6.0.2.2-r49368) through 6.0.3.GA (6.0.3.6-r50668) and beyond (6.0.x HEAD) to 7.0 (trunk) - moonglow / simulation / tate / tds (org.eclipse.stardust.modeling.validation)
git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ide@53312 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/Validation_Messages.java4
-rw-r--r--modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/DataMappingValidator.java4
-rw-r--r--modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/util/TypeInfo.java2
-rw-r--r--modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/validation-messages.properties4
4 files changed, 10 insertions, 4 deletions
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 21063c1..e3e7ead 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
@@ -431,7 +431,9 @@ public static String EXC_NOT_IMPLEMENTED;
public static String WR_IS_A_RESERVED_IDENTIFIER;
-public static String WR_MAPPING_INCONSISTENT_DATA_MAPPING_ID;
+ public static String WR_MAPPING_INCONSISTENT_DATA_MAPPING_ID;
+
+ public static String MSG_REMOVED_TRANSFORMATION;
public static String WR_MAPPING_NO_IN_DATA_MAPPING_SPECIFIED;
diff --git a/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/DataMappingValidator.java b/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/DataMappingValidator.java
index bf2791e..8d464b5 100644
--- a/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/DataMappingValidator.java
+++ b/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/DataMappingValidator.java
@@ -149,7 +149,9 @@ public class DataMappingValidator implements IModelElementValidator
if (transformerKey != null)
{
dataPath = dataPath.substring(ix + 1, dataPath.length() - 1);
- System.err.println("Removed transformation: " + transformerKey + ", result: " + dataPath);
+ System.err.println(MessageFormat.format(
+ Validation_Messages.MSG_REMOVED_TRANSFORMATION,
+ transformerKey, dataPath));
}
}
}
diff --git a/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/util/TypeInfo.java b/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/util/TypeInfo.java
index 1eb3855..43a9502 100644
--- a/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/util/TypeInfo.java
+++ b/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/util/TypeInfo.java
@@ -168,7 +168,7 @@ public class TypeInfo
TypeInfo descriptor = finder.findType(superType);
if (descriptor == null)
{
- System.err.println(Validation_Messages.CSL_ERR_UNABLE_TO_RESOLVE_CL + superType + "'."); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-1$
+ System.err.println(Validation_Messages.CSL_ERR_UNABLE_TO_RESOLVE_CL + superType + "'."); //$NON-NLS-1$
}
else
{
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 6191563..779b7e5 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
@@ -214,4 +214,6 @@ WR_IS_A_RESERVED_IDENTIFIER={0} is a reserved identifier.
WR_MAPPING_INCONSISTENT_DATA_MAPPING_ID=Inconsistent data mapping ID.
WR_MAPPING_NO_IN_DATA_MAPPING_SPECIFIED=No IN data mapping specified.
WR_MAPPING_NO_IN_DATA_MAPPING_WITH_ID_STELLE_NULL_FOUND=No IN data mapping with id {0} found.
-WR_MD_HAS_AN_OLDER_VERSION=Model has an older version. \ No newline at end of file
+WR_MD_HAS_AN_OLDER_VERSION=Model has an older version.
+MSG_COND_PERFORMER_NoDataSet=No data set for conditional performer.
+MSG_REMOVED_TRANSFORMATION=Removed transformation: {0}, result: {1} \ No newline at end of file