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.data.structured)

git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ide@53262 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b

9 files changed, 78 insertions, 147 deletions

diff --git a/modeling/org.eclipse.stardust.modeling.data.structured/plugin.properties b/modeling/org.eclipse.stardust.modeling.data.structured/plugin.properties
index 4e444da..6218bc9 100644
--- a/modeling/org.eclipse.stardust.modeling.data.structured/plugin.properties
+++ b/modeling/org.eclipse.stardust.modeling.data.structured/plugin.properties
@@ -20,3 +20,5 @@ indexed = Indexed
 notIndexed = Not Indexed
 persistent = Persistent
 transient = Transient
+storage = Storage
+infinityProcessPlatform = Infinity Process Platform
diff --git a/modeling/org.eclipse.stardust.modeling.data.structured/plugin.xml b/modeling/org.eclipse.stardust.modeling.data.structured/plugin.xml
index 47ccf78..1e7b794 100644
--- a/modeling/org.eclipse.stardust.modeling.data.structured/plugin.xml
+++ b/modeling/org.eclipse.stardust.modeling.data.structured/plugin.xml
@@ -42,7 +42,7 @@
 			namespace="http://www.carnot.ag/workflowmodel/3.1/struct">
 			<element name="storage"
 				empty="true"
-				label="Storage">
+				label="%storage">
 				<element name="indexed"
 					empty="false"
 					label="%indexing"
diff --git a/modeling/org.eclipse.stardust.modeling.data.structured/src/org/eclipse/stardust/modeling/data/structured/StructLabelProvider.java b/modeling/org.eclipse.stardust.modeling.data.structured/src/org/eclipse/stardust/modeling/data/structured/StructLabelProvider.java
index 6e14999..380b24d 100644
--- a/modeling/org.eclipse.stardust.modeling.data.structured/src/org/eclipse/stardust/modeling/data/structured/StructLabelProvider.java
+++ b/modeling/org.eclipse.stardust.modeling.data.structured/src/org/eclipse/stardust/modeling/data/structured/StructLabelProvider.java
@@ -166,11 +166,27 @@ public class StructLabelProvider extends LabelProvider
       
       if (element instanceof EObject)
       {
-         return (String) xpdlTextProvider.doSwitch((EObject) element);
+         String xpdlProviderText = (String) xpdlTextProvider.doSwitch((EObject) element);
+         String xpdli18nText = getTextForProviderText(xpdlProviderText);
+         if (xpdli18nText == null)
+         {
+            return xpdlProviderText;
+         }
+         return xpdli18nText;
       }
       return getDefaultLabel(element);
    }
 
+   private String getTextForProviderText(String xpdlProviderText)
+   {
+      if (xpdlProviderText.equalsIgnoreCase("<sequence>")) { //$NON-NLS-1$
+         return Structured_Messages.LBL_Sequence;
+      }
+      // Further types
+      // ...
+      return null;
+   }
+
    private String getDefaultLabel(Object element)
    {
       switch (column)
@@ -461,7 +477,7 @@ public class StructLabelProvider extends LabelProvider
          case 1:
             if (attribute.getTypeDefinition() == null)
             {
-               return("<unresolved>");
+               return("<unresolved>"); //$NON-NLS-1$
             }
             return attribute.getTypeDefinition().getName();
          case 2:
diff --git a/modeling/org.eclipse.stardust.modeling.data.structured/src/org/eclipse/stardust/modeling/data/structured/Structured_Messages.java b/modeling/org.eclipse.stardust.modeling.data.structured/src/org/eclipse/stardust/modeling/data/structured/Structured_Messages.java
index fa6d406..fd5cd1c 100644
--- a/modeling/org.eclipse.stardust.modeling.data.structured/src/org/eclipse/stardust/modeling/data/structured/Structured_Messages.java
+++ b/modeling/org.eclipse.stardust.modeling.data.structured/src/org/eclipse/stardust/modeling/data/structured/Structured_Messages.java
@@ -16,11 +16,13 @@ public class Structured_Messages extends NLS
 {
    private static final String BUNDLE_NAME = "org.eclipse.stardust.modeling.data.structured.structured-messages"; //$NON-NLS-1$
    
+   public static String SYNCHRONIZE_NAMESPACE_AND_ID;
+
    public static String ACTION_DELETE;
 
-public static String BadURLPrefixMessage;
+   public static String BadURLPrefixMessage;
 
-public static String BUT_CREATE_PR_AND_SER_APP;
+   public static String BUT_CREATE_PR_AND_SER_APP;
 
    public static String CardinalityAtLeastOneLabel;
 
@@ -50,27 +52,23 @@ public static String BUT_CREATE_PR_AND_SER_APP;
 
    public static String ComplexTypePropertyPage_DuplicateFieldErrorMessage;
 
-   public static String ComplexTypePropertyPage_DuplicateTypeErrorMesage;
-
    public static String ComplexTypePropertyPage_ElementPlaceholder;
 
    public static String ComplexTypePropertyPage_InvalidFieldIdentifierErrorMessage;
-
-   public static String ComplexTypePropertyPage_InvalidTypeIdentifierErrorMessage;
-
+   
    public static String ERROR_MSG_IMPORTED;
 
-public static String ERROR_MSG_SELE_CONTAINS_ELEM_WITH_REF_IN_SCHEMAS_NOT_INCLUDED_IN_SELE;
+   public static String ERROR_MSG_SELE_CONTAINS_ELEM_WITH_REF_IN_SCHEMAS_NOT_INCLUDED_IN_SELE;
 
-public static String ERROR_MSG_SELE_DOINST_CONTAIN_ANY_ROOT_COMPONENTS;
+   public static String ERROR_MSG_SELE_DOINST_CONTAIN_ANY_ROOT_COMPONENTS;
 
-public static String ERROR_MSG_UNRESOLVED_RE;
+   public static String ERROR_MSG_UNRESOLVED_RE;
 
-public static String EXC_XOM_DOM_TRANSFORMATION_IS_NOT_VALID_FOR_THIS_DATAPATH;
+   public static String EXC_XOM_DOM_TRANSFORMATION_IS_NOT_VALID_FOR_THIS_DATAPATH;
 
-public static String EXC_DURING_VALIDATION;
+   public static String EXC_DURING_VALIDATION;
 
-public static String ExpandAllLabel;
+   public static String ExpandAllLabel;
 
    public static String ExportedTypeLabel;
 
@@ -90,11 +88,9 @@ public static String ExpandAllLabel;
 
    public static String LBL_FALSE;
 
-public static String LBL;
-
-public static String LBL_TRUE;
+   public static String LBL_TRUE;
 
-public static String LoadButtonLabel;
+   public static String LoadButtonLabel;
 
    public static String LoadingSchemaTaskName;
 
@@ -105,8 +101,6 @@ public static String LoadButtonLabel;
    public static String MoveUpButtonLabel;
 
    public static String ComplexTypePropertyPage_NewElementPlaceholder;
-   
-   public static String ComplexTypePropertyPage_NoNameErrorMessage;
 
    public static String CreateCompositeAction_ActionLabel;
 
@@ -123,35 +117,11 @@ public static String LoadButtonLabel;
    public static String DataStructPropertyPage_DeclaredTypesLabel;
 
    public static String DataStructPropertyPage_DetailsLabel;
-   
-   public static String DataStructPropertyPage_GroupLabel;
 
    public static String DataValidator_InvalidType;
 
-   public static String DataValidator_NoActualType;
-
-   public static String DataValidator_NoDeclaredTypeId;
-
-   public static String DataValidator_NoLocation;
-
-   public static String DataValidator_NoMatchingTypeDeclarationId;
-
-   public static String DataValidator_NoSchema;
-
-   public static String DataValidator_NoTypeDeclarations;
-
-   public static String DataValidator_NoTypeDefinition;
-
    public static String DataValidator_NoType;
 
-   public static String DataValidator_NoTypeName;
-
-   public static String DataValidator_TypeNotFound;
-
-   public static String DataValidator_UnsupportedDataType;
-
-   public static String DataValidator_UnsupportedNamespace;
-
    public static String ExportSchemaWizardTitle;
 
    public static String ExportTypeDeclarationAction_ActionLabel0;
@@ -170,9 +140,7 @@ public static String LoadButtonLabel;
 
    public static String OpenXSDEditorAction_TaskName;
 
-   public static String SaveAsDialog_overwriteQuestion;
-
-public static String SaveOriginalSchemaLabel;
+   public static String SaveOriginalSchemaLabel;
 
    public static String SaveResourceLabel;
 
@@ -190,27 +158,15 @@ public static String SaveOriginalSchemaLabel;
 
    public static String SelectSchemaFromLabel;
 
-public static String SIMPLE_DATE_FORMAT;
+   public static String SIMPLE_DATE_FORMAT;
 
    public static String SimpleTypePropertyPage_BaseTypeLabel;
 
-   public static String SimpleTypePropertyPage_DuplicateTypeErrorMessage;
-
-   public static String SimpleTypePropertyPage_DuplicateValueErrorMessage;
-
    public static String SimpleTypePropertyPage_DuplicateValueMessage;
 
-   public static String SimpleTypePropertyPage_EmptyValueErrorMessage;
-
-   public static String SimpleTypePropertyPage_EmptyValuesMessage;
-
    public static String SimpleTypePropertyPage_InvalidLengthMessage;
-   
-   public static String SimpleTypePropertyPage_EnumerationButtonLabel;
-
-   public static String SimpleTypePropertyPage_EnumerationNameLabel;
 
-   public static String SimpleTypePropertyPage_InvalidIdentifierErrorMessage;
+   public static String SimpleTypePropertyPage_EnumerationButtonLabel;
 
    public static String SimpleTypePropertyPage_MaxLengthLabel;
 
@@ -220,27 +176,15 @@ public static String SIMPLE_DATE_FORMAT;
 
    public static String SimpleTypePropertyPage_NewFacetPlaceholder;
 
-   public static String SimpleTypePropertyPage_NewValueLabel;
-
-   public static String SimpleTypePropertyPage_NoNameErrorMessage;
-
    public static String SimpleTypePropertyPage_PatternedButtonLabel;
 
-   public static String SimpleTypePropertyPage_ValuesColumnLabel;
-   
    public static String SimpleTypePropertyPage_MaxLengthLongValue;
-   
+
    public static String SimpleTypePropertyPage_MinLengthLongValue;
 
    public static String SpecifyURLMessage;
 
-public static String STRINGBUFFER_REFERENCED_SCHEMA_SPECIFIED_AT_THE_FOLLOWING_LOCATION_WERE_NOT_FOUND;
-   
-   public static String TargetNamespaceLabel;
-
-public static String TXT_FRAGEZEICHEN;
-
-public static String TXT_UNRESOLVED;
+   public static String STRINGBUFFER_REFERENCED_SCHEMA_SPECIFIED_AT_THE_FOLLOWING_LOCATION_WERE_NOT_FOUND;
 
    public static String TypeColumnLabel;
 
@@ -254,36 +198,36 @@ public static String TXT_UNRESOLVED;
 
    public static String ValuesColumnLabel;
 
-public static String VIEW_DUMMY;
-
    public static String WorkbenchFilesLabel;
 
    public static String WorkbenchLocation;
 
    public static String XSDTypesPageDescription;
 
-   public static String TypeDeclarationPropertyPage_EmptyValuesMessage;
-
-   public static String TypeDeclarationPropertyPage_DuplicateValueMessage;
-   
-   public static String TypeDeclarationPropertyPage_InvalidIdentifierErrorMessage;
-   
    public static String ComplexTypePropertyPage_ResourceNotFound;
- 
-   public static String DefaultValueColumnLabel;
-   
+
    public static String DefaultValueValidation_NotFloat;
+
    public static String DefaultValueValidation_NotDouble;
+
    public static String DefaultValueValidation_NotByte;
+
    public static String DefaultValueValidation_NotDate;
+
    public static String DefaultValueValidation_NotNumber;
 
-public static String DIA_MISSING_REFERENCES;
-   
-   public static String ImportIdDialog_Label;   
-   public static String ImportIdDialog_Id;   
-   public static String ImportIdDialog_DuplicateId;   
+   public static String DIA_MISSING_REFERENCES;
+
+   public static String ImportIdDialog_Label;
+
+   public static String ImportIdDialog_Id;
+
+   public static String ImportIdDialog_DuplicateId;
+
    public static String ImportIdDialog_EmptyId;
+   
+   public static String LBL_Sequence;
+
 
 public static String Question;   
    
diff --git a/modeling/org.eclipse.stardust.modeling.data.structured/src/org/eclipse/stardust/modeling/data/structured/annotations/AnnotationLabelProvider.java b/modeling/org.eclipse.stardust.modeling.data.structured/src/org/eclipse/stardust/modeling/data/structured/annotations/AnnotationLabelProvider.java
index 2cf4782..4915d41 100644
--- a/modeling/org.eclipse.stardust.modeling.data.structured/src/org/eclipse/stardust/modeling/data/structured/annotations/AnnotationLabelProvider.java
+++ b/modeling/org.eclipse.stardust.modeling.data.structured/src/org/eclipse/stardust/modeling/data/structured/annotations/AnnotationLabelProvider.java
@@ -54,7 +54,7 @@ public class AnnotationLabelProvider extends LabelProvider
 
    public String getColumnText(Object element, int columnIndex)
    {
-      Object result = "?";
+      Object result = "?"; //$NON-NLS-1$
       if (element instanceof IAnnotation)
       {
          IAnnotation annotation = (IAnnotation) element;
diff --git a/modeling/org.eclipse.stardust.modeling.data.structured/src/org/eclipse/stardust/modeling/data/structured/annotations/AnnotationViewer.java b/modeling/org.eclipse.stardust.modeling.data.structured/src/org/eclipse/stardust/modeling/data/structured/annotations/AnnotationViewer.java
index b4656a6..c0bb3c3 100644
--- a/modeling/org.eclipse.stardust.modeling.data.structured/src/org/eclipse/stardust/modeling/data/structured/annotations/AnnotationViewer.java
+++ b/modeling/org.eclipse.stardust.modeling.data.structured/src/org/eclipse/stardust/modeling/data/structured/annotations/AnnotationViewer.java
@@ -171,7 +171,7 @@ private Map<IAnnotation, Boolean> changeAllValues = CollectionUtils.newMap();
       });
       
       annotationContentProvider.setCurrentElement(null);
-      viewer.setInput("dummy");
+      viewer.setInput("dummy"); //$NON-NLS-1$
       viewer.expandAll();
       viewer.getControl().setVisible(false);
       
diff --git a/modeling/org.eclipse.stardust.modeling.data.structured/src/org/eclipse/stardust/modeling/data/structured/annotations/ConfigurationItem.java b/modeling/org.eclipse.stardust.modeling.data.structured/src/org/eclipse/stardust/modeling/data/structured/annotations/ConfigurationItem.java
index cd5d1ad..3188546 100644
--- a/modeling/org.eclipse.stardust.modeling.data.structured/src/org/eclipse/stardust/modeling/data/structured/annotations/ConfigurationItem.java
+++ b/modeling/org.eclipse.stardust.modeling.data.structured/src/org/eclipse/stardust/modeling/data/structured/annotations/ConfigurationItem.java
@@ -94,7 +94,7 @@ public class ConfigurationItem
    
    public String getName()
    {
-      String name = getConfigurationAttribute("label");
+      String name = getConfigurationAttribute("label"); //$NON-NLS-1$
       if (name == null)
       {
          name = getConfigurationAttribute("name"); //$NON-NLS-1$
diff --git a/modeling/org.eclipse.stardust.modeling.data.structured/src/org/eclipse/stardust/modeling/data/structured/properties/TypeDeclarationPropertyPage.java b/modeling/org.eclipse.stardust.modeling.data.structured/src/org/eclipse/stardust/modeling/data/structured/properties/TypeDeclarationPropertyPage.java
index 9152a91..8cf8fc9 100644
--- a/modeling/org.eclipse.stardust.modeling.data.structured/src/org/eclipse/stardust/modeling/data/structured/properties/TypeDeclarationPropertyPage.java
+++ b/modeling/org.eclipse.stardust.modeling.data.structured/src/org/eclipse/stardust/modeling/data/structured/properties/TypeDeclarationPropertyPage.java
@@ -198,7 +198,7 @@ public class TypeDeclarationPropertyPage extends AbstractModelElementPropertyPag
          XSDSchema xsdSchema = declaration.getSchema();
          String oldTargetNamespace = xsdSchema.getTargetNamespace();
                   
-         if (!namespaceLabel.getText().equals(oldTargetNamespace == null ? "" : oldTargetNamespace))
+         if (!namespaceLabel.getText().equals(oldTargetNamespace == null ? "" : oldTargetNamespace)) //$NON-NLS-1$
          {
             xsdSchema.setTargetNamespace(TypeDeclarationUtils.computeTargetNamespace(ModelUtils.findContainingModel(declaration), id));         
          }
@@ -295,24 +295,25 @@ public class TypeDeclarationPropertyPage extends AbstractModelElementPropertyPag
             if (publicType)
             {
                ExtendedAttributeUtil.setAttribute(declaration.getExtendedAttributes(),
-                     PredefinedConstants.MODELELEMENT_VISIBILITY, "Public");
+                     PredefinedConstants.MODELELEMENT_VISIBILITY, "Public"); //$NON-NLS-1$
             }
             else
             {
                ExtendedAttributeUtil.setAttribute(declaration.getExtendedAttributes(),
-                     PredefinedConstants.MODELELEMENT_VISIBILITY, "Private");
+                     PredefinedConstants.MODELELEMENT_VISIBILITY, "Private"); //$NON-NLS-1$
             }
          }
       });
       
-      FormBuilder.createLabel(composite, " ", 2);
+      FormBuilder.createLabel(composite, " ", 2); //$NON-NLS-1$
       FormBuilder.createHorizontalSeparator(composite, 2);
-      FormBuilder.createLabel(composite, " ", 2);
-      
-      FormBuilder.createLabel(composite, Structured_Messages.SimpleTypePropertyPage_NamespaceLabel);
+      FormBuilder.createLabel(composite, " ", 2); //$NON-NLS-1$
+
+      FormBuilder.createLabel(composite,
+            Structured_Messages.SimpleTypePropertyPage_NamespaceLabel);
       namespaceLabel = FormBuilder.createLabel(composite, ""); //$NON-NLS-1$
       autoNamespaceButton = FormBuilder.createCheckBox(composite,
-            "Synchronize namespace with type id", 2);
+            Structured_Messages.SYNCHRONIZE_NAMESPACE_AND_ID, 2); //$NON-NLS-1$
       autoNamespaceButton.setSelection(PlatformUI.getPreferenceStore().getBoolean(
             BpmProjectNature.PREFERENCE_AUTO_ID_GENERATION));
 
@@ -326,7 +327,7 @@ public class TypeDeclarationPropertyPage extends AbstractModelElementPropertyPag
      if (txtName.getText().getText().length() == 0
            || txtId.getText().getText().length() == 0)           
      {
-        setMessage(Structured_Messages.TypeDeclarationPropertyPage_EmptyValuesMessage, ERROR);
+        setMessage("", ERROR); //$NON-NLS-1$
         setValid(false);
         return;
      }
@@ -334,7 +335,7 @@ public class TypeDeclarationPropertyPage extends AbstractModelElementPropertyPag
      if(!ModelUtils.isValidId(txtId.getText().getText()))
      {
         setMessage(MessageFormat.format(
-              Structured_Messages.ComplexTypePropertyPage_InvalidFieldIdentifierErrorMessage,
+              "", //$NON-NLS-1$
               new Object [] {txtId.getText().getText()}), ERROR);
         setValid(false);
         return;                                   
@@ -351,7 +352,7 @@ public class TypeDeclarationPropertyPage extends AbstractModelElementPropertyPag
            if (td.getId().equals(txtId.getText().getText()))
            {
               setMessage(MessageFormat.format(
-                    Structured_Messages.TypeDeclarationPropertyPage_DuplicateValueMessage,
+                    "", //$NON-NLS-1$
                     new Object [] {txtId.getText().getText()}), ERROR);
               setValid(false);
               return;     
@@ -359,7 +360,7 @@ public class TypeDeclarationPropertyPage extends AbstractModelElementPropertyPag
            if (td.getName().equals(txtName.getText().getText()))
            {
               setMessage(MessageFormat.format(
-                    Structured_Messages.TypeDeclarationPropertyPage_DuplicateValueMessage,
+                    "", //$NON-NLS-1$
                     new Object [] {txtName.getText().getText()}), ERROR);
               setValid(false);
               return;
@@ -378,18 +379,18 @@ public class TypeDeclarationPropertyPage extends AbstractModelElementPropertyPag
       {
          String visibilityDefault = PlatformUI.getPreferenceStore().getString(
                BpmProjectNature.PREFERENCE_MULTIPACKAGEMODELING_VISIBILITY);
-         if (visibilityDefault == null || visibilityDefault == ""
-               || visibilityDefault.equalsIgnoreCase("Public"))
+         if (visibilityDefault == null || visibilityDefault == "" //$NON-NLS-1$
+               || visibilityDefault.equalsIgnoreCase("Public")) //$NON-NLS-1$
          {
 
             ExtendedAttributeUtil.createAttribute(declaration,
-                  PredefinedConstants.MODELELEMENT_VISIBILITY).setValue("Public");
+                  PredefinedConstants.MODELELEMENT_VISIBILITY).setValue("Public"); //$NON-NLS-1$
             publicType = true;
          }
       }
       else
       {
-         if (visibility.getValue().equalsIgnoreCase("Public"))
+         if (visibility.getValue().equalsIgnoreCase("Public")) //$NON-NLS-1$
          {
             publicType = true;
          }
diff --git a/modeling/org.eclipse.stardust.modeling.data.structured/src/org/eclipse/stardust/modeling/data/structured/structured-messages.properties b/modeling/org.eclipse.stardust.modeling.data.structured/src/org/eclipse/stardust/modeling/data/structured/structured-messages.properties
index 00162bc..3532282 100644
--- a/modeling/org.eclipse.stardust.modeling.data.structured/src/org/eclipse/stardust/modeling/data/structured/structured-messages.properties
+++ b/modeling/org.eclipse.stardust.modeling.data.structured/src/org/eclipse/stardust/modeling/data/structured/structured-messages.properties
@@ -18,44 +18,21 @@ ComplexTypePropertyPage_NewElementPlaceholder=<new>
 ComplexTypePropertyPage_AnonymousPlaceholder=<anonymous>
 ComplexTypePropertyPage_AttributePlaceholder=<attribute>
 ComplexTypePropertyPage_ElementPlaceholder=<element>
-ComplexTypePropertyPage_DuplicateTypeErrorMesage=Duplicate type: 
-ComplexTypePropertyPage_InvalidTypeIdentifierErrorMessage=''{0}'' is not a valid identifier.
 ComplexTypePropertyPage_InvalidFieldIdentifierErrorMessage=''{0}'' is not a valid identifier.
 ComplexTypePropertyPage_DuplicateFieldErrorMessage=Duplicate identifier: ''{0}''.
-ComplexTypePropertyPage_NoNameErrorMessage=Type must have a name.
-SimpleTypePropertyPage_ValuesColumnLabel=Values
-SimpleTypePropertyPage_NoNameErrorMessage=Type must have a name.
 SimpleTypePropertyPage_NewFacetPlaceholder=<new>
-SimpleTypePropertyPage_NewValueLabel=<new>
 SimpleTypePropertyPage_NamespaceLabel=Namespace:
 SimpleTypePropertyPage_BaseTypeLabel=Base Type:
 SimpleTypePropertyPage_MaxLengthLabel=Max Length:
 SimpleTypePropertyPage_MinLengthLabel=Min Length:
-SimpleTypePropertyPage_EnumerationNameLabel=Name: 
 SimpleTypePropertyPage_EnumerationButtonLabel=Enumeration
 SimpleTypePropertyPage_PatternedButtonLabel=Patterned
-SimpleTypePropertyPage_EmptyValueErrorMessage=Empty values are not allowed.
-SimpleTypePropertyPage_EmptyValuesMessage=Empty values are not allowed.
 SimpleTypePropertyPage_InvalidLengthMessage=Max Length is smaller than Min Length.
-SimpleTypePropertyPage_DuplicateTypeErrorMessage=Duplicate type: 
-SimpleTypePropertyPage_InvalidIdentifierErrorMessage=''{0}'' is not a valid identifier.
-SimpleTypePropertyPage_DuplicateValueErrorMessage=Duplicate value: ''{0}''.
 SimpleTypePropertyPage_DuplicateValueMessage=Duplicate value: ''{0}''.
 SimpleTypePropertyPage_MaxLengthLongValue=Max Length must be a positive long value.
 SimpleTypePropertyPage_MinLengthLongValue=Min Length must be a positive long value.
 DataValidator_InvalidType=Invalid type declaration: 
-DataValidator_NoTypeDefinition=Missing type definition.
-DataValidator_NoMatchingTypeDeclarationId=No TypeDeclaration matching ID: ''{0}'' have been found.
-DataValidator_NoDeclaredTypeId=Missing DeclaredType ID.
-DataValidator_NoTypeDeclarations=No TypeDeclarations found.
-DataValidator_UnsupportedDataType=Unsupported DataType: ''{0}''.
-DataValidator_NoActualType=TypeDeclaration ''{0}'' has no actual type.
-DataValidator_UnsupportedNamespace=Unsupported namespace: ''{0}'' for DataType: ''{1}''.
 DataValidator_NoType=No structured type assigned
-DataValidator_NoTypeName=Type name not specified for DataType: ''{0}''.
-DataValidator_NoLocation=Location not specified for DataType: ''{0}''.
-DataValidator_NoSchema=Schema not specified for DeclaredType: ''{0}''.
-DataValidator_TypeNotFound=No type: {0} found in schema for DataType: ''{1}''.
 CardinalityRequiredLabel=Exactly One
 CardinalityOptionalLabel=Zero or One
 CardinalityManyLabel=Zero or More
@@ -70,7 +47,6 @@ ERROR_MSG_IMPORTED=" imported ?
 ERROR_MSG_SELE_CONTAINS_ELEM_WITH_REF_IN_SCHEMAS_NOT_INCLUDED_IN_SELE=Selection contains elements with references in schemas not included in selection: {0} 
 ERROR_MSG_SELE_DOINST_CONTAIN_ANY_ROOT_COMPONENTS=Selection doesn't contain any root components.
 ERROR_MSG_UNRESOLVED_RE=Unresolved reference: 
-EXC_DOM_TRANS_IS_NOT_VALID_FOR_THIS_DATAPATH=XOM/DOM transformation is not valid for this datapath.
 EXC_DURING_VALIDATION=Exception during validation
 ExportTypeDeclarationAction_ActionLabel0=Export Schema
 ImportTypeDeclarationsAction_ActionLabel=Import Types
@@ -81,7 +57,6 @@ OpenXSDEditorAction_TaskName=Opening file for editing...
 ExportSchemaWizardTitle=Export XML schema
 TypesPageDescription=Select the types to be exported.
 LBL_FALSE=false
-LBL=label
 LBL_TRUE=true
 LocationPageDescription=Select export location.
 ExportingTaskName=Exporting: 
@@ -109,10 +84,6 @@ CollapseAllLabel=Collapse All
 TypeDependenciesColumnLabel=Type Dependencies
 NameColumnLabel=Name
 TypeColumnLabel=Type
-TargetNamespaceLabel=Target namespace: 
-TXT_FRAGEZEICHEN=?
-TXT_UNRESOLVED=unresolved
-SaveAsDialog_overwriteQuestion=
 SaveOriginalSchemaLabel=Save original schema in the model (makes the imported structure editable)
 URLLabel=URL:
 LoadButtonLabel=Load
@@ -126,15 +97,10 @@ COL_EDIT_IN_STRUCTURE=Edit in Structure
 COL_PROPERTY=Property
 COL_VALUE=Value
 ValuesColumnLabel=Values
-VIEW_DUMMY=dummy
 BadURLPrefixMessage=The URL must start with 
 BUT_CREATE_PR_AND_SER_APP=Create Parser and Serializer applications
-TypeDeclarationPropertyPage_EmptyValuesMessage=Empty values are not allowed.
-TypeDeclarationPropertyPage_DuplicateValueMessage=Duplicate value: ''{0}''.
-TypeDeclarationPropertyPage_InvalidIdentifierErrorMessage=''{0}'' is not a valid identifier.
 NoHost=No host specified.
 ComplexTypePropertyPage_ResourceNotFound=Resource ''{0}'' not found.
-DefaultValueColumnLabel=Default Value
 DefaultValueValidation_NotFloat=''{0}'' is not a valid Float value.
 DefaultValueValidation_NotDouble=''{0}'' is not a valid Double value.
 DefaultValueValidation_NotByte=''{0}'' is not a valid Byte value.
@@ -145,4 +111,6 @@ ImportIdDialog_Label=Duplicate Id, please rename.
 ImportIdDialog_Id=ID:
 ImportIdDialog_DuplicateId=ID already exists in Model\!
 ImportIdDialog_EmptyId=ID must not be empty\!
-Question=
+SYNCHRONIZE_NAMESPACE_AND_ID=Synchronize namespace with type id
+EXC_XOM_DOM_TRANSFORMATION_IS_NOT_VALID_FOR_THIS_DATAPATH=XOM/DOM transformation is not valid for this datapath.
+LBL_Sequence=<sequence>
\ No newline at end of file