summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Pielmann2012-02-01 07:48:58 (EST)
committerStephan Born2012-04-24 04:30:08 (EDT)
commitbe16a121578e5235ae0f9b2b20713efcd2bd14be (patch)
tree5f1c8f47b04511cf7ee5c5bd48c8a1943eca629d
parentb08bdea8b275098f25b31b69bd7b293a3a976b41 (diff)
downloadorg.eclipse.stardust.ide-be16a121578e5235ae0f9b2b20713efcd2bd14be.zip
org.eclipse.stardust.ide-be16a121578e5235ae0f9b2b20713efcd2bd14be.tar.gz
org.eclipse.stardust.ide-be16a121578e5235ae0f9b2b20713efcd2bd14be.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.repository.common)
git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ide@53305 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--modeling/org.eclipse.stardust.modeling.repository.common/Repository_Messages.java42
-rw-r--r--modeling/org.eclipse.stardust.modeling.repository.common/repository-messages.properties27
-rw-r--r--modeling/org.eclipse.stardust.modeling.repository.common/src/org/eclipse/stardust/modeling/repository/common/impl/AttributeImpl.java4
-rw-r--r--modeling/org.eclipse.stardust.modeling.repository.common/src/org/eclipse/stardust/modeling/repository/common/ui/ObjectDescriptorListContentProvider.java2
-rw-r--r--modeling/org.eclipse.stardust.modeling.repository.common/src/org/eclipse/stardust/modeling/repository/common/ui/dialogs/ErrorDialog.java4
5 files changed, 74 insertions, 5 deletions
diff --git a/modeling/org.eclipse.stardust.modeling.repository.common/Repository_Messages.java b/modeling/org.eclipse.stardust.modeling.repository.common/Repository_Messages.java
new file mode 100644
index 0000000..29c95b5
--- /dev/null
+++ b/modeling/org.eclipse.stardust.modeling.repository.common/Repository_Messages.java
@@ -0,0 +1,42 @@
+package ag.carnot.bpm.modeling.repository;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Repository_Messages extends NLS {
+ private static final String BUNDLE_NAME = "ag.carnot.bpm.modeling.repository.repository-messages"; //$NON-NLS-1$
+ public static String BUT_REPLACE_EXISTING_ELEMENT_WITH_NEW_ONE;
+ public static String BUT_REUSE_ELEMENT_IN_THE_MD;
+ public static String BUT_USE_OPTION_FOR_ALL_DUPLICATE_ELEMENTS;
+ public static String DIA_ERROR;
+ public static String DIA_ERROR_OPENING_CONNECTION;
+ public static String DIA_LOGIN;
+ public static String LBL_CONTAINER;
+ public static String LBL_FEATURE;
+ public static String LBL_ID;
+ public static String LBL_NAME;
+ public static String LBL_NAME_KLEIN_GESCHRIEBEN;
+ public static String LBL_NULL;
+ public static String LBL_REQUIRES_THE_ELEMENTS_LISTED_BELOW;
+ public static String MSG_FORMAT_CONNECTION_NULL_DOES_NOT_EXIST;
+ public static String MSG_FORMAT_CONNECTION_NULL_IS_CLOSED;
+ public static String MSG_FORMAT_NO_HANDLER_FOUND_FOR_CONNECTION_TYPE_NULL;
+ public static String TXT_CONFLICT;
+ public static String TXT_ERROR;
+ public static String TXT_INVALID_CONTAINING_FEATURE;
+ public static String EXC_IS_NOT_VALID_CLASSIFIER;
+ public static String TXT_NAME;
+ public static String TXT_REQUIRED_ELEMENTS;
+ public static String TXT_TYPELESS;
+ public static String TXT_VALUE;
+ public static String LBL_ANOTHER_TYPE_WITH_ID_ALREADY_EXISTS_IN_MODEL;
+ public static String TXT_INVISIBLE;
+
+ static {
+ // initialize resource bundle
+ NLS.initializeMessages(BUNDLE_NAME,
+ Repository_Messages.class);
+ }
+
+ private Repository_Messages() {
+ }
+}
diff --git a/modeling/org.eclipse.stardust.modeling.repository.common/repository-messages.properties b/modeling/org.eclipse.stardust.modeling.repository.common/repository-messages.properties
new file mode 100644
index 0000000..ecfac15
--- /dev/null
+++ b/modeling/org.eclipse.stardust.modeling.repository.common/repository-messages.properties
@@ -0,0 +1,27 @@
+BUT_REPLACE_EXISTING_ELEMENT_WITH_NEW_ONE=Replace existing element with the new one.
+BUT_REUSE_ELEMENT_IN_THE_MD=Reuse the element in the model.
+BUT_USE_OPTION_FOR_ALL_DUPLICATE_ELEMENTS=Use Option for all duplicate elements.
+DIA_ERROR=Error
+DIA_ERROR_OPENING_CONNECTION=Error opening connection.
+DIA_LOGIN=Login
+LBL_CONTAINER=Container:
+LBL_FEATURE=Feature:
+LBL_ID=Id:
+LBL_NAME=Name:
+LBL_NAME_KLEIN_GESCHRIEBEN=name
+LBL_NULL=null
+LBL_REQUIRES_THE_ELEMENTS_LISTED_BELOW=requires the elements listed below:
+MSG_FORMAT_CONNECTION_NULL_DOES_NOT_EXIST=Connection ''{0}'' does not exist.
+MSG_FORMAT_CONNECTION_NULL_IS_CLOSED=Connection ''{0}'' is closed.
+MSG_FORMAT_NO_HANDLER_FOUND_FOR_CONNECTION_TYPE_NULL=No handler found for connection type ''{0}''.
+TXT_CONFLICT=Conflict
+TXT_ERROR=Error
+TXT_INVALID_CONTAINING_FEATURE=invalid containing feature
+TXT_INVISIBLE=invisible
+EXC_IS_NOT_VALID_CLASSIFIER=The class ''{0}'' is not a valid classifier
+TXT_NAME=name
+TXT_REQUIRED_ELEMENTS=Required Elements
+TXT_TYPELESS=typeless
+TXT_VALUE=value
+LBL_ANOTHER_TYPE_WITH_ID_ALREADY_EXISTS_IN_MODEL=Another {0} with id ''{1}'' already exists in the model.
+
diff --git a/modeling/org.eclipse.stardust.modeling.repository.common/src/org/eclipse/stardust/modeling/repository/common/impl/AttributeImpl.java b/modeling/org.eclipse.stardust.modeling.repository.common/src/org/eclipse/stardust/modeling/repository/common/impl/AttributeImpl.java
index 90ca1c6..fe90143 100644
--- a/modeling/org.eclipse.stardust.modeling.repository.common/src/org/eclipse/stardust/modeling/repository/common/impl/AttributeImpl.java
+++ b/modeling/org.eclipse.stardust.modeling.repository.common/src/org/eclipse/stardust/modeling/repository/common/impl/AttributeImpl.java
@@ -232,9 +232,9 @@ public class AttributeImpl extends EObjectImpl implements Attribute
return super.toString();
StringBuffer result = new StringBuffer(super.toString());
- result.append(" (" +Repository_Messages.TXT_NAME + ": "); //$NON-NLS-1$ //$NON-NLS-3$
+ result.append(" (" +Repository_Messages.TXT_NAME + ": "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
result.append(name);
- result.append(","+ Repository_Messages.TXT_VALUE +": "); //$NON-NLS-1$ //$NON-NLS-3$
+ result.append(","+ Repository_Messages.TXT_VALUE +": "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
result.append(value);
result.append(')');
return result.toString();
diff --git a/modeling/org.eclipse.stardust.modeling.repository.common/src/org/eclipse/stardust/modeling/repository/common/ui/ObjectDescriptorListContentProvider.java b/modeling/org.eclipse.stardust.modeling.repository.common/src/org/eclipse/stardust/modeling/repository/common/ui/ObjectDescriptorListContentProvider.java
index b0f218e..df08ed3 100644
--- a/modeling/org.eclipse.stardust.modeling.repository.common/src/org/eclipse/stardust/modeling/repository/common/ui/ObjectDescriptorListContentProvider.java
+++ b/modeling/org.eclipse.stardust.modeling.repository.common/src/org/eclipse/stardust/modeling/repository/common/ui/ObjectDescriptorListContentProvider.java
@@ -137,6 +137,6 @@ public class ObjectDescriptorListContentProvider implements ITreeContentProvider
public String toString()
{
- return "<"+Repository_Messages.TXT_TYPELESS+">"; //$NON-NLS-1$ //$NON-NLS-3$
+ return "<"+Repository_Messages.TXT_TYPELESS+">"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
}
diff --git a/modeling/org.eclipse.stardust.modeling.repository.common/src/org/eclipse/stardust/modeling/repository/common/ui/dialogs/ErrorDialog.java b/modeling/org.eclipse.stardust.modeling.repository.common/src/org/eclipse/stardust/modeling/repository/common/ui/dialogs/ErrorDialog.java
index 09afd61..028957a 100644
--- a/modeling/org.eclipse.stardust.modeling.repository.common/src/org/eclipse/stardust/modeling/repository/common/ui/dialogs/ErrorDialog.java
+++ b/modeling/org.eclipse.stardust.modeling.repository.common/src/org/eclipse/stardust/modeling/repository/common/ui/dialogs/ErrorDialog.java
@@ -42,7 +42,7 @@ public class ErrorDialog extends Dialog
protected Control createDialogArea(Composite parent)
{
- getShell().setText(Repository_Messages.TXT_ERROR + ":"+ Repository_Messages.TXT_INVALID_CONTAINING_FEATURE); //$NON-NLS-2$
+ getShell().setText(Repository_Messages.TXT_ERROR + ":"+ Repository_Messages.TXT_INVALID_CONTAINING_FEATURE); //$NON-NLS-1$
Composite composite = (Composite) super.createDialogArea(parent);
GridData data = (GridData) composite.getLayoutData();
@@ -55,7 +55,7 @@ public class ErrorDialog extends Dialog
FormBuilder.createLabel(content, createIdLabel(MergeUtils.getId(eObject), eObject.eClass())));
FormBuilder.createLabel(content, Repository_Messages.LBL_NAME); //$NON-NLS-2$
String name = MergeUtils.getName(eObject);
- FormBuilder.createLabel(content, name == null ? "<" +Repository_Messages.LBL_NAME_KLEIN_GESCHRIEBEN + ">" : name); //$NON-NLS-1$ //$NON-NLS-3$
+ FormBuilder.createLabel(content, name == null ? "<" +Repository_Messages.LBL_NAME_KLEIN_GESCHRIEBEN + ">" : name); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
FormBuilder.createLabel(content, Repository_Messages.LBL_CONTAINER); //$NON-NLS-2$
EObject container = eObject.eContainer();