summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Pielmann2012-01-31 09:53:58 (EST)
committerStephan Born2012-04-24 04:29:56 (EDT)
commit079650c1e8fee9852013fb94e53f6489c0d0061d (patch)
tree51d840511f542d9b5b12b53877124596b338eba5
parentcaa2627ab8bdb1bd6e586acb522215a6f0235a4b (diff)
downloadorg.eclipse.stardust.ide-079650c1e8fee9852013fb94e53f6489c0d0061d.zip
org.eclipse.stardust.ide-079650c1e8fee9852013fb94e53f6489c0d0061d.tar.gz
org.eclipse.stardust.ide-079650c1e8fee9852013fb94e53f6489c0d0061d.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.integration.mail)
git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ide@53274 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--modeling/org.eclipse.stardust.modeling.integration.mail/src/org/eclipse/stardust/modeling/integration/mail/Mail_Messages.java2
-rw-r--r--modeling/org.eclipse.stardust.modeling.integration.mail/src/org/eclipse/stardust/modeling/integration/mail/application/MailPropertyPage.java2
-rw-r--r--modeling/org.eclipse.stardust.modeling.integration.mail/src/org/eclipse/stardust/modeling/integration/mail/mail-messages.properties2
3 files changed, 5 insertions, 1 deletions
diff --git a/modeling/org.eclipse.stardust.modeling.integration.mail/src/org/eclipse/stardust/modeling/integration/mail/Mail_Messages.java b/modeling/org.eclipse.stardust.modeling.integration.mail/src/org/eclipse/stardust/modeling/integration/mail/Mail_Messages.java
index 839e031..cc3bd78 100644
--- a/modeling/org.eclipse.stardust.modeling.integration.mail/src/org/eclipse/stardust/modeling/integration/mail/Mail_Messages.java
+++ b/modeling/org.eclipse.stardust.modeling.integration.mail/src/org/eclipse/stardust/modeling/integration/mail/Mail_Messages.java
@@ -63,5 +63,7 @@ public class Mail_Messages extends NLS
public static String TXT_NO_RECEIVER_MAIL_ADDRESS_SPECIFIED;
public static String TXT_NO_SENDER_MAIL_ADDRESS_SPECIFIED;
public static String TXT_OUTPUT_VALUES;
+ public static String COL_NAME;
+ public static String COL_VALUE;
}
diff --git a/modeling/org.eclipse.stardust.modeling.integration.mail/src/org/eclipse/stardust/modeling/integration/mail/application/MailPropertyPage.java b/modeling/org.eclipse.stardust.modeling.integration.mail/src/org/eclipse/stardust/modeling/integration/mail/application/MailPropertyPage.java
index 1522c1e..cfb44f2 100644
--- a/modeling/org.eclipse.stardust.modeling.integration.mail/src/org/eclipse/stardust/modeling/integration/mail/application/MailPropertyPage.java
+++ b/modeling/org.eclipse.stardust.modeling.integration.mail/src/org/eclipse/stardust/modeling/integration/mail/application/MailPropertyPage.java
@@ -376,7 +376,7 @@ public class MailPropertyPage extends AbstractModelElementPropertyPage
SWT.BORDER | SWT.MULTI | SWT.FULL_SELECTION,
OutputValue.class, new String[]
{ "name" , "value"}, new String[] //$NON-NLS-1$ //$NON-NLS-2$
- { "Name" , "Value"}, new int[] //$NON-NLS-1$ //$NON-NLS-2$
+ { Mail_Messages.COL_NAME , Mail_Messages.COL_VALUE}, new int[]
{ SWT.LEFT, SWT.LEFT }, new int[]
{ 200, 200 }, new Image[]
{ null, null });
diff --git a/modeling/org.eclipse.stardust.modeling.integration.mail/src/org/eclipse/stardust/modeling/integration/mail/mail-messages.properties b/modeling/org.eclipse.stardust.modeling.integration.mail/src/org/eclipse/stardust/modeling/integration/mail/mail-messages.properties
index a495f49..caf3393 100644
--- a/modeling/org.eclipse.stardust.modeling.integration.mail/src/org/eclipse/stardust/modeling/integration/mail/mail-messages.properties
+++ b/modeling/org.eclipse.stardust.modeling.integration.mail/src/org/eclipse/stardust/modeling/integration/mail/mail-messages.properties
@@ -40,3 +40,5 @@ TXT_NO_MAIL_SERVER_SPECIFIED=No Mail Server specified.
TXT_NO_RECEIVER_MAIL_ADDRESS_SPECIFIED=No receiver mail address specified.
TXT_NO_SENDER_MAIL_ADDRESS_SPECIFIED=No sender mail address specified.
TXT_OUTPUT_VALUES=Output Values
+COL_NAME=Name
+COL_VALUE=Value