[releng] Regenerate with latest generator

This just uses StringBuilder instead of StringBuffer in the generated
Impls.
diff --git a/features/org.eclipse.xsd-feature/feature.xml b/features/org.eclipse.xsd-feature/feature.xml
index b22f21c..753aeaa 100644
--- a/features/org.eclipse.xsd-feature/feature.xml
+++ b/features/org.eclipse.xsd-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.xsd"
       label="%featureName"
-      version="2.17.0.qualifier"
+      version="2.18.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.xsd.license"
       license-feature-version="2.11.0">
diff --git a/features/org.eclipse.xsd-feature/pom.xml b/features/org.eclipse.xsd-feature/pom.xml
index 2be7c46..1d780e3 100644
--- a/features/org.eclipse.xsd-feature/pom.xml
+++ b/features/org.eclipse.xsd-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.xsd</artifactId>
-  <version>2.17.0-SNAPSHOT</version>
+  <version>2.18.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.xsd.sdk-feature/feature.xml b/features/org.eclipse.xsd.sdk-feature/feature.xml
index f71f9dc..de338f0 100644
--- a/features/org.eclipse.xsd.sdk-feature/feature.xml
+++ b/features/org.eclipse.xsd.sdk-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.xsd.sdk"
       label="%featureName"
-      version="2.19.0.qualifier"
+      version="2.20.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.xsd.license"
       license-feature-version="2.11.0">
diff --git a/features/org.eclipse.xsd.sdk-feature/pom.xml b/features/org.eclipse.xsd.sdk-feature/pom.xml
index 057c7f0..9e262af 100644
--- a/features/org.eclipse.xsd.sdk-feature/pom.xml
+++ b/features/org.eclipse.xsd.sdk-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.xsd.sdk</artifactId>
-  <version>2.19.0-SNAPSHOT</version>
+  <version>2.20.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.xsd/META-INF/MANIFEST.MF b/plugins/org.eclipse.xsd/META-INF/MANIFEST.MF
index b5a5341..520f74e 100644
--- a/plugins/org.eclipse.xsd/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xsd/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.xsd; singleton:=true
-Bundle-Version: 2.16.0.qualifier
+Bundle-Version: 2.17.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.xsd.XSDPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -14,7 +14,7 @@
  org.eclipse.xsd.impl.type,
  org.eclipse.xsd.util
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.16.0,3.0.0)";visibility:=reexport
+ org.eclipse.emf.ecore;bundle-version="[2.20.0,3.0.0)";visibility:=reexport
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.xsd
diff --git a/plugins/org.eclipse.xsd/pom.xml b/plugins/org.eclipse.xsd/pom.xml
index c941a6f..50b79a3 100644
--- a/plugins/org.eclipse.xsd/pom.xml
+++ b/plugins/org.eclipse.xsd/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf</groupId>
   <artifactId>org.eclipse.xsd</artifactId>
-  <version>2.16.0-SNAPSHOT</version>
+  <version>2.17.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAnnotationImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAnnotationImpl.java
index 94f3b9a..ff1ce08 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAnnotationImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAnnotationImpl.java
@@ -258,7 +258,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (applicationInformation: ");
     result.append(applicationInformation);
     result.append(", userInformation: ");
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeUseImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeUseImpl.java
index dad4e0d..c151884 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeUseImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDAttributeUseImpl.java
@@ -727,7 +727,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (required: ");
     result.append((eFlags & REQUIRED_EFLAG) != 0);
     result.append(", value: ");
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDBoundedFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDBoundedFacetImpl.java
index 6c4a03c..a04f541 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDBoundedFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDBoundedFacetImpl.java
@@ -176,7 +176,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (value: ");
     result.append((eFlags & VALUE_EFLAG) != 0);
     result.append(')');
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDCardinalityFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDCardinalityFacetImpl.java
index 965747e..d823672 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDCardinalityFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDCardinalityFacetImpl.java
@@ -205,7 +205,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (value: ");
     result.append(VALUE_EFLAG_VALUES[(eFlags & VALUE_EFLAG) >>> VALUE_EFLAG_OFFSET]);
     result.append(')');
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDComplexTypeDefinitionImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDComplexTypeDefinitionImpl.java
index 4371dfa..5913e4e 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDComplexTypeDefinitionImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDComplexTypeDefinitionImpl.java
@@ -3226,7 +3226,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (derivationMethod: ");
     if ((eFlags & DERIVATION_METHOD_ESETFLAG) != 0) result.append(DERIVATION_METHOD_EFLAG_VALUES[(eFlags & DERIVATION_METHOD_EFLAG) >>> DERIVATION_METHOD_EFLAG_OFFSET]); else result.append("<unset>");
     result.append(", final: ");
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDConcreteComponentImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDConcreteComponentImpl.java
index 5ee3e79..aec8ebd 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDConcreteComponentImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDConcreteComponentImpl.java
@@ -2012,7 +2012,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (element: ");
     result.append(element);
     result.append(')');
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDDiagnosticImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDDiagnosticImpl.java
index 946437f..2d92d30 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDDiagnosticImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDDiagnosticImpl.java
@@ -789,7 +789,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (severity: ");
     result.append(SEVERITY_EFLAG_VALUES[(eFlags & SEVERITY_EFLAG) >>> SEVERITY_EFLAG_OFFSET]);
     result.append(", message: ");
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDElementDeclarationImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDElementDeclarationImpl.java
index e4507e3..1bad241 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDElementDeclarationImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDElementDeclarationImpl.java
@@ -2246,7 +2246,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (nillable: ");
     if ((eFlags & NILLABLE_ESETFLAG) != 0) result.append((eFlags & NILLABLE_EFLAG) != 0); else result.append("<unset>");
     result.append(", disallowedSubstitutions: ");
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDEnumerationFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDEnumerationFacetImpl.java
index 6837fd1..c5de00a 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDEnumerationFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDEnumerationFacetImpl.java
@@ -182,7 +182,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (value: ");
     result.append(value);
     result.append(')');
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFacetImpl.java
index f0a6e16..ee9ab28 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFacetImpl.java
@@ -399,7 +399,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (lexicalValue: ");
     result.append(lexicalValue);
     result.append(')');
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFeatureImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFeatureImpl.java
index e0e6760..9c8ea39 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFeatureImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFeatureImpl.java
@@ -585,7 +585,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (value: ");
     result.append(value);
     result.append(", constraint: ");
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFixedFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFixedFacetImpl.java
index ba5c1d3..25555b4 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFixedFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFixedFacetImpl.java
@@ -270,7 +270,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (fixed: ");
     if ((eFlags & FIXED_ESETFLAG) != 0) result.append((eFlags & FIXED_EFLAG) != 0); else result.append("<unset>");
     result.append(')');
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFractionDigitsFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFractionDigitsFacetImpl.java
index b9c3aae..2b22784 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFractionDigitsFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDFractionDigitsFacetImpl.java
@@ -201,7 +201,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (value: ");
     result.append(value);
     result.append(')');
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDIdentityConstraintDefinitionImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDIdentityConstraintDefinitionImpl.java
index 34b5140..2c4059b 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDIdentityConstraintDefinitionImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDIdentityConstraintDefinitionImpl.java
@@ -484,7 +484,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (identityConstraintCategory: ");
     result.append(IDENTITY_CONSTRAINT_CATEGORY_EFLAG_VALUES[(eFlags & IDENTITY_CONSTRAINT_CATEGORY_EFLAG) >>> IDENTITY_CONSTRAINT_CATEGORY_EFLAG_OFFSET]);
     result.append(')');
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDImportImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDImportImpl.java
index f3dee6a..0355aa3 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDImportImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDImportImpl.java
@@ -297,7 +297,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (namespace: ");
     result.append(namespace);
     result.append(')');
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDLengthFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDLengthFacetImpl.java
index e58068a..48f77d6 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDLengthFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDLengthFacetImpl.java
@@ -206,7 +206,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (value: ");
     result.append(value);
     result.append(')');
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxFacetImpl.java
index f2253cc..78e36e9 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxFacetImpl.java
@@ -248,7 +248,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (value: ");
     result.append(value);
     result.append(')');
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxLengthFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxLengthFacetImpl.java
index 0f513d2..a39499e 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxLengthFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMaxLengthFacetImpl.java
@@ -203,7 +203,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (value: ");
     result.append(value);
     result.append(')');
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinFacetImpl.java
index 3b53908..1f11154 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinFacetImpl.java
@@ -249,7 +249,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (value: ");
     result.append(value);
     result.append(')');
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinLengthFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinLengthFacetImpl.java
index fec9eb0..0d3b5e4 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinLengthFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDMinLengthFacetImpl.java
@@ -205,7 +205,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (value: ");
     result.append(value);
     result.append(')');
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDModelGroupImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDModelGroupImpl.java
index e82682f..752d8af 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDModelGroupImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDModelGroupImpl.java
@@ -419,7 +419,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (compositor: ");
     result.append(COMPOSITOR_EFLAG_VALUES[(eFlags & COMPOSITOR_EFLAG) >>> COMPOSITOR_EFLAG_OFFSET]);
     result.append(')');
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNamedComponentImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNamedComponentImpl.java
index aeb06fb..b0e3161 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNamedComponentImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNamedComponentImpl.java
@@ -763,7 +763,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (name: ");
     result.append(name);
     result.append(", targetNamespace: ");
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNotationDeclarationImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNotationDeclarationImpl.java
index d0f44b2..dc80f9f 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNotationDeclarationImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNotationDeclarationImpl.java
@@ -336,7 +336,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (systemIdentifier: ");
     result.append(systemIdentifier);
     result.append(", publicIdentifier: ");
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNumericFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNumericFacetImpl.java
index cd31264..051d07d 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNumericFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDNumericFacetImpl.java
@@ -176,7 +176,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (value: ");
     result.append((eFlags & VALUE_EFLAG) != 0);
     result.append(')');
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDOrderedFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDOrderedFacetImpl.java
index 7421421..5138e36 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDOrderedFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDOrderedFacetImpl.java
@@ -205,7 +205,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (value: ");
     result.append(VALUE_EFLAG_VALUES[(eFlags & VALUE_EFLAG) >>> VALUE_EFLAG_OFFSET]);
     result.append(')');
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDPackageImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDPackageImpl.java
index 6b54462..5ac2267 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDPackageImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDPackageImpl.java
@@ -4714,7 +4714,7 @@
 
   /**
    * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>This method is used to initialize {@link XSDPackage#eINSTANCE} when that field is accessed.
    * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
    * <!-- begin-user-doc -->
@@ -4729,7 +4729,8 @@
     if (isInited) return (XSDPackage)EPackage.Registry.INSTANCE.getEPackage(XSDPackage.eNS_URI);
 
     // Obtain or create and register package
-    XSDPackageImpl theXSDPackage = (XSDPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof XSDPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new XSDPackageImpl());
+    Object registeredXSDPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+    XSDPackageImpl theXSDPackage = registeredXSDPackage instanceof XSDPackageImpl ? (XSDPackageImpl)registeredXSDPackage : new XSDPackageImpl();
 
     isInited = true;
 
@@ -4742,7 +4743,6 @@
     // Mark meta-data to indicate it can't be changed
     theXSDPackage.freeze();
 
-  
     // Update the registry and return the package
     EPackage.Registry.INSTANCE.put(XSDPackage.eNS_URI, theXSDPackage);
     return theXSDPackage;
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDParticleImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDParticleImpl.java
index e3285ab..118d860 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDParticleImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDParticleImpl.java
@@ -483,7 +483,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (minOccurs: ");
     if ((eFlags & MIN_OCCURS_ESETFLAG) != 0) result.append(minOccurs); else result.append("<unset>");
     result.append(", maxOccurs: ");
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDPatternFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDPatternFacetImpl.java
index 19934f8..a8acc09 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDPatternFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDPatternFacetImpl.java
@@ -189,7 +189,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (value: ");
     result.append(value);
     result.append(')');
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaDirectiveImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaDirectiveImpl.java
index 1796e9c..3a85160 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaDirectiveImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaDirectiveImpl.java
@@ -245,7 +245,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (schemaLocation: ");
     result.append(schemaLocation);
     result.append(')');
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaImpl.java
index f64a3f8..69aa191 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSchemaImpl.java
@@ -2922,7 +2922,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (document: ");
     result.append(document);
     result.append(", schemaLocation: ");
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSimpleTypeDefinitionImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSimpleTypeDefinitionImpl.java
index d46182c..4751bf9 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSimpleTypeDefinitionImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDSimpleTypeDefinitionImpl.java
@@ -2861,7 +2861,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (variety: ");
     if ((eFlags & VARIETY_ESETFLAG) != 0) result.append(VARIETY_EFLAG_VALUES[(eFlags & VARIETY_EFLAG) >>> VARIETY_EFLAG_OFFSET]); else result.append("<unset>");
     result.append(", final: ");
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDTotalDigitsFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDTotalDigitsFacetImpl.java
index fafc176..778a978 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDTotalDigitsFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDTotalDigitsFacetImpl.java
@@ -199,7 +199,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (value: ");
     result.append(value);
     result.append(')');
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDWhiteSpaceFacetImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDWhiteSpaceFacetImpl.java
index b57b018..320dfd5 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDWhiteSpaceFacetImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDWhiteSpaceFacetImpl.java
@@ -230,7 +230,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (value: ");
     result.append(VALUE_EFLAG_VALUES[(eFlags & VALUE_EFLAG) >>> VALUE_EFLAG_OFFSET]);
     result.append(')');
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDWildcardImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDWildcardImpl.java
index 6dea226..ace05a3 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDWildcardImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDWildcardImpl.java
@@ -576,7 +576,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (namespaceConstraintCategory: ");
     result.append(NAMESPACE_CONSTRAINT_CATEGORY_EFLAG_VALUES[(eFlags & NAMESPACE_CONSTRAINT_CATEGORY_EFLAG) >>> NAMESPACE_CONSTRAINT_CATEGORY_EFLAG_OFFSET]);
     result.append(", namespaceConstraint: ");
diff --git a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDXPathDefinitionImpl.java b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDXPathDefinitionImpl.java
index 80321af..4986245 100644
--- a/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDXPathDefinitionImpl.java
+++ b/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDXPathDefinitionImpl.java
@@ -370,7 +370,7 @@
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (variety: ");
     result.append(VARIETY_EFLAG_VALUES[(eFlags & VARIETY_EFLAG) >>> VARIETY_EFLAG_OFFSET]);
     result.append(", value: ");