[324132] Unnecessary dependencies on dtd.core and emf.core
diff --git a/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF
index de0521b..2556c77 100644
--- a/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF
@@ -47,8 +47,6 @@
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.wst.validation;bundle-version="[1.2.100,1.3.0)",
org.eclipse.wst.common.project.facet.core;bundle-version="[1.4.0,2.0.0)";resolution:=optional,
- org.eclipse.wst.common.modulecore;bundle-version="[1.2.0,2.0.0)";resolution:=optional,
- org.eclipse.wst.dtd.core;bundle-version="[1.1.400,1.2.0)",
- org.eclipse.emf.ecore;bundle-version="[2.6.0,2.7.0)"
+ org.eclipse.wst.common.modulecore;bundle-version="[1.2.0,2.0.0)";resolution:=optional
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLTagsCompletionProposalComputer.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLTagsCompletionProposalComputer.java
index fa7d007..337e2e6 100644
--- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLTagsCompletionProposalComputer.java
+++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLTagsCompletionProposalComputer.java
@@ -16,8 +16,6 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.jface.text.contentassist.IContextInformationValidator;
-import org.eclipse.wst.dtd.core.internal.contentmodel.DTDImpl.DTDBaseAdapter;
-import org.eclipse.wst.dtd.core.internal.contentmodel.DTDImpl.DTDElementReferenceContentAdapter;
import org.eclipse.wst.html.core.internal.contentmodel.HTMLAttributeDeclaration;
import org.eclipse.wst.html.core.internal.contentmodel.HTMLCMDocument;
import org.eclipse.wst.html.core.internal.contentmodel.HTMLPropertyDeclaration;
@@ -135,14 +133,10 @@
*/
protected boolean validModelQueryNode(CMNode node) {
boolean isValid = false;
- if(node instanceof DTDElementReferenceContentAdapter) {
- DTDElementReferenceContentAdapter content = (DTDElementReferenceContentAdapter)node;
- if(content.getCMDocument() instanceof DTDBaseAdapter) {
- DTDBaseAdapter dtd = (DTDBaseAdapter)content.getCMDocument();
- //this maybe a little hacky, but it works, if you have a better idea go for it
- String spec = dtd.getSpec();
- isValid = spec.indexOf("html") != -1;
- }
+ Object cmdoc = node.getProperty("CMDocument"); //$NON-NLS-1$
+ if (cmdoc instanceof CMNode) {
+ String name = ((CMNode) cmdoc).getNodeName();
+ isValid = name != null && name.endsWith(".dtd") && name.indexOf("html") != -1; //$NON-NLS-1$ //$NON-NLS-2$
} else if (node.supports(HTMLAttributeDeclaration.IS_HTML)) {
Boolean isHTML = (Boolean) node.getProperty(HTMLAttributeDeclaration.IS_HTML);
isValid = isHTML == null || isHTML.booleanValue();
