[520975] Eliminate warnings in XSD for Oxygen with Photon TP 
diff --git a/features/org.eclipse.xsd-feature/feature.xml b/features/org.eclipse.xsd-feature/feature.xml
index 10a69f2..b722bef 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.13.0.qualifier"
+      version="2.14.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.xsd.license"
       license-feature-version="2.8.0.qualifier">
diff --git a/features/org.eclipse.xsd.ecore.converter-feature/feature.xml b/features/org.eclipse.xsd.ecore.converter-feature/feature.xml
index 7e386b6..b1b37fc 100644
--- a/features/org.eclipse.xsd.ecore.converter-feature/feature.xml
+++ b/features/org.eclipse.xsd.ecore.converter-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.xsd.ecore.converter"
       label="%featureName"
-      version="2.9.0.qualifier"
+      version="2.10.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.xsd.license"
       license-feature-version="2.8.0.qualifier">
diff --git a/features/org.eclipse.xsd.sdk-feature/feature.xml b/features/org.eclipse.xsd.sdk-feature/feature.xml
index f0a0d23..94419b9 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.13.0.qualifier"
+      version="2.14.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.xsd.license"
       license-feature-version="2.8.0.qualifier">
diff --git a/plugins/org.eclipse.xsd.ecore.importer/META-INF/MANIFEST.MF b/plugins/org.eclipse.xsd.ecore.importer/META-INF/MANIFEST.MF
index 516f8b7..0d6aeef 100644
--- a/plugins/org.eclipse.xsd.ecore.importer/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xsd.ecore.importer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.xsd.ecore.importer; singleton:=true
-Bundle-Version: 2.7.0.qualifier
+Bundle-Version: 2.8.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.xsd.ecore.importer.XSDImporterPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.xsd.ecore.importer/src/org/eclipse/xsd/ecore/importer/XSDImporter.java b/plugins/org.eclipse.xsd.ecore.importer/src/org/eclipse/xsd/ecore/importer/XSDImporter.java
index 01fcee1..2edfdc8 100644
--- a/plugins/org.eclipse.xsd.ecore.importer/src/org/eclipse/xsd/ecore/importer/XSDImporter.java
+++ b/plugins/org.eclipse.xsd.ecore.importer/src/org/eclipse/xsd/ecore/importer/XSDImporter.java
@@ -382,7 +382,7 @@
     }
     else if (annotation != null)
     {
-      annotation.getDetails().remove(SORT_ATTRIBUTES_KEY);
+      annotation.getDetails().removeKey(SORT_ATTRIBUTES_KEY);
     }
 
     if (getMappingRoot() != null)
@@ -397,7 +397,7 @@
     }
     else if (annotation != null)
     {
-      annotation.getDetails().remove(CREATE_MAP_KEY);
+      annotation.getDetails().removeKey(CREATE_MAP_KEY);
     }
 
     if (annotation != null && annotation.getDetails().isEmpty())
diff --git a/plugins/org.eclipse.xsd/META-INF/MANIFEST.MF b/plugins/org.eclipse.xsd/META-INF/MANIFEST.MF
index 34fec59..8575d7e 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.13.0.qualifier
+Bundle-Version: 2.14.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.xsd.XSDPlugin$Implementation
 Bundle-Vendor: %providerName
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 0f77d7f..ac402d1 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
@@ -582,7 +582,7 @@
               result = 
                 baseName + 
                   (XSDConstants.isURType(xsdSimpleTypeDefinition.getBaseTypeDefinition()) ? 
-                     "_._member"  + "_._" + xsdSimpleTypeDefinition.getMemberTypeDefinitions().indexOf(this) :
+                     "_._member"  + "_._" + xsdSimpleTypeDefinition.getMemberTypeDefinitions().indexOf((XSDSimpleTypeDefinition)this) :
                      "_._base");
               break;
             }
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 586d6ed..1460e9e 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
@@ -1159,7 +1159,7 @@
         }
         result.setNamespaceConstraintCategory(XSDNamespaceConstraintCategory.SET_LITERAL);
         List<String> newNamespaceConstraint = new ArrayList<String>(getNamespaceConstraint());
-        newNamespaceConstraint.remove(otherWildcard.getNamespaceConstraint());
+        newNamespaceConstraint.removeAll(otherWildcard.getNamespaceConstraint());
         newNamespaceConstraint.remove(null);
         result.getNamespaceConstraint().addAll(newNamespaceConstraint);
         return result;
@@ -1187,7 +1187,7 @@
         }
         result.setNamespaceConstraintCategory(XSDNamespaceConstraintCategory.SET_LITERAL);
         List<String> newNamespaceConstraint = new ArrayList<String>(otherWildcard.getNamespaceConstraint());
-        newNamespaceConstraint.remove(getNamespaceConstraint());
+        newNamespaceConstraint.removeAll(getNamespaceConstraint());
         newNamespaceConstraint.remove(null);
         result.getNamespaceConstraint().addAll(newNamespaceConstraint);
         return result;