[103767] remove CMDocument support for 'encodingInfo' property
diff --git a/bundles/org.eclipse.wst.dtd.core/contentmodel/org/eclipse/wst/dtd/core/internal/contentmodel/DTDImpl.java b/bundles/org.eclipse.wst.dtd.core/contentmodel/org/eclipse/wst/dtd/core/internal/contentmodel/DTDImpl.java
index 75dace7..e53f468 100644
--- a/bundles/org.eclipse.wst.dtd.core/contentmodel/org/eclipse/wst/dtd/core/internal/contentmodel/DTDImpl.java
+++ b/bundles/org.eclipse.wst.dtd.core/contentmodel/org/eclipse/wst/dtd/core/internal/contentmodel/DTDImpl.java
@@ -79,9 +79,6 @@
DTDFile dtdFile = buildDTDModel(uri);
CMDocument cmDocument = (CMDocument) getAdapter(dtdFile);
- // This method was accomplishing nothing, so removed.
- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=102070
- //CMDocumentEncodingHelper.setEncodingInfo(cmDocument, uri);
return cmDocument;
}
@@ -641,7 +638,6 @@
protected CMNamedNodeMapImpl namedNodeMap;
protected CMNamedNodeMapImpl entityNodeMap;
- protected String[] encodingInfo = new String[2];
protected AnnotationMap annotationMap = new AnnotationMap();
protected Map globalPropertyMap = new HashMap();
@@ -718,9 +714,6 @@
else if (propertyName.equals("annotationMap")) { //$NON-NLS-1$
result = annotationMap;
}
- else if (propertyName.equals("encodingInfo")) { //$NON-NLS-1$
- result = encodingInfo;
- }
else if (propertyName.equals("globalPropertyMap")) { //$NON-NLS-1$
result = globalPropertyMap;
}
diff --git a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/XSDImpl.java b/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/XSDImpl.java
index 5971d45..5f493f9 100644
--- a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/XSDImpl.java
+++ b/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/XSDImpl.java
@@ -112,14 +112,12 @@
* properties common to all CMDocument nodes: PROPERTY_TARGET_NAMESPACE_URI
* PROPERTY_IMPORTED_NAMESPACE_INFO PROPERTY_NAMESPACE_INFO
* PROPERTY_ELEMENT_FORM_DEFAULT PROPERTY_ANNOTATION_MAP
- * PROPERTY_ENCODING_INFO
*/
public static final String PROPERTY_TARGET_NAMESPACE_URI = "http://org.eclipse.wst/cm/properties/targetNamespaceURI";
public static final String PROPERTY_IMPORTED_NAMESPACE_INFO = "http://org.eclipse.wst/cm/properties/importedNamespaceInfo";
public static final String PROPERTY_NAMESPACE_INFO = "http://org.eclipse.wst/cm/properties/namespaceInfo";
public static final String PROPERTY_ELEMENT_FORM_DEFAULT = "http://org.eclipse.wst/cm/properties/elementFormDefault";
public static final String PROPERTY_ANNOTATION_MAP = "annotationMap";
- public static final String PROPERTY_ENCODING_INFO = "encodingInfo";
/*
* properties common to all CMElementDeclaration nodes: PROPERTY_XSITYPES
* PROPERTY_DERIVED_ELEMENT_DECLARATION PROPERTY_SUBSTITUTION_GROUP
@@ -172,9 +170,6 @@
if (xsdSchema != null)
{
cmDocument = (CMDocument) getAdapter(xsdSchema);
- // This and related methods were doing nothing, so removed.
- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=102070
- // CMDocumentEncodingHelper.setEncodingInfo(cmDocument, uri);
}
return cmDocument;
}
@@ -769,7 +764,6 @@
protected XSDSchema xsdSchema;
protected CMNamedNodeMapImpl namedNodeMap;
protected CMNamedNodeMapImpl entityNodeMap;
- protected String[] encodingInfo = new String[2];
protected AnnotationMap annotationMap = new AnnotationMap();
protected Hashtable substitutionGroupTable;
@@ -816,7 +810,7 @@
public boolean supports(String propertyName)
{
return propertyName.equals(PROPERTY_TARGET_NAMESPACE_URI) || propertyName.equals(PROPERTY_IMPORTED_NAMESPACE_INFO) || propertyName.equals(PROPERTY_NAMESPACE_INFO)
- || propertyName.equals(PROPERTY_ELEMENT_FORM_DEFAULT) || propertyName.equals(PROPERTY_ANNOTATION_MAP) || propertyName.equals(PROPERTY_ENCODING_INFO) || super.supports(propertyName);
+ || propertyName.equals(PROPERTY_ELEMENT_FORM_DEFAULT) || propertyName.equals(PROPERTY_ANNOTATION_MAP) || super.supports(propertyName);
}
/**
@@ -876,10 +870,6 @@
{
result = annotationMap;
}
- else if (propertyName.equals(PROPERTY_ENCODING_INFO))
- {
- result = encodingInfo;
- }
else if (propertyName.equals("allElements"))
{
result = getAllElements();
